From 1dac21da3aba551efbbee76b3301ec354110de0d Mon Sep 17 00:00:00 2001 From: Martti Marran Date: Mon, 8 Sep 2025 22:00:09 +0400 Subject: [PATCH 1/5] Move package and allow nametag empty address --- build.gradle.kts | 2 +- src/main/java/com/unicity/sdk/Hashable.java | 7 - .../java/com/unicity/sdk/ISerializable.java | 21 -- .../sdk/mtree/plain/FinalizedBranch.java | 7 - .../com/unicity/sdk/mtree/sum/LeafBranch.java | 7 - .../sdk/predicate/IPredicateReference.java | 9 - .../NametagMintTransactionData.java | 34 --- .../java/org/unicitylabs/sdk/Hashable.java | 7 + .../sdk/StateTransitionClient.java | 28 +-- .../unicitylabs}/sdk/address/Address.java | 2 +- .../sdk/address/AddressFactory.java | 8 +- .../sdk/address/AddressScheme.java | 2 +- .../sdk/address/DirectAddress.java | 10 +- .../sdk/address/ProxyAddress.java | 24 +-- .../sdk/api/AggregatorClient.java | 8 +- .../unicitylabs}/sdk/api/Authenticator.java | 10 +- .../sdk/api/BlockHeightResponse.java | 2 +- .../sdk/api/IAggregatorClient.java | 6 +- .../sdk/api/InclusionProofRequest.java | 2 +- .../unicitylabs}/sdk/api/LeafValue.java | 16 +- .../unicitylabs}/sdk/api/RequestId.java | 12 +- .../sdk/api/SubmitCommitmentRequest.java | 4 +- .../sdk/api/SubmitCommitmentResponse.java | 2 +- .../sdk/api/SubmitCommitmentStatus.java | 2 +- .../unicitylabs}/sdk/hash/DataHash.java | 4 +- .../unicitylabs}/sdk/hash/DataHasher.java | 2 +- .../unicitylabs}/sdk/hash/HashAlgorithm.java | 2 +- .../hash/UnsupportedHashAlgorithmError.java | 2 +- .../sdk/jsonrpc/JsonRpcDataError.java | 2 +- .../sdk/jsonrpc/JsonRpcError.java | 2 +- .../sdk/jsonrpc/JsonRpcHttpTransport.java | 4 +- .../sdk/jsonrpc/JsonRpcNetworkError.java | 2 +- .../sdk/jsonrpc/JsonRpcRequest.java | 2 +- .../sdk/jsonrpc/JsonRpcResponse.java | 2 +- .../sdk/mtree/BranchExistsException.java | 2 +- .../unicitylabs}/sdk/mtree/CommonPath.java | 2 +- .../sdk/mtree/LeafOutOfBoundsException.java | 2 +- .../MerkleTreePathVerificationResult.java | 2 +- .../sdk/mtree/PathVerificationResult.java | 2 +- .../unicitylabs}/sdk/mtree/plain/Branch.java | 4 +- .../sdk/mtree/plain/FinalizedBranch.java | 7 + .../sdk/mtree/plain/FinalizedLeafBranch.java | 10 +- .../sdk/mtree/plain/FinalizedNodeBranch.java | 10 +- .../sdk/mtree/plain/LeafBranch.java | 2 +- .../sdk/mtree/plain}/NodeBranch.java | 2 +- .../sdk/mtree/plain/PendingLeafBranch.java | 4 +- .../sdk/mtree/plain/PendingNodeBranch.java | 4 +- .../sdk/mtree/plain/SparseMerkleTree.java | 10 +- .../sdk/mtree/plain/SparseMerkleTreePath.java | 12 +- .../mtree/plain/SparseMerkleTreePathStep.java | 4 +- .../mtree/plain/SparseMerkleTreeRootNode.java | 10 +- .../unicitylabs}/sdk/mtree/sum/Branch.java | 4 +- .../sdk/mtree/sum/FinalizedBranch.java | 4 +- .../sdk/mtree/sum/FinalizedLeafBranch.java | 16 +- .../sdk/mtree/sum/FinalizedNodeBranch.java | 14 +- .../unicitylabs/sdk/mtree/sum/LeafBranch.java | 7 + .../sdk/mtree/sum}/NodeBranch.java | 2 +- .../sdk/mtree/sum/PendingLeafBranch.java | 6 +- .../sdk/mtree/sum/PendingNodeBranch.java | 4 +- .../sdk/mtree/sum/SparseMerkleSumTree.java | 10 +- .../mtree/sum/SparseMerkleSumTreePath.java | 16 +- .../sum/SparseMerkleSumTreePathStep.java | 4 +- .../sum/SparseMerkleSumTreeRootNode.java | 18 +- .../sdk/predicate/BurnPredicate.java | 20 +- .../sdk/predicate/BurnPredicateReference.java | 16 +- .../sdk/predicate/DefaultPredicate.java | 26 +-- .../sdk/predicate/IPredicateFactory.java | 6 +- .../sdk/predicate/IPredicateReference.java | 9 + .../sdk/predicate/MaskedPredicate.java | 8 +- .../predicate/MaskedPredicateReference.java | 18 +- .../unicitylabs}/sdk/predicate/Predicate.java | 12 +- .../sdk/predicate/PredicateType.java | 2 +- .../sdk/predicate/UnmaskedPredicate.java | 20 +- .../predicate/UnmaskedPredicateReference.java | 18 +- .../InvalidFieldValueException.java | 2 +- .../sdk/serializer/MissingFieldException.java | 2 +- .../sdk/serializer/UnicityObjectMapper.java | 194 +++++++++--------- .../cbor/CborSerializationException.java | 2 +- .../serializer/cbor/address/AddressCbor.java | 6 +- .../cbor/api/AuthenticatorCbor.java | 8 +- .../serializer/cbor/hash/DataHashCbor.java | 4 +- .../mtree/plain/SparseMerkleTreePathCbor.java | 8 +- .../SparseMerkleTreePathStepBranchCbor.java | 6 +- .../plain/SparseMerkleTreePathStepCbor.java | 6 +- .../sum/SparseMerkleSumTreePathCbor.java | 10 +- ...SparseMerkleSumTreePathStepBranchCbor.java | 6 +- .../sum/SparseMerkleSumTreePathStepCbor.java | 6 +- .../cbor/predicate/BurnPredicateCbor.java | 8 +- .../cbor/predicate/MaskedPredicateCbor.java | 8 +- .../cbor/predicate/PredicateCbor.java | 12 +- .../cbor/predicate/UnmaskedPredicateCbor.java | 8 +- .../sdk/serializer/cbor/token/TokenCbor.java | 12 +- .../serializer/cbor/token/TokenIdCbor.java | 4 +- .../serializer/cbor/token/TokenStateCbor.java | 6 +- .../serializer/cbor/token/TokenTypeCbor.java | 4 +- .../token/fungible/TokenCoinDataCbor.java | 8 +- .../cbor/transaction/InclusionProofCbor.java | 10 +- .../transaction/MintTransactionDataCbor.java | 16 +- .../MintTransactionReasonCbor.java | 6 +- .../cbor/transaction/TransactionCbor.java | 6 +- .../TransferTransactionDataCbor.java | 12 +- .../split/SplitMintReasonCbor.java | 8 +- .../split/SplitMintReasonProofCbor.java | 10 +- .../serializer/json/address/AddressJson.java | 6 +- .../json/api/AuthenticatorJson.java | 10 +- .../json/api/BlockHeightResponseJson.java | 4 +- .../json/api/InclusionProofRequestJson.java | 4 +- .../serializer/json/api/RequestIdJson.java | 6 +- .../json/api/SubmitCommitmentRequestJson.java | 4 +- .../api/SubmitCommitmentResponseJson.java | 6 +- .../serializer/json/hash/DataHashJson.java | 6 +- .../json/jsonrpc/JsonRpcErrorJson.java | 4 +- .../json/jsonrpc/JsonRpcRequestJson.java | 4 +- .../json/jsonrpc/JsonRpcResponseJson.java | 6 +- .../mtree/plain/SparseMerkleTreePathJson.java | 8 +- .../SparseMerkleTreePathStepBranchJson.java | 6 +- .../plain/SparseMerkleTreePathStepJson.java | 4 +- .../sum/SparseMerkleSumTreePathJson.java | 8 +- ...SparseMerkleSumTreePathStepBranchJson.java | 4 +- .../sum/SparseMerkleSumTreePathStepJson.java | 4 +- .../json/predicate/BurnPredicateJson.java | 8 +- .../json/predicate/MaskedPredicateJson.java | 8 +- .../json/predicate/PredicateJson.java | 12 +- .../json/predicate/UnmaskedPredicateJson.java | 8 +- .../serializer/json/token/TokenIdJson.java | 4 +- .../sdk/serializer/json/token/TokenJson.java | 12 +- .../serializer/json/token/TokenStateJson.java | 6 +- .../serializer/json/token/TokenTypeJson.java | 4 +- .../token/fungible/TokenCoinDataJson.java | 6 +- .../json/transaction/CommitmentJson.java | 10 +- .../json/transaction/InclusionProofJson.java | 10 +- .../json/transaction/MintCommitmentJson.java | 10 +- .../transaction/MintTransactionDataJson.java | 16 +- .../MintTransactionReasonJson.java | 6 +- .../json/transaction/TransactionJson.java | 9 +- .../transaction/TransferCommitmentJson.java | 10 +- .../TransferTransactionDataJson.java | 12 +- .../split/SplitMintReasonJson.java | 8 +- .../split/SplitMintReasonProofJson.java | 10 +- .../json/util/ByteArrayHexJson.java | 4 +- .../unicitylabs}/sdk/signing/Signature.java | 4 +- .../sdk/signing/SigningService.java | 8 +- .../sdk/token/NameTagTokenState.java | 8 +- .../unicitylabs}/sdk/token/Token.java | 36 ++-- .../unicitylabs}/sdk/token/TokenId.java | 10 +- .../unicitylabs}/sdk/token/TokenState.java | 16 +- .../unicitylabs}/sdk/token/TokenType.java | 4 +- .../sdk/token/fungible/CoinId.java | 6 +- .../sdk/token/fungible/TokenCoinData.java | 2 +- .../sdk/transaction/Commitment.java | 6 +- .../sdk/transaction/InclusionProof.java | 21 +- .../InclusionProofVerificationStatus.java | 2 +- .../sdk/transaction/MintCommitment.java | 12 +- .../sdk/transaction/MintReasonType.java | 2 +- .../sdk/transaction/MintTransactionData.java | 22 +- .../transaction/MintTransactionReason.java | 4 +- .../sdk/transaction/MintTransactionState.java | 10 +- .../NametagMintTransactionData.java | 38 ++++ .../sdk/transaction/Transaction.java | 6 +- .../sdk/transaction/TransactionData.java | 6 +- .../sdk/transaction/TransferCommitment.java | 14 +- .../transaction/TransferTransactionData.java | 24 +-- .../transaction/split/SplitMintReason.java | 26 +-- .../split/SplitMintReasonProof.java | 8 +- .../transaction/split/TokenSplitBuilder.java | 52 ++--- .../sdk/util/BigIntegerConverter.java | 2 +- .../unicitylabs}/sdk/util/BitString.java | 4 +- .../unicitylabs}/sdk/util/HexConverter.java | 2 +- .../sdk/util/InclusionProofUtils.java | 10 +- .../sdk/util/VerificationResult.java | 2 +- .../sdk/AndroidCompatibilityTest.java | 10 +- .../sdk/TestAggregatorClient.java | 28 ++- .../sdk/api/AuthenticatorTest.java | 14 +- .../unicitylabs}/sdk/api/RequestIdTest.java | 8 +- .../sdk/common/split/BaseTokenSplitTest.java | 64 +++--- .../unicitylabs}/sdk/e2e/BasicE2ETest.java | 18 +- .../unicitylabs}/sdk/e2e/CommonTestFlow.java | 72 +++---- .../unicitylabs}/sdk/e2e/TokenE2ETest.java | 6 +- .../functional/FunctionalTokenSplitTest.java | 8 +- .../unicitylabs}/sdk/hash/DataHashTest.java | 4 +- .../unicitylabs}/sdk/hash/DataHasherTest.java | 2 +- .../sdk/integration/TokenIntegrationTest.java | 6 +- .../sdk/jsonrpc/JsonRpcRequestTest.java | 4 +- .../sdk/jsonrpc/JsonRpcResponseTest.java | 6 +- .../sdk/mtree/CommonPathTest.java | 2 +- .../mtree/MerkleTreePathStepBranchTest.java | 6 +- .../sdk/mtree/MerkleTreePathStepTest.java | 10 +- .../sdk/mtree/MerkleTreePathTest.java | 14 +- .../sdk/mtree/plain/SparseMerkleTreeTest.java | 12 +- .../mtree/sum/SparseMerkleSumTreeTest.java | 6 +- .../MaskedPredicateReferenceTest.java | 6 +- .../sdk/signing/SignatureRecoveryTest.java | 10 +- .../sdk/signing/SigningServiceTest.java | 6 +- .../unicitylabs}/sdk/token/TokenIdTest.java | 2 +- .../unicitylabs}/sdk/token/TokenTest.java | 32 +-- .../sdk/transaction/CommitmentTest.java | 26 +-- .../sdk/transaction/InclusionProofTest.java | 22 +- .../split/TokenSplitBuilderTest.java | 36 ++-- .../unicitylabs}/sdk/utils/TestTokenData.java | 4 +- .../unicitylabs}/sdk/utils/TestUtils.java | 6 +- .../unicitylabs}/sdk/utils/TokenUtils.java | 50 ++--- 201 files changed, 1057 insertions(+), 1080 deletions(-) delete mode 100644 src/main/java/com/unicity/sdk/Hashable.java delete mode 100644 src/main/java/com/unicity/sdk/ISerializable.java delete mode 100644 src/main/java/com/unicity/sdk/mtree/plain/FinalizedBranch.java delete mode 100644 src/main/java/com/unicity/sdk/mtree/sum/LeafBranch.java delete mode 100644 src/main/java/com/unicity/sdk/predicate/IPredicateReference.java delete mode 100644 src/main/java/com/unicity/sdk/transaction/NametagMintTransactionData.java create mode 100644 src/main/java/org/unicitylabs/sdk/Hashable.java rename src/main/java/{com/unicity => org/unicitylabs}/sdk/StateTransitionClient.java (76%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/address/Address.java (70%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/address/AddressFactory.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/address/AddressScheme.java (59%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/address/DirectAddress.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/address/ProxyAddress.java (82%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/AggregatorClient.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/Authenticator.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/BlockHeightResponse.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/IAggregatorClient.java (74%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/InclusionProofRequest.java (87%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/LeafValue.java (75%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/RequestId.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/SubmitCommitmentRequest.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/SubmitCommitmentResponse.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/api/SubmitCommitmentStatus.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/hash/DataHash.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/hash/DataHasher.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/hash/HashAlgorithm.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/hash/UnsupportedHashAlgorithmError.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcDataError.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcError.java (88%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcHttpTransport.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcNetworkError.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcRequest.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcResponse.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/BranchExistsException.java (81%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/CommonPath.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/LeafOutOfBoundsException.java (81%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/MerkleTreePathVerificationResult.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/PathVerificationResult.java (71%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/Branch.java (60%) create mode 100644 src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedBranch.java rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/FinalizedLeafBranch.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/FinalizedNodeBranch.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/LeafBranch.java (60%) rename src/main/java/{com/unicity/sdk/mtree/sum => org/unicitylabs/sdk/mtree/plain}/NodeBranch.java (67%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/PendingLeafBranch.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/PendingNodeBranch.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/SparseMerkleTree.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/SparseMerkleTreePath.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/SparseMerkleTreePathStep.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/SparseMerkleTreeRootNode.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/Branch.java (61%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/FinalizedBranch.java (61%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/FinalizedLeafBranch.java (81%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/FinalizedNodeBranch.java (89%) create mode 100644 src/main/java/org/unicitylabs/sdk/mtree/sum/LeafBranch.java rename src/main/java/{com/unicity/sdk/mtree/plain => org/unicitylabs/sdk/mtree/sum}/NodeBranch.java (69%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/PendingLeafBranch.java (85%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/PendingNodeBranch.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/SparseMerkleSumTree.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/SparseMerkleSumTreePath.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/SparseMerkleSumTreePathStep.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/BurnPredicate.java (77%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/BurnPredicateReference.java (71%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/DefaultPredicate.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/IPredicateFactory.java (78%) create mode 100644 src/main/java/org/unicitylabs/sdk/predicate/IPredicateReference.java rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/MaskedPredicate.java (82%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/MaskedPredicateReference.java (76%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/Predicate.java (55%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/PredicateType.java (63%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/UnmaskedPredicate.java (77%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/predicate/UnmaskedPredicateReference.java (76%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/InvalidFieldValueException.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/MissingFieldException.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/UnicityObjectMapper.java (63%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/CborSerializationException.java (84%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/address/AddressCbor.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/api/AuthenticatorCbor.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/hash/DataHashCbor.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java (87%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/predicate/BurnPredicateCbor.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/predicate/PredicateCbor.java (83%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/token/TokenCbor.java (87%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/token/TokenIdCbor.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/token/TokenStateCbor.java (90%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/token/TokenTypeCbor.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/InclusionProofCbor.java (85%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java (83%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java (75%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/TransactionCbor.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java (87%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java (84%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/address/AddressJson.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/AuthenticatorJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/BlockHeightResponseJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/InclusionProofRequestJson.java (88%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/RequestIdJson.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/SubmitCommitmentRequestJson.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/api/SubmitCommitmentResponseJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/hash/DataHashJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/predicate/BurnPredicateJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/predicate/MaskedPredicateJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/predicate/PredicateJson.java (83%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/predicate/UnmaskedPredicateJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/token/TokenIdJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/token/TokenJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/token/TokenStateJson.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/token/TokenTypeJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/token/fungible/TokenCoinDataJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/CommitmentJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/InclusionProofJson.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/MintCommitmentJson.java (75%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/MintTransactionDataJson.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/MintTransactionReasonJson.java (75%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/TransactionJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/TransferCommitmentJson.java (74%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/TransferTransactionDataJson.java (92%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/split/SplitMintReasonJson.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/serializer/json/util/ByteArrayHexJson.java (94%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/signing/Signature.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/signing/SigningService.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/NameTagTokenState.java (55%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/Token.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/TokenId.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/TokenState.java (83%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/TokenType.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/fungible/CoinId.java (85%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/token/fungible/TokenCoinData.java (95%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/Commitment.java (93%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/InclusionProof.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/InclusionProofVerificationStatus.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/MintCommitment.java (88%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/MintReasonType.java (57%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/MintTransactionData.java (89%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/MintTransactionReason.java (58%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/MintTransactionState.java (67%) create mode 100644 src/main/java/org/unicitylabs/sdk/transaction/NametagMintTransactionData.java rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/Transaction.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/TransactionData.java (55%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/TransferCommitment.java (87%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/TransferTransactionData.java (86%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/split/SplitMintReason.java (82%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/split/SplitMintReasonProof.java (80%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/transaction/split/TokenSplitBuilder.java (83%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/util/BigIntegerConverter.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/util/BitString.java (96%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/util/HexConverter.java (97%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/util/InclusionProofUtils.java (91%) rename src/main/java/{com/unicity => org/unicitylabs}/sdk/util/VerificationResult.java (97%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/AndroidCompatibilityTest.java (91%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/TestAggregatorClient.java (71%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/api/AuthenticatorTest.java (83%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/api/RequestIdTest.java (84%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/common/split/BaseTokenSplitTest.java (78%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/e2e/BasicE2ETest.java (92%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/e2e/CommonTestFlow.java (88%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/e2e/TokenE2ETest.java (91%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/functional/FunctionalTokenSplitTest.java (52%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/hash/DataHashTest.java (95%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/hash/DataHasherTest.java (98%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/integration/TokenIntegrationTest.java (97%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcRequestTest.java (88%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/jsonrpc/JsonRpcResponseTest.java (84%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/CommonPathTest.java (95%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/MerkleTreePathStepBranchTest.java (87%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/MerkleTreePathStepTest.java (90%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/MerkleTreePathTest.java (93%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/plain/SparseMerkleTreeTest.java (95%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/mtree/sum/SparseMerkleSumTreeTest.java (94%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/predicate/MaskedPredicateReferenceTest.java (81%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/signing/SignatureRecoveryTest.java (94%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/signing/SigningServiceTest.java (96%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/token/TokenIdTest.java (91%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/token/TokenTest.java (82%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/transaction/CommitmentTest.java (73%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/transaction/InclusionProofTest.java (84%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/transaction/split/TokenSplitBuilderTest.java (83%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/utils/TestTokenData.java (90%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/utils/TestUtils.java (87%) rename src/test/java/{com/unicity => org/unicitylabs}/sdk/utils/TokenUtils.java (77%) diff --git a/build.gradle.kts b/build.gradle.kts index 27a918d..59e2983 100644 --- a/build.gradle.kts +++ b/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() diff --git a/src/main/java/com/unicity/sdk/Hashable.java b/src/main/java/com/unicity/sdk/Hashable.java deleted file mode 100644 index f2ec10f..0000000 --- a/src/main/java/com/unicity/sdk/Hashable.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.unicity.sdk; - -import com.unicity.sdk.hash.DataHash; - -public interface Hashable { - DataHash getHash(); -} diff --git a/src/main/java/com/unicity/sdk/ISerializable.java b/src/main/java/com/unicity/sdk/ISerializable.java deleted file mode 100644 index 28a99f7..0000000 --- a/src/main/java/com/unicity/sdk/ISerializable.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.unicity.sdk; - -/** - * Interface for serializable objects that can be converted to CBOR and JSON. - */ -public interface ISerializable { - /** - * Serialize the object into a JSON friendly structure. - * - * @return Serializable JSON value - */ - Object toJSON(); - - /** - * Serialize the object into a CBOR byte array. - * - * @return CBOR encoded representation of the object - */ - byte[] toCBOR(); -} diff --git a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedBranch.java b/src/main/java/com/unicity/sdk/mtree/plain/FinalizedBranch.java deleted file mode 100644 index d0a0362..0000000 --- a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedBranch.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.unicity.sdk.mtree.plain; - -import com.unicity.sdk.hash.DataHash; - -interface FinalizedBranch extends Branch { - DataHash getHash(); -} diff --git a/src/main/java/com/unicity/sdk/mtree/sum/LeafBranch.java b/src/main/java/com/unicity/sdk/mtree/sum/LeafBranch.java deleted file mode 100644 index 1e2221b..0000000 --- a/src/main/java/com/unicity/sdk/mtree/sum/LeafBranch.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.unicity.sdk.mtree.sum; - -import com.unicity.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; - -interface LeafBranch extends Branch { - LeafValue getValue(); -} diff --git a/src/main/java/com/unicity/sdk/predicate/IPredicateReference.java b/src/main/java/com/unicity/sdk/predicate/IPredicateReference.java deleted file mode 100644 index 98b1bdd..0000000 --- a/src/main/java/com/unicity/sdk/predicate/IPredicateReference.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.unicity.sdk.predicate; - -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; - -public interface IPredicateReference { - DataHash getHash(); - Address toAddress(); -} diff --git a/src/main/java/com/unicity/sdk/transaction/NametagMintTransactionData.java b/src/main/java/com/unicity/sdk/transaction/NametagMintTransactionData.java deleted file mode 100644 index 9e80353..0000000 --- a/src/main/java/com/unicity/sdk/transaction/NametagMintTransactionData.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.unicity.sdk.transaction; - -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.TokenCoinData; -import java.nio.charset.StandardCharsets; - -public class NametagMintTransactionData extends MintTransactionData { - public NametagMintTransactionData( - String name, - TokenType tokenType, - byte[] tokenData, - TokenCoinData coinData, - Address recipient, - byte[] salt, - Address targetAddress - ) { - super( - TokenId.fromNameTag(name), - tokenType, - tokenData, - coinData, - recipient, - salt, - new DataHasher(HashAlgorithm.SHA256) - .update(targetAddress.getAddress().getBytes(StandardCharsets.UTF_8)) - .digest(), - null - ); - } -} \ No newline at end of file diff --git a/src/main/java/org/unicitylabs/sdk/Hashable.java b/src/main/java/org/unicitylabs/sdk/Hashable.java new file mode 100644 index 0000000..5dd4036 --- /dev/null +++ b/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(); +} diff --git a/src/main/java/com/unicity/sdk/StateTransitionClient.java b/src/main/java/org/unicitylabs/sdk/StateTransitionClient.java similarity index 76% rename from src/main/java/com/unicity/sdk/StateTransitionClient.java rename to src/main/java/org/unicitylabs/sdk/StateTransitionClient.java index b99a919..6c22764 100644 --- a/src/main/java/com/unicity/sdk/StateTransitionClient.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/address/Address.java b/src/main/java/org/unicitylabs/sdk/address/Address.java similarity index 70% rename from src/main/java/com/unicity/sdk/address/Address.java rename to src/main/java/org/unicitylabs/sdk/address/Address.java index 1c8a12c..af963d7 100644 --- a/src/main/java/com/unicity/sdk/address/Address.java +++ b/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(); diff --git a/src/main/java/com/unicity/sdk/address/AddressFactory.java b/src/main/java/org/unicitylabs/sdk/address/AddressFactory.java similarity index 86% rename from src/main/java/com/unicity/sdk/address/AddressFactory.java rename to src/main/java/org/unicitylabs/sdk/address/AddressFactory.java index 2eb381b..f577645 100644 --- a/src/main/java/com/unicity/sdk/address/AddressFactory.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/address/AddressScheme.java b/src/main/java/org/unicitylabs/sdk/address/AddressScheme.java similarity index 59% rename from src/main/java/com/unicity/sdk/address/AddressScheme.java rename to src/main/java/org/unicitylabs/sdk/address/AddressScheme.java index ce55468..55b0a48 100644 --- a/src/main/java/com/unicity/sdk/address/AddressScheme.java +++ b/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, diff --git a/src/main/java/com/unicity/sdk/address/DirectAddress.java b/src/main/java/org/unicitylabs/sdk/address/DirectAddress.java similarity index 86% rename from src/main/java/com/unicity/sdk/address/DirectAddress.java rename to src/main/java/org/unicitylabs/sdk/address/DirectAddress.java index 7941ca5..4d47eed 100644 --- a/src/main/java/com/unicity/sdk/address/DirectAddress.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/address/ProxyAddress.java b/src/main/java/org/unicitylabs/sdk/address/ProxyAddress.java similarity index 82% rename from src/main/java/com/unicity/sdk/address/ProxyAddress.java rename to src/main/java/org/unicitylabs/sdk/address/ProxyAddress.java index fc63fc2..4ed42bd 100644 --- a/src/main/java/com/unicity/sdk/address/ProxyAddress.java +++ b/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> 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; diff --git a/src/main/java/com/unicity/sdk/api/AggregatorClient.java b/src/main/java/org/unicitylabs/sdk/api/AggregatorClient.java similarity index 86% rename from src/main/java/com/unicity/sdk/api/AggregatorClient.java rename to src/main/java/org/unicitylabs/sdk/api/AggregatorClient.java index 84a0367..66d4a64 100644 --- a/src/main/java/com/unicity/sdk/api/AggregatorClient.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/api/Authenticator.java b/src/main/java/org/unicitylabs/sdk/api/Authenticator.java similarity index 90% rename from src/main/java/com/unicity/sdk/api/Authenticator.java rename to src/main/java/org/unicitylabs/sdk/api/Authenticator.java index 860c78d..953c884 100644 --- a/src/main/java/com/unicity/sdk/api/Authenticator.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/api/BlockHeightResponse.java b/src/main/java/org/unicitylabs/sdk/api/BlockHeightResponse.java similarity index 94% rename from src/main/java/com/unicity/sdk/api/BlockHeightResponse.java rename to src/main/java/org/unicitylabs/sdk/api/BlockHeightResponse.java index d5149d7..dcf5d17 100644 --- a/src/main/java/com/unicity/sdk/api/BlockHeightResponse.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/api/IAggregatorClient.java b/src/main/java/org/unicitylabs/sdk/api/IAggregatorClient.java similarity index 74% rename from src/main/java/com/unicity/sdk/api/IAggregatorClient.java rename to src/main/java/org/unicitylabs/sdk/api/IAggregatorClient.java index c1685fb..241d575 100644 --- a/src/main/java/com/unicity/sdk/api/IAggregatorClient.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/api/InclusionProofRequest.java b/src/main/java/org/unicitylabs/sdk/api/InclusionProofRequest.java similarity index 87% rename from src/main/java/com/unicity/sdk/api/InclusionProofRequest.java rename to src/main/java/org/unicitylabs/sdk/api/InclusionProofRequest.java index 31f5b62..697185c 100644 --- a/src/main/java/com/unicity/sdk/api/InclusionProofRequest.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/api/LeafValue.java b/src/main/java/org/unicitylabs/sdk/api/LeafValue.java similarity index 75% rename from src/main/java/com/unicity/sdk/api/LeafValue.java rename to src/main/java/org/unicitylabs/sdk/api/LeafValue.java index c390bfd..a57e563 100644 --- a/src/main/java/com/unicity/sdk/api/LeafValue.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/api/RequestId.java b/src/main/java/org/unicitylabs/sdk/api/RequestId.java similarity index 90% rename from src/main/java/com/unicity/sdk/api/RequestId.java rename to src/main/java/org/unicitylabs/sdk/api/RequestId.java index 9af78d5..9d0cc85 100644 --- a/src/main/java/com/unicity/sdk/api/RequestId.java +++ b/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. diff --git a/src/main/java/com/unicity/sdk/api/SubmitCommitmentRequest.java b/src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentRequest.java similarity index 91% rename from src/main/java/com/unicity/sdk/api/SubmitCommitmentRequest.java rename to src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentRequest.java index dc68cc8..2bc1c67 100644 --- a/src/main/java/com/unicity/sdk/api/SubmitCommitmentRequest.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/api/SubmitCommitmentResponse.java b/src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentResponse.java similarity index 92% rename from src/main/java/com/unicity/sdk/api/SubmitCommitmentResponse.java rename to src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentResponse.java index 3f195de..cbf5fc4 100644 --- a/src/main/java/com/unicity/sdk/api/SubmitCommitmentResponse.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/api/SubmitCommitmentStatus.java b/src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentStatus.java similarity index 96% rename from src/main/java/com/unicity/sdk/api/SubmitCommitmentStatus.java rename to src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentStatus.java index 3c9ce31..8564357 100644 --- a/src/main/java/com/unicity/sdk/api/SubmitCommitmentStatus.java +++ b/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. diff --git a/src/main/java/com/unicity/sdk/hash/DataHash.java b/src/main/java/org/unicitylabs/sdk/hash/DataHash.java similarity index 97% rename from src/main/java/com/unicity/sdk/hash/DataHash.java rename to src/main/java/org/unicitylabs/sdk/hash/DataHash.java index 91496cc..66436e0 100644 --- a/src/main/java/com/unicity/sdk/hash/DataHash.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/hash/DataHasher.java b/src/main/java/org/unicitylabs/sdk/hash/DataHasher.java similarity index 97% rename from src/main/java/com/unicity/sdk/hash/DataHasher.java rename to src/main/java/org/unicitylabs/sdk/hash/DataHasher.java index 3f00aca..7bd1982 100644 --- a/src/main/java/com/unicity/sdk/hash/DataHasher.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/hash/HashAlgorithm.java b/src/main/java/org/unicitylabs/sdk/hash/HashAlgorithm.java similarity index 96% rename from src/main/java/com/unicity/sdk/hash/HashAlgorithm.java rename to src/main/java/org/unicitylabs/sdk/hash/HashAlgorithm.java index cb24840..db15164 100644 --- a/src/main/java/com/unicity/sdk/hash/HashAlgorithm.java +++ b/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"), diff --git a/src/main/java/com/unicity/sdk/hash/UnsupportedHashAlgorithmError.java b/src/main/java/org/unicitylabs/sdk/hash/UnsupportedHashAlgorithmError.java similarity index 93% rename from src/main/java/com/unicity/sdk/hash/UnsupportedHashAlgorithmError.java rename to src/main/java/org/unicitylabs/sdk/hash/UnsupportedHashAlgorithmError.java index c333fe2..3b4129c 100644 --- a/src/main/java/com/unicity/sdk/hash/UnsupportedHashAlgorithmError.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcDataError.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcDataError.java similarity index 89% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcDataError.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcDataError.java index b97557e..720f088 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcDataError.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcError.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcError.java similarity index 88% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcError.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcError.java index c479c7f..e0dd13a 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcError.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcHttpTransport.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcHttpTransport.java similarity index 96% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcHttpTransport.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcHttpTransport.java index 5044702..3941b5d 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcHttpTransport.java +++ b/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; diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcNetworkError.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcNetworkError.java similarity index 92% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcNetworkError.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcNetworkError.java index e622415..f995203 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcNetworkError.java +++ b/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 { diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcRequest.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequest.java similarity index 94% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcRequest.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequest.java index 9425ca8..9df01f4 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcRequest.java +++ b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequest.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.jsonrpc; +package org.unicitylabs.sdk.jsonrpc; import java.util.UUID; diff --git a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcResponse.java b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponse.java similarity index 96% rename from src/main/java/com/unicity/sdk/jsonrpc/JsonRpcResponse.java rename to src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponse.java index 5325e59..3b34f45 100644 --- a/src/main/java/com/unicity/sdk/jsonrpc/JsonRpcResponse.java +++ b/src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponse.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.jsonrpc; +package org.unicitylabs.sdk.jsonrpc; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/com/unicity/sdk/mtree/BranchExistsException.java b/src/main/java/org/unicitylabs/sdk/mtree/BranchExistsException.java similarity index 81% rename from src/main/java/com/unicity/sdk/mtree/BranchExistsException.java rename to src/main/java/org/unicitylabs/sdk/mtree/BranchExistsException.java index 017d813..3804229 100644 --- a/src/main/java/com/unicity/sdk/mtree/BranchExistsException.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/BranchExistsException.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; public class BranchExistsException extends Exception { public BranchExistsException() { diff --git a/src/main/java/com/unicity/sdk/mtree/CommonPath.java b/src/main/java/org/unicitylabs/sdk/mtree/CommonPath.java similarity index 97% rename from src/main/java/com/unicity/sdk/mtree/CommonPath.java rename to src/main/java/org/unicitylabs/sdk/mtree/CommonPath.java index 14fa1ca..3582b85 100644 --- a/src/main/java/com/unicity/sdk/mtree/CommonPath.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/CommonPath.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/LeafOutOfBoundsException.java b/src/main/java/org/unicitylabs/sdk/mtree/LeafOutOfBoundsException.java similarity index 81% rename from src/main/java/com/unicity/sdk/mtree/LeafOutOfBoundsException.java rename to src/main/java/org/unicitylabs/sdk/mtree/LeafOutOfBoundsException.java index bfe6a42..b816a3e 100644 --- a/src/main/java/com/unicity/sdk/mtree/LeafOutOfBoundsException.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/LeafOutOfBoundsException.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; public class LeafOutOfBoundsException extends Exception { public LeafOutOfBoundsException() { diff --git a/src/main/java/com/unicity/sdk/mtree/MerkleTreePathVerificationResult.java b/src/main/java/org/unicitylabs/sdk/mtree/MerkleTreePathVerificationResult.java similarity index 96% rename from src/main/java/com/unicity/sdk/mtree/MerkleTreePathVerificationResult.java rename to src/main/java/org/unicitylabs/sdk/mtree/MerkleTreePathVerificationResult.java index ce8bacd..b2a2781 100644 --- a/src/main/java/com/unicity/sdk/mtree/MerkleTreePathVerificationResult.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/MerkleTreePathVerificationResult.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/PathVerificationResult.java b/src/main/java/org/unicitylabs/sdk/mtree/PathVerificationResult.java similarity index 71% rename from src/main/java/com/unicity/sdk/mtree/PathVerificationResult.java rename to src/main/java/org/unicitylabs/sdk/mtree/PathVerificationResult.java index 6996b17..28f0bf8 100644 --- a/src/main/java/com/unicity/sdk/mtree/PathVerificationResult.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/PathVerificationResult.java @@ -1,5 +1,5 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; public enum PathVerificationResult { OK, diff --git a/src/main/java/com/unicity/sdk/mtree/plain/Branch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/Branch.java similarity index 60% rename from src/main/java/com/unicity/sdk/mtree/plain/Branch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/Branch.java index 1ca30a6..0431634 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/Branch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/Branch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.math.BigInteger; interface Branch { diff --git a/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedBranch.java new file mode 100644 index 0000000..5483ab7 --- /dev/null +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedBranch.java @@ -0,0 +1,7 @@ +package org.unicitylabs.sdk.mtree.plain; + +import org.unicitylabs.sdk.hash.DataHash; + +interface FinalizedBranch extends Branch { + DataHash getHash(); +} diff --git a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedLeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedLeafBranch.java similarity index 86% rename from src/main/java/com/unicity/sdk/mtree/plain/FinalizedLeafBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedLeafBranch.java index d6404bf..e19b578 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedLeafBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedLeafBranch.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedNodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedNodeBranch.java similarity index 89% rename from src/main/java/com/unicity/sdk/mtree/plain/FinalizedNodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedNodeBranch.java index 038f321..605c5dc 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/FinalizedNodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/FinalizedNodeBranch.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/LeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/LeafBranch.java similarity index 60% rename from src/main/java/com/unicity/sdk/mtree/plain/LeafBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/LeafBranch.java index 593256d..488e5ad 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/LeafBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/LeafBranch.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; interface LeafBranch extends Branch { byte[] getValue(); diff --git a/src/main/java/com/unicity/sdk/mtree/sum/NodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/NodeBranch.java similarity index 67% rename from src/main/java/com/unicity/sdk/mtree/sum/NodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/NodeBranch.java index 34b0602..74c7164 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/NodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/NodeBranch.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.plain; interface NodeBranch extends Branch { Branch getLeft(); diff --git a/src/main/java/com/unicity/sdk/mtree/plain/PendingLeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/PendingLeafBranch.java similarity index 91% rename from src/main/java/com/unicity/sdk/mtree/plain/PendingLeafBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/PendingLeafBranch.java index d3fb5c1..ed35e62 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/PendingLeafBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/PendingLeafBranch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/PendingNodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/PendingNodeBranch.java similarity index 92% rename from src/main/java/com/unicity/sdk/mtree/plain/PendingNodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/PendingNodeBranch.java index 9ae1a5d..d8af437 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/PendingNodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/PendingNodeBranch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTree.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTree.java similarity index 93% rename from src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTree.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTree.java index 16897aa..5798e48 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTree.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTree.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.CommonPath; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.BranchExistsException; +import org.unicitylabs.sdk.mtree.CommonPath; +import org.unicitylabs.sdk.mtree.LeafOutOfBoundsException; import java.math.BigInteger; import java.util.Arrays; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePath.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePath.java similarity index 89% rename from src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePath.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePath.java index 2499667..8c01fa0 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePath.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePath.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.MerkleTreePathVerificationResult; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.MerkleTreePathVerificationResult; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePathStep.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePathStep.java similarity index 97% rename from src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePathStep.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePathStep.java index 0253b6b..d670c63 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreePathStep.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreePathStep.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeRootNode.java b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeRootNode.java similarity index 94% rename from src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeRootNode.java rename to src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeRootNode.java index cdb5a32..3b1456e 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeRootNode.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeRootNode.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.CommonPath; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.CommonPath; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/Branch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/Branch.java similarity index 61% rename from src/main/java/com/unicity/sdk/mtree/sum/Branch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/Branch.java index f0c3dd7..a37821b 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/Branch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/Branch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.math.BigInteger; interface Branch { diff --git a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedBranch.java similarity index 61% rename from src/main/java/com/unicity/sdk/mtree/sum/FinalizedBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedBranch.java index b1d2138..c229285 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedBranch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHash; import java.math.BigInteger; interface FinalizedBranch extends Branch { diff --git a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedLeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedLeafBranch.java similarity index 81% rename from src/main/java/com/unicity/sdk/mtree/sum/FinalizedLeafBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedLeafBranch.java index 3438ee0..d0e9285 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedLeafBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedLeafBranch.java @@ -1,13 +1,13 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; 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.mtree.sum.SparseMerkleSumTree.LeafValue; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.serializer.cbor.CborSerializationException; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedNodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedNodeBranch.java similarity index 89% rename from src/main/java/com/unicity/sdk/mtree/sum/FinalizedNodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedNodeBranch.java index 60cf258..3827930 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/FinalizedNodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/FinalizedNodeBranch.java @@ -1,12 +1,12 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; 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.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.util.BigIntegerConverter; +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.BigIntegerConverter; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/org/unicitylabs/sdk/mtree/sum/LeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/LeafBranch.java new file mode 100644 index 0000000..4b11c39 --- /dev/null +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/LeafBranch.java @@ -0,0 +1,7 @@ +package org.unicitylabs.sdk.mtree.sum; + +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; + +interface LeafBranch extends Branch { + LeafValue getValue(); +} diff --git a/src/main/java/com/unicity/sdk/mtree/plain/NodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/NodeBranch.java similarity index 69% rename from src/main/java/com/unicity/sdk/mtree/plain/NodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/NodeBranch.java index bab0f1e..9f58af7 100644 --- a/src/main/java/com/unicity/sdk/mtree/plain/NodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/NodeBranch.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.sum; interface NodeBranch extends Branch { Branch getLeft(); diff --git a/src/main/java/com/unicity/sdk/mtree/sum/PendingLeafBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/PendingLeafBranch.java similarity index 85% rename from src/main/java/com/unicity/sdk/mtree/sum/PendingLeafBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/PendingLeafBranch.java index 787e502..e384c41 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/PendingLeafBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/PendingLeafBranch.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/PendingNodeBranch.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/PendingNodeBranch.java similarity index 93% rename from src/main/java/com/unicity/sdk/mtree/sum/PendingNodeBranch.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/PendingNodeBranch.java index 7aed326..502e3e2 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/PendingNodeBranch.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/PendingNodeBranch.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.math.BigInteger; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTree.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTree.java similarity index 94% rename from src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTree.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTree.java index 4dd58e0..7b0c30c 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTree.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTree.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.CommonPath; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.BranchExistsException; +import org.unicitylabs.sdk.mtree.CommonPath; +import org.unicitylabs.sdk.mtree.LeafOutOfBoundsException; import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePath.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePath.java similarity index 91% rename from src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePath.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePath.java index c49097e..2230a9a 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePath.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePath.java @@ -1,14 +1,14 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.MerkleTreePathVerificationResult; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.MerkleTreePathVerificationResult; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.serializer.cbor.CborSerializationException; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePathStep.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePathStep.java similarity index 97% rename from src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePathStep.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePathStep.java index 41faa2f..86b1572 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreePathStep.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreePathStep.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java similarity index 90% rename from src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java rename to src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java index 53a2e4a..3edaebc 100644 --- a/src/main/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java +++ b/src/main/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeRootNode.java @@ -1,14 +1,14 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; 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.mtree.CommonPath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath.Root; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.CommonPath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath.Root; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.serializer.cbor.CborSerializationException; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/predicate/BurnPredicate.java b/src/main/java/org/unicitylabs/sdk/predicate/BurnPredicate.java similarity index 77% rename from src/main/java/com/unicity/sdk/predicate/BurnPredicate.java rename to src/main/java/org/unicitylabs/sdk/predicate/BurnPredicate.java index 8b85dcc..8367963 100644 --- a/src/main/java/com/unicity/sdk/predicate/BurnPredicate.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/BurnPredicate.java @@ -1,16 +1,16 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; +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.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/predicate/BurnPredicateReference.java b/src/main/java/org/unicitylabs/sdk/predicate/BurnPredicateReference.java similarity index 71% rename from src/main/java/com/unicity/sdk/predicate/BurnPredicateReference.java rename to src/main/java/org/unicitylabs/sdk/predicate/BurnPredicateReference.java index 1ba1435..47e4975 100644 --- a/src/main/java/com/unicity/sdk/predicate/BurnPredicateReference.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/BurnPredicateReference.java @@ -1,14 +1,14 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.address.DirectAddress; +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.token.TokenType; public class BurnPredicateReference implements IPredicateReference { diff --git a/src/main/java/com/unicity/sdk/predicate/DefaultPredicate.java b/src/main/java/org/unicitylabs/sdk/predicate/DefaultPredicate.java similarity index 86% rename from src/main/java/com/unicity/sdk/predicate/DefaultPredicate.java rename to src/main/java/org/unicitylabs/sdk/predicate/DefaultPredicate.java index 0652d79..afaa01b 100644 --- a/src/main/java/com/unicity/sdk/predicate/DefaultPredicate.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/DefaultPredicate.java @@ -1,19 +1,19 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.transaction.InclusionProofVerificationStatus; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +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.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.transaction.InclusionProofVerificationStatus; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/predicate/IPredicateFactory.java b/src/main/java/org/unicitylabs/sdk/predicate/IPredicateFactory.java similarity index 78% rename from src/main/java/com/unicity/sdk/predicate/IPredicateFactory.java rename to src/main/java/org/unicitylabs/sdk/predicate/IPredicateFactory.java index 31eff9f..36f04cb 100644 --- a/src/main/java/com/unicity/sdk/predicate/IPredicateFactory.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/IPredicateFactory.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; /** * Factory capable of reconstructing predicates from their CBOR/JSON form. diff --git a/src/main/java/org/unicitylabs/sdk/predicate/IPredicateReference.java b/src/main/java/org/unicitylabs/sdk/predicate/IPredicateReference.java new file mode 100644 index 0000000..01c35e6 --- /dev/null +++ b/src/main/java/org/unicitylabs/sdk/predicate/IPredicateReference.java @@ -0,0 +1,9 @@ +package org.unicitylabs.sdk.predicate; + +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; + +public interface IPredicateReference { + DataHash getHash(); + Address toAddress(); +} diff --git a/src/main/java/com/unicity/sdk/predicate/MaskedPredicate.java b/src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicate.java similarity index 82% rename from src/main/java/com/unicity/sdk/predicate/MaskedPredicate.java rename to src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicate.java index 5e2195a..fc689a4 100644 --- a/src/main/java/com/unicity/sdk/predicate/MaskedPredicate.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicate.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.TokenType; public class MaskedPredicate extends DefaultPredicate { diff --git a/src/main/java/com/unicity/sdk/predicate/MaskedPredicateReference.java b/src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicateReference.java similarity index 76% rename from src/main/java/com/unicity/sdk/predicate/MaskedPredicateReference.java rename to src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicateReference.java index c2361dc..f2eb55c 100644 --- a/src/main/java/com/unicity/sdk/predicate/MaskedPredicateReference.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/MaskedPredicateReference.java @@ -1,15 +1,15 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.address.DirectAddress; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.serializer.cbor.CborSerializationException; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.TokenType; public class MaskedPredicateReference implements IPredicateReference { diff --git a/src/main/java/com/unicity/sdk/predicate/Predicate.java b/src/main/java/org/unicitylabs/sdk/predicate/Predicate.java similarity index 55% rename from src/main/java/com/unicity/sdk/predicate/Predicate.java rename to src/main/java/org/unicitylabs/sdk/predicate/Predicate.java index 8e4b793..d72df36 100644 --- a/src/main/java/com/unicity/sdk/predicate/Predicate.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/Predicate.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; public interface Predicate { String getType(); diff --git a/src/main/java/com/unicity/sdk/predicate/PredicateType.java b/src/main/java/org/unicitylabs/sdk/predicate/PredicateType.java similarity index 63% rename from src/main/java/com/unicity/sdk/predicate/PredicateType.java rename to src/main/java/org/unicitylabs/sdk/predicate/PredicateType.java index 4a1ff6c..0be13ed 100644 --- a/src/main/java/com/unicity/sdk/predicate/PredicateType.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/PredicateType.java @@ -1,5 +1,5 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; public enum PredicateType { UNMASKED, diff --git a/src/main/java/com/unicity/sdk/predicate/UnmaskedPredicate.java b/src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicate.java similarity index 77% rename from src/main/java/com/unicity/sdk/predicate/UnmaskedPredicate.java rename to src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicate.java index 34c47d2..cbb1e6b 100644 --- a/src/main/java/com/unicity/sdk/predicate/UnmaskedPredicate.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicate.java @@ -1,17 +1,17 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.signing.Signature; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; +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.signing.Signature; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; public class UnmaskedPredicate extends DefaultPredicate { diff --git a/src/main/java/com/unicity/sdk/predicate/UnmaskedPredicateReference.java b/src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicateReference.java similarity index 76% rename from src/main/java/com/unicity/sdk/predicate/UnmaskedPredicateReference.java rename to src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicateReference.java index 55fe50b..ae85e9e 100644 --- a/src/main/java/com/unicity/sdk/predicate/UnmaskedPredicateReference.java +++ b/src/main/java/org/unicitylabs/sdk/predicate/UnmaskedPredicateReference.java @@ -1,15 +1,15 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.address.DirectAddress; +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.signing.SigningService; +import org.unicitylabs.sdk.token.TokenType; public class UnmaskedPredicateReference implements IPredicateReference { diff --git a/src/main/java/com/unicity/sdk/serializer/InvalidFieldValueException.java b/src/main/java/org/unicitylabs/sdk/serializer/InvalidFieldValueException.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/InvalidFieldValueException.java rename to src/main/java/org/unicitylabs/sdk/serializer/InvalidFieldValueException.java index 60dcde8..0d3b8af 100644 --- a/src/main/java/com/unicity/sdk/serializer/InvalidFieldValueException.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/InvalidFieldValueException.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer; +package org.unicitylabs.sdk.serializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/src/main/java/com/unicity/sdk/serializer/MissingFieldException.java b/src/main/java/org/unicitylabs/sdk/serializer/MissingFieldException.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/MissingFieldException.java rename to src/main/java/org/unicitylabs/sdk/serializer/MissingFieldException.java index 9321061..17c833b 100644 --- a/src/main/java/com/unicity/sdk/serializer/MissingFieldException.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/MissingFieldException.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer; +package org.unicitylabs.sdk.serializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/src/main/java/com/unicity/sdk/serializer/UnicityObjectMapper.java b/src/main/java/org/unicitylabs/sdk/serializer/UnicityObjectMapper.java similarity index 63% rename from src/main/java/com/unicity/sdk/serializer/UnicityObjectMapper.java rename to src/main/java/org/unicitylabs/sdk/serializer/UnicityObjectMapper.java index 1b8f2f9..4c4f0c9 100644 --- a/src/main/java/com/unicity/sdk/serializer/UnicityObjectMapper.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/UnicityObjectMapper.java @@ -1,105 +1,105 @@ -package com.unicity.sdk.serializer; +package org.unicitylabs.sdk.serializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.BlockHeightResponse; -import com.unicity.sdk.api.InclusionProofRequest; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.api.SubmitCommitmentRequest; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.jsonrpc.JsonRpcError; -import com.unicity.sdk.jsonrpc.JsonRpcRequest; -import com.unicity.sdk.jsonrpc.JsonRpcResponse; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.predicate.UnmaskedPredicate; -import com.unicity.sdk.serializer.cbor.address.AddressCbor; -import com.unicity.sdk.serializer.cbor.api.AuthenticatorCbor; -import com.unicity.sdk.serializer.cbor.hash.DataHashCbor; -import com.unicity.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathCbor; -import com.unicity.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathStepBranchCbor; -import com.unicity.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathStepCbor; -import com.unicity.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathCbor; -import com.unicity.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathStepBranchCbor; -import com.unicity.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathStepCbor; -import com.unicity.sdk.serializer.cbor.predicate.BurnPredicateCbor; -import com.unicity.sdk.serializer.cbor.predicate.MaskedPredicateCbor; -import com.unicity.sdk.serializer.cbor.predicate.PredicateCbor; -import com.unicity.sdk.serializer.cbor.predicate.UnmaskedPredicateCbor; -import com.unicity.sdk.serializer.cbor.token.TokenCbor; -import com.unicity.sdk.serializer.cbor.token.TokenIdCbor; -import com.unicity.sdk.serializer.cbor.token.TokenStateCbor; -import com.unicity.sdk.serializer.cbor.token.TokenTypeCbor; -import com.unicity.sdk.serializer.cbor.token.fungible.TokenCoinDataCbor; -import com.unicity.sdk.serializer.cbor.transaction.InclusionProofCbor; -import com.unicity.sdk.serializer.cbor.transaction.MintTransactionDataCbor; -import com.unicity.sdk.serializer.cbor.transaction.MintTransactionReasonCbor; -import com.unicity.sdk.serializer.cbor.transaction.TransactionCbor; -import com.unicity.sdk.serializer.cbor.transaction.TransferTransactionDataCbor; -import com.unicity.sdk.serializer.cbor.transaction.split.SplitMintReasonCbor; -import com.unicity.sdk.serializer.cbor.transaction.split.SplitMintReasonProofCbor; -import com.unicity.sdk.serializer.json.address.AddressJson; -import com.unicity.sdk.serializer.json.api.AuthenticatorJson; -import com.unicity.sdk.serializer.json.api.BlockHeightResponseJson; -import com.unicity.sdk.serializer.json.api.InclusionProofRequestJson; -import com.unicity.sdk.serializer.json.api.RequestIdJson; -import com.unicity.sdk.serializer.json.api.SubmitCommitmentRequestJson; -import com.unicity.sdk.serializer.json.api.SubmitCommitmentResponseJson; -import com.unicity.sdk.serializer.json.hash.DataHashJson; -import com.unicity.sdk.serializer.json.jsonrpc.JsonRpcErrorJson; -import com.unicity.sdk.serializer.json.jsonrpc.JsonRpcRequestJson; -import com.unicity.sdk.serializer.json.jsonrpc.JsonRpcResponseJson; -import com.unicity.sdk.serializer.json.mtree.plain.SparseMerkleTreePathJson; -import com.unicity.sdk.serializer.json.mtree.plain.SparseMerkleTreePathStepBranchJson; -import com.unicity.sdk.serializer.json.mtree.plain.SparseMerkleTreePathStepJson; -import com.unicity.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathJson; -import com.unicity.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathStepBranchJson; -import com.unicity.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathStepJson; -import com.unicity.sdk.serializer.json.predicate.BurnPredicateJson; -import com.unicity.sdk.serializer.json.predicate.MaskedPredicateJson; -import com.unicity.sdk.serializer.json.predicate.PredicateJson; -import com.unicity.sdk.serializer.json.predicate.UnmaskedPredicateJson; -import com.unicity.sdk.serializer.json.token.fungible.TokenCoinDataJson; -import com.unicity.sdk.serializer.json.token.TokenIdJson; -import com.unicity.sdk.serializer.json.token.TokenJson; -import com.unicity.sdk.serializer.json.token.TokenStateJson; -import com.unicity.sdk.serializer.json.token.TokenTypeJson; -import com.unicity.sdk.serializer.json.transaction.split.SplitMintReasonJson; -import com.unicity.sdk.serializer.json.transaction.CommitmentJson; -import com.unicity.sdk.serializer.json.transaction.InclusionProofJson; -import com.unicity.sdk.serializer.json.transaction.MintCommitmentJson; -import com.unicity.sdk.serializer.json.transaction.MintTransactionDataJson; -import com.unicity.sdk.serializer.json.transaction.MintTransactionReasonJson; -import com.unicity.sdk.serializer.json.transaction.TransactionJson; -import com.unicity.sdk.serializer.json.transaction.TransferCommitmentJson; -import com.unicity.sdk.serializer.json.transaction.TransferTransactionDataJson; -import com.unicity.sdk.serializer.json.transaction.split.SplitMintReasonProofJson; -import com.unicity.sdk.serializer.json.util.ByteArrayHexJson; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.Commitment; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.MintCommitment; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.MintTransactionReason; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferCommitment; -import com.unicity.sdk.transaction.TransferTransactionData; -import com.unicity.sdk.transaction.split.SplitMintReasonProof; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.BlockHeightResponse; +import org.unicitylabs.sdk.api.InclusionProofRequest; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.api.SubmitCommitmentRequest; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.jsonrpc.JsonRpcError; +import org.unicitylabs.sdk.jsonrpc.JsonRpcRequest; +import org.unicitylabs.sdk.jsonrpc.JsonRpcResponse; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.serializer.cbor.address.AddressCbor; +import org.unicitylabs.sdk.serializer.cbor.api.AuthenticatorCbor; +import org.unicitylabs.sdk.serializer.cbor.hash.DataHashCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathStepBranchCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.plain.SparseMerkleTreePathStepCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathStepBranchCbor; +import org.unicitylabs.sdk.serializer.cbor.mtree.sum.SparseMerkleSumTreePathStepCbor; +import org.unicitylabs.sdk.serializer.cbor.predicate.BurnPredicateCbor; +import org.unicitylabs.sdk.serializer.cbor.predicate.MaskedPredicateCbor; +import org.unicitylabs.sdk.serializer.cbor.predicate.PredicateCbor; +import org.unicitylabs.sdk.serializer.cbor.predicate.UnmaskedPredicateCbor; +import org.unicitylabs.sdk.serializer.cbor.token.TokenCbor; +import org.unicitylabs.sdk.serializer.cbor.token.TokenIdCbor; +import org.unicitylabs.sdk.serializer.cbor.token.TokenStateCbor; +import org.unicitylabs.sdk.serializer.cbor.token.TokenTypeCbor; +import org.unicitylabs.sdk.serializer.cbor.token.fungible.TokenCoinDataCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.InclusionProofCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.MintTransactionDataCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.MintTransactionReasonCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.TransactionCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.TransferTransactionDataCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.split.SplitMintReasonCbor; +import org.unicitylabs.sdk.serializer.cbor.transaction.split.SplitMintReasonProofCbor; +import org.unicitylabs.sdk.serializer.json.address.AddressJson; +import org.unicitylabs.sdk.serializer.json.api.AuthenticatorJson; +import org.unicitylabs.sdk.serializer.json.api.BlockHeightResponseJson; +import org.unicitylabs.sdk.serializer.json.api.InclusionProofRequestJson; +import org.unicitylabs.sdk.serializer.json.api.RequestIdJson; +import org.unicitylabs.sdk.serializer.json.api.SubmitCommitmentRequestJson; +import org.unicitylabs.sdk.serializer.json.api.SubmitCommitmentResponseJson; +import org.unicitylabs.sdk.serializer.json.hash.DataHashJson; +import org.unicitylabs.sdk.serializer.json.jsonrpc.JsonRpcErrorJson; +import org.unicitylabs.sdk.serializer.json.jsonrpc.JsonRpcRequestJson; +import org.unicitylabs.sdk.serializer.json.jsonrpc.JsonRpcResponseJson; +import org.unicitylabs.sdk.serializer.json.mtree.plain.SparseMerkleTreePathJson; +import org.unicitylabs.sdk.serializer.json.mtree.plain.SparseMerkleTreePathStepBranchJson; +import org.unicitylabs.sdk.serializer.json.mtree.plain.SparseMerkleTreePathStepJson; +import org.unicitylabs.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathJson; +import org.unicitylabs.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathStepBranchJson; +import org.unicitylabs.sdk.serializer.json.mtree.sum.SparseMerkleSumTreePathStepJson; +import org.unicitylabs.sdk.serializer.json.predicate.BurnPredicateJson; +import org.unicitylabs.sdk.serializer.json.predicate.MaskedPredicateJson; +import org.unicitylabs.sdk.serializer.json.predicate.PredicateJson; +import org.unicitylabs.sdk.serializer.json.predicate.UnmaskedPredicateJson; +import org.unicitylabs.sdk.serializer.json.token.fungible.TokenCoinDataJson; +import org.unicitylabs.sdk.serializer.json.token.TokenIdJson; +import org.unicitylabs.sdk.serializer.json.token.TokenJson; +import org.unicitylabs.sdk.serializer.json.token.TokenStateJson; +import org.unicitylabs.sdk.serializer.json.token.TokenTypeJson; +import org.unicitylabs.sdk.serializer.json.transaction.split.SplitMintReasonJson; +import org.unicitylabs.sdk.serializer.json.transaction.CommitmentJson; +import org.unicitylabs.sdk.serializer.json.transaction.InclusionProofJson; +import org.unicitylabs.sdk.serializer.json.transaction.MintCommitmentJson; +import org.unicitylabs.sdk.serializer.json.transaction.MintTransactionDataJson; +import org.unicitylabs.sdk.serializer.json.transaction.MintTransactionReasonJson; +import org.unicitylabs.sdk.serializer.json.transaction.TransactionJson; +import org.unicitylabs.sdk.serializer.json.transaction.TransferCommitmentJson; +import org.unicitylabs.sdk.serializer.json.transaction.TransferTransactionDataJson; +import org.unicitylabs.sdk.serializer.json.transaction.split.SplitMintReasonProofJson; +import org.unicitylabs.sdk.serializer.json.util.ByteArrayHexJson; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.Commitment; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.MintCommitment; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferCommitment; +import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.transaction.split.SplitMintReasonProof; public class UnicityObjectMapper { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/CborSerializationException.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/CborSerializationException.java similarity index 84% rename from src/main/java/com/unicity/sdk/serializer/cbor/CborSerializationException.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/CborSerializationException.java index e2b2d7b..7308492 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/CborSerializationException.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/CborSerializationException.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor; +package org.unicitylabs.sdk.serializer.cbor; public class CborSerializationException extends RuntimeException { public CborSerializationException(String message, Throwable cause) { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/address/AddressCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/address/AddressCbor.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/cbor/address/AddressCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/address/AddressCbor.java index 789cf1b..2fe80e8 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/address/AddressCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/address/AddressCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.address; +package org.unicitylabs.sdk.serializer.cbor.address; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.address.AddressFactory; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.AddressFactory; import java.io.IOException; public class AddressCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/api/AuthenticatorCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/api/AuthenticatorCbor.java similarity index 89% rename from src/main/java/com/unicity/sdk/serializer/cbor/api/AuthenticatorCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/api/AuthenticatorCbor.java index 4948938..4a7793d 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/api/AuthenticatorCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/api/AuthenticatorCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.api; +package org.unicitylabs.sdk.serializer.cbor.api; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.signing.Signature; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.signing.Signature; import java.io.IOException; public class AuthenticatorCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/hash/DataHashCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/hash/DataHashCbor.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/cbor/hash/DataHashCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/hash/DataHashCbor.java index 3f6888c..cc93281 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/hash/DataHashCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/hash/DataHashCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.hash; +package org.unicitylabs.sdk.serializer.cbor.hash; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHash; import java.io.IOException; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java similarity index 87% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java index 895c4b5..b24034d 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.plain; +package org.unicitylabs.sdk.serializer.cbor.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java similarity index 89% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java index 95572ea..e6081f1 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepBranchCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.plain; +package org.unicitylabs.sdk.serializer.cbor.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; import java.io.IOException; public class SparseMerkleTreePathStepBranchCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java index 9d23e76..44b72ad 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/plain/SparseMerkleTreePathStepCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.plain; +package org.unicitylabs.sdk.serializer.cbor.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.io.IOException; public class SparseMerkleTreePathStepCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java similarity index 86% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java index 8d662f2..6a836d2 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.sum; +package org.unicitylabs.sdk.serializer.cbor.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java index 97e90d5..7b38c0d 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepBranchCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.sum; +package org.unicitylabs.sdk.serializer.cbor.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.io.IOException; public class SparseMerkleSumTreePathStepBranchCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java index 1deae39..08ec1e8 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/mtree/sum/SparseMerkleSumTreePathStepCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.mtree.sum; +package org.unicitylabs.sdk.serializer.cbor.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.io.IOException; public class SparseMerkleSumTreePathStepCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/BurnPredicateCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/BurnPredicateCbor.java similarity index 89% rename from src/main/java/com/unicity/sdk/serializer/cbor/predicate/BurnPredicateCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/BurnPredicateCbor.java index 7374714..0620d9a 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/BurnPredicateCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/BurnPredicateCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.predicate; +package org.unicitylabs.sdk.serializer.cbor.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; import java.io.IOException; public class BurnPredicateCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java index 105f6bd..62fa372 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/MaskedPredicateCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.predicate; +package org.unicitylabs.sdk.serializer.cbor.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; import java.io.IOException; public class MaskedPredicateCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/PredicateCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/PredicateCbor.java similarity index 83% rename from src/main/java/com/unicity/sdk/serializer/cbor/predicate/PredicateCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/PredicateCbor.java index ff1d300..711834f 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/PredicateCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/PredicateCbor.java @@ -1,15 +1,15 @@ -package com.unicity.sdk.serializer.cbor.predicate; +package org.unicitylabs.sdk.serializer.cbor.predicate; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.predicate.PredicateType; -import com.unicity.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; import java.io.IOException; public class PredicateCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java index d7632c5..8b96e43 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/predicate/UnmaskedPredicateCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.predicate; +package org.unicitylabs.sdk.serializer.cbor.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.PredicateType; -import com.unicity.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; import java.io.IOException; public class UnmaskedPredicateCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenCbor.java similarity index 87% rename from src/main/java/com/unicity/sdk/serializer/cbor/token/TokenCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenCbor.java index 52245b9..5e58d21 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.token; +package org.unicitylabs.sdk.serializer.cbor.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenIdCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenIdCbor.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/cbor/token/TokenIdCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenIdCbor.java index 137732c..4f582d8 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenIdCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenIdCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.token; +package org.unicitylabs.sdk.serializer.cbor.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenId; import java.io.IOException; public class TokenIdCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenStateCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenStateCbor.java similarity index 90% rename from src/main/java/com/unicity/sdk/serializer/cbor/token/TokenStateCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenStateCbor.java index 6bd2797..a3c26f8 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenStateCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenStateCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.token; +package org.unicitylabs.sdk.serializer.cbor.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.token.TokenState; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.token.TokenState; import java.io.IOException; public class TokenStateCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenTypeCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenTypeCbor.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/cbor/token/TokenTypeCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenTypeCbor.java index 74b0062..d6f0bb1 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/token/TokenTypeCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/TokenTypeCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.token; +package org.unicitylabs.sdk.serializer.cbor.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.token.TokenType; import java.io.IOException; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java index 6488d85..0d30eb4 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/token/fungible/TokenCoinDataCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.token.fungible; +package org.unicitylabs.sdk.serializer.cbor.token.fungible; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.util.BigIntegerConverter; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.util.BigIntegerConverter; import java.io.IOException; import java.math.BigInteger; import java.util.LinkedHashMap; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/InclusionProofCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/InclusionProofCbor.java similarity index 85% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/InclusionProofCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/InclusionProofCbor.java index 1a05e15..363fd75 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/InclusionProofCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/InclusionProofCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction; +package org.unicitylabs.sdk.serializer.cbor.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.transaction.InclusionProof; import java.io.IOException; public class InclusionProofCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java similarity index 83% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java index 6308739..0de220c 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionDataCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction; +package org.unicitylabs.sdk.serializer.cbor.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,13 +7,13 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.MintTransactionReason; import java.io.IOException; public class MintTransactionDataCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java similarity index 75% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java index d9a64bb..a042b7c 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/MintTransactionReasonCbor.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.serializer.cbor.transaction; +package org.unicitylabs.sdk.serializer.cbor.transaction; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import com.unicity.sdk.transaction.MintTransactionReason; -import com.unicity.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; import java.io.IOException; public class MintTransactionReasonCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransactionCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransactionCbor.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransactionCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransactionCbor.java index 33113ad..97c263a 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransactionCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransactionCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction; +package org.unicitylabs.sdk.serializer.cbor.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -10,8 +10,8 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.Transaction; import java.io.IOException; public class TransactionCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java similarity index 86% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java index 61d65c3..c16055c 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/TransferTransactionDataCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction; +package org.unicitylabs.sdk.serializer.cbor.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java similarity index 87% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java index 8dc0564..6305d73 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction.split; +package org.unicitylabs.sdk.serializer.cbor.transaction.split; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.transaction.split.SplitMintReasonProof; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.transaction.split.SplitMintReasonProof; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java similarity index 84% rename from src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java rename to src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java index e6a564f..eadc3fe 100644 --- a/src/main/java/com/unicity/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/cbor/transaction/split/SplitMintReasonProofCbor.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.cbor.transaction.split; +package org.unicitylabs.sdk.serializer.cbor.transaction.split; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.transaction.split.SplitMintReasonProof; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.transaction.split.SplitMintReasonProof; import java.io.IOException; public class SplitMintReasonProofCbor { diff --git a/src/main/java/com/unicity/sdk/serializer/json/address/AddressJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/address/AddressJson.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/json/address/AddressJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/address/AddressJson.java index 0186055..7b63e9e 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/address/AddressJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/address/AddressJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.address; +package org.unicitylabs.sdk.serializer.json.address; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.address.AddressFactory; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.AddressFactory; import java.io.IOException; public class AddressJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/AuthenticatorJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/AuthenticatorJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/api/AuthenticatorJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/AuthenticatorJson.java index c552548..47dfd82 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/AuthenticatorJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/AuthenticatorJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.signing.Signature; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.signing.Signature; +import org.unicitylabs.sdk.util.HexConverter; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/BlockHeightResponseJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/BlockHeightResponseJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/api/BlockHeightResponseJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/BlockHeightResponseJson.java index b683fbb..6b16602 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/BlockHeightResponseJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/BlockHeightResponseJson.java @@ -1,11 +1,11 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.BlockHeightResponse; +import org.unicitylabs.sdk.api.BlockHeightResponse; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/InclusionProofRequestJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/InclusionProofRequestJson.java similarity index 88% rename from src/main/java/com/unicity/sdk/serializer/json/api/InclusionProofRequestJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/InclusionProofRequestJson.java index 90e810d..51c9974 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/InclusionProofRequestJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/InclusionProofRequestJson.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.unicity.sdk.api.InclusionProofRequest; +import org.unicitylabs.sdk.api.InclusionProofRequest; import java.io.IOException; public class InclusionProofRequestJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/RequestIdJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/RequestIdJson.java similarity index 89% rename from src/main/java/com/unicity/sdk/serializer/json/api/RequestIdJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/RequestIdJson.java index 6fad824..0052fd6 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/RequestIdJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/RequestIdJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; import java.io.IOException; public class RequestIdJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentRequestJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentRequestJson.java similarity index 92% rename from src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentRequestJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentRequestJson.java index 5294466..124f664 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentRequestJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentRequestJson.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.unicity.sdk.api.SubmitCommitmentRequest; +import org.unicitylabs.sdk.api.SubmitCommitmentRequest; import java.io.IOException; public class SubmitCommitmentRequestJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentResponseJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentResponseJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentResponseJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentResponseJson.java index 85e794f..ff33616 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/api/SubmitCommitmentResponseJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/api/SubmitCommitmentResponseJson.java @@ -1,12 +1,12 @@ -package com.unicity.sdk.serializer.json.api; +package org.unicitylabs.sdk.serializer.json.api; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/hash/DataHashJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/hash/DataHashJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/hash/DataHashJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/hash/DataHashJson.java index 386a44c..81f32b5 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/hash/DataHashJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/hash/DataHashJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.hash; +package org.unicitylabs.sdk.serializer.json.hash; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.util.HexConverter; import java.io.IOException; diff --git a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java index 140493a..07bd3f8 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcErrorJson.java @@ -1,11 +1,11 @@ -package com.unicity.sdk.serializer.json.jsonrpc; +package org.unicitylabs.sdk.serializer.json.jsonrpc; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.jsonrpc.JsonRpcError; +import org.unicitylabs.sdk.jsonrpc.JsonRpcError; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java index 99d8ac3..e195bf8 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcRequestJson.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.serializer.json.jsonrpc; +package org.unicitylabs.sdk.serializer.json.jsonrpc; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.unicity.sdk.jsonrpc.JsonRpcRequest; +import org.unicitylabs.sdk.jsonrpc.JsonRpcRequest; import java.io.IOException; public class JsonRpcRequestJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java index 35d3ec3..bd560ee 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/jsonrpc/JsonRpcResponseJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.jsonrpc; +package org.unicitylabs.sdk.serializer.json.jsonrpc; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.jsonrpc.JsonRpcError; -import com.unicity.sdk.jsonrpc.JsonRpcResponse; +import org.unicitylabs.sdk.jsonrpc.JsonRpcError; +import org.unicitylabs.sdk.jsonrpc.JsonRpcResponse; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java index bae12bb..669e6ea 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.plain; +package org.unicitylabs.sdk.serializer.json.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHash; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java similarity index 89% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java index f85acde..57fbd66 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepBranchJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.plain; +package org.unicitylabs.sdk.serializer.json.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; import java.io.IOException; public class SparseMerkleTreePathStepBranchJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java similarity index 96% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java index 501c4ff..55f37a8 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/plain/SparseMerkleTreePathStepJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.plain; +package org.unicitylabs.sdk.serializer.json.mtree.plain; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; import java.io.IOException; import java.math.BigInteger; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java index 9ae4d67..a9b8c90 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.sum; +package org.unicitylabs.sdk.serializer.json.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java index 99793e9..f636640 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepBranchJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.sum; +package org.unicitylabs.sdk.serializer.json.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; import java.io.IOException; import java.math.BigInteger; diff --git a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java similarity index 96% rename from src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java index b14192e..663280f 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/mtree/sum/SparseMerkleSumTreePathStepJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.mtree.sum; +package org.unicitylabs.sdk.serializer.json.mtree.sum; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep; import java.io.IOException; import java.math.BigInteger; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/predicate/BurnPredicateJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/BurnPredicateJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/predicate/BurnPredicateJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/predicate/BurnPredicateJson.java index 13fded8..006759b 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/predicate/BurnPredicateJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/BurnPredicateJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.predicate; +package org.unicitylabs.sdk.serializer.json.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/predicate/MaskedPredicateJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/MaskedPredicateJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/predicate/MaskedPredicateJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/predicate/MaskedPredicateJson.java index 8dacc0a..dc40041 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/predicate/MaskedPredicateJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/MaskedPredicateJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.predicate; +package org.unicitylabs.sdk.serializer.json.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/predicate/PredicateJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/PredicateJson.java similarity index 83% rename from src/main/java/com/unicity/sdk/serializer/json/predicate/PredicateJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/predicate/PredicateJson.java index 5bca68d..2c82f2d 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/predicate/PredicateJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/PredicateJson.java @@ -1,15 +1,15 @@ -package com.unicity.sdk.serializer.json.predicate; +package org.unicitylabs.sdk.serializer.json.predicate; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.PredicateType; -import com.unicity.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; import java.io.IOException; public class PredicateJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/predicate/UnmaskedPredicateJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/UnmaskedPredicateJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/predicate/UnmaskedPredicateJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/predicate/UnmaskedPredicateJson.java index 7689838..441075f 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/predicate/UnmaskedPredicateJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/predicate/UnmaskedPredicateJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.predicate; +package org.unicitylabs.sdk.serializer.json.predicate; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.PredicateType; -import com.unicity.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/token/TokenIdJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenIdJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/token/TokenIdJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenIdJson.java index 959ea8a..629f9ef 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/token/TokenIdJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenIdJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.token; +package org.unicitylabs.sdk.serializer.json.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenId; import java.io.IOException; public class TokenIdJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/token/TokenJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/token/TokenJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenJson.java index 5c4d145..4d71fb0 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/token/TokenJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.token; +package org.unicitylabs.sdk.serializer.json.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/token/TokenStateJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenStateJson.java similarity index 95% rename from src/main/java/com/unicity/sdk/serializer/json/token/TokenStateJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenStateJson.java index bc0e3b0..0d8da7f 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/token/TokenStateJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenStateJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.token; +package org.unicitylabs.sdk.serializer.json.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.token.TokenState; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.token.TokenState; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/token/TokenTypeJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenTypeJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/token/TokenTypeJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenTypeJson.java index e86ba06..49ca513 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/token/TokenTypeJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/token/TokenTypeJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.token; +package org.unicitylabs.sdk.serializer.json.token; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.token.TokenType; import java.io.IOException; public class TokenTypeJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/token/fungible/TokenCoinDataJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/token/fungible/TokenCoinDataJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/token/fungible/TokenCoinDataJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/token/fungible/TokenCoinDataJson.java index 7015fa6..ead143a 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/token/fungible/TokenCoinDataJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/token/fungible/TokenCoinDataJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.token.fungible; +package org.unicitylabs.sdk.serializer.json.token.fungible; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; import java.io.IOException; import java.math.BigInteger; import java.util.LinkedHashMap; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/CommitmentJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/CommitmentJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/CommitmentJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/CommitmentJson.java index 20a4dad..425058d 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/CommitmentJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/CommitmentJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.transaction.Commitment; -import com.unicity.sdk.transaction.TransactionData; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.transaction.Commitment; +import org.unicitylabs.sdk.transaction.TransactionData; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/InclusionProofJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/InclusionProofJson.java similarity index 92% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/InclusionProofJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/InclusionProofJson.java index e204d9b..ca5191a 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/InclusionProofJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/InclusionProofJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.transaction.InclusionProof; import java.io.IOException; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintCommitmentJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintCommitmentJson.java similarity index 75% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/MintCommitmentJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintCommitmentJson.java index 0dd0489..9c96d6e 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintCommitmentJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintCommitmentJson.java @@ -1,11 +1,11 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.transaction.MintCommitment; -import com.unicity.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.transaction.MintCommitment; +import org.unicitylabs.sdk.transaction.MintTransactionData; import java.io.IOException; public class MintCommitmentJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionDataJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionDataJson.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionDataJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionDataJson.java index 15e42bf..94a7e14 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionDataJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionDataJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,13 +8,13 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.MintTransactionReason; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionReasonJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionReasonJson.java similarity index 75% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionReasonJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionReasonJson.java index 182b7c6..68163fb 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/MintTransactionReasonJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/MintTransactionReasonJson.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.transaction.MintTransactionReason; import java.io.IOException; public class MintTransactionReasonJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransactionJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransactionJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/TransactionJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransactionJson.java index 0013270..c9ef2e5 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransactionJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransactionJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransactionData; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransactionData; import java.io.IOException; import java.util.HashSet; import java.util.Set; @@ -39,7 +39,6 @@ public void serialize(Transaction value, JsonGenerator gen, SerializerProvider s gen.writeStartObject(); gen.writeObjectField(DATA_FIELD, value.getData()); gen.writeObjectField(INCLUSION_PROOF_FIELD, value.getInclusionProof()); - gen.writeEndObject(); } } diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransferCommitmentJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferCommitmentJson.java similarity index 74% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/TransferCommitmentJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferCommitmentJson.java index 2ac68aa..2dcee61 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransferCommitmentJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferCommitmentJson.java @@ -1,11 +1,11 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.transaction.TransferCommitment; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.transaction.TransferCommitment; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.io.IOException; public class TransferCommitmentJson { diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransferTransactionDataJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferTransactionDataJson.java similarity index 92% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/TransferTransactionDataJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferTransactionDataJson.java index 6dedfa8..ed5bc0b 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/TransferTransactionDataJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/TransferTransactionDataJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction; +package org.unicitylabs.sdk.serializer.json.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.transaction.TransferTransactionData; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonJson.java similarity index 93% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonJson.java index cb0a4a9..b5faec3 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction.split; +package org.unicitylabs.sdk.serializer.json.transaction.split; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.transaction.split.SplitMintReasonProof; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.transaction.split.SplitMintReasonProof; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java similarity index 91% rename from src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java index eabff3a..4f2563c 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/transaction/split/SplitMintReasonProofJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.transaction.split; +package org.unicitylabs.sdk.serializer.json.transaction.split; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.transaction.split.SplitMintReasonProof; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.transaction.split.SplitMintReasonProof; import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/unicity/sdk/serializer/json/util/ByteArrayHexJson.java b/src/main/java/org/unicitylabs/sdk/serializer/json/util/ByteArrayHexJson.java similarity index 94% rename from src/main/java/com/unicity/sdk/serializer/json/util/ByteArrayHexJson.java rename to src/main/java/org/unicitylabs/sdk/serializer/json/util/ByteArrayHexJson.java index b7923f3..e8b13ac 100644 --- a/src/main/java/com/unicity/sdk/serializer/json/util/ByteArrayHexJson.java +++ b/src/main/java/org/unicitylabs/sdk/serializer/json/util/ByteArrayHexJson.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.serializer.json.util; +package org.unicitylabs.sdk.serializer.json.util; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.io.IOException; public class ByteArrayHexJson { diff --git a/src/main/java/com/unicity/sdk/signing/Signature.java b/src/main/java/org/unicitylabs/sdk/signing/Signature.java similarity index 95% rename from src/main/java/com/unicity/sdk/signing/Signature.java rename to src/main/java/org/unicitylabs/sdk/signing/Signature.java index e4bb71d..9855828 100644 --- a/src/main/java/com/unicity/sdk/signing/Signature.java +++ b/src/main/java/org/unicitylabs/sdk/signing/Signature.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.signing; +package org.unicitylabs.sdk.signing; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/signing/SigningService.java b/src/main/java/org/unicitylabs/sdk/signing/SigningService.java similarity index 97% rename from src/main/java/com/unicity/sdk/signing/SigningService.java rename to src/main/java/org/unicitylabs/sdk/signing/SigningService.java index 7541ff3..e8c6471 100644 --- a/src/main/java/com/unicity/sdk/signing/SigningService.java +++ b/src/main/java/org/unicitylabs/sdk/signing/SigningService.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.signing; +package org.unicitylabs.sdk.signing; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; import org.bouncycastle.crypto.digests.SHA256Digest; import org.bouncycastle.crypto.params.ECDomainParameters; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; diff --git a/src/main/java/com/unicity/sdk/token/NameTagTokenState.java b/src/main/java/org/unicitylabs/sdk/token/NameTagTokenState.java similarity index 55% rename from src/main/java/com/unicity/sdk/token/NameTagTokenState.java rename to src/main/java/org/unicitylabs/sdk/token/NameTagTokenState.java index 31f808e..03bfe4e 100644 --- a/src/main/java/com/unicity/sdk/token/NameTagTokenState.java +++ b/src/main/java/org/unicitylabs/sdk/token/NameTagTokenState.java @@ -1,14 +1,14 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.predicate.Predicate; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.predicate.Predicate; import java.nio.charset.StandardCharsets; public class NameTagTokenState extends TokenState { private final Address address; public NameTagTokenState(Predicate unlockPredicate, Address address) { - super(unlockPredicate, address.getAddress().getBytes(StandardCharsets.UTF_8)); + super(unlockPredicate, address == null ? null : address.getAddress().getBytes(StandardCharsets.UTF_8)); this.address = address; } diff --git a/src/main/java/com/unicity/sdk/token/Token.java b/src/main/java/org/unicitylabs/sdk/token/Token.java similarity index 91% rename from src/main/java/com/unicity/sdk/token/Token.java rename to src/main/java/org/unicitylabs/sdk/token/Token.java index 299902c..c44faa5 100644 --- a/src/main/java/com/unicity/sdk/token/Token.java +++ b/src/main/java/org/unicitylabs/sdk/token/Token.java @@ -1,21 +1,21 @@ -package com.unicity.sdk.token; - -import com.unicity.sdk.address.Address; -import com.unicity.sdk.address.ProxyAddress; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.InclusionProofVerificationStatus; -import com.unicity.sdk.transaction.MintCommitment; -import com.unicity.sdk.transaction.MintTransactionState; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransactionData; -import com.unicity.sdk.transaction.TransferTransactionData; -import com.unicity.sdk.util.VerificationResult; +package org.unicitylabs.sdk.token; + +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.ProxyAddress; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.InclusionProofVerificationStatus; +import org.unicitylabs.sdk.transaction.MintCommitment; +import org.unicitylabs.sdk.transaction.MintTransactionState; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransactionData; +import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.util.VerificationResult; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/token/TokenId.java b/src/main/java/org/unicitylabs/sdk/token/TokenId.java similarity index 86% rename from src/main/java/com/unicity/sdk/token/TokenId.java rename to src/main/java/org/unicitylabs/sdk/token/TokenId.java index d781689..668ef8f 100644 --- a/src/main/java/com/unicity/sdk/token/TokenId.java +++ b/src/main/java/org/unicitylabs/sdk/token/TokenId.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.util.BitString; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.util.BitString; +import org.unicitylabs.sdk.util.HexConverter; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/token/TokenState.java b/src/main/java/org/unicitylabs/sdk/token/TokenState.java similarity index 83% rename from src/main/java/com/unicity/sdk/token/TokenState.java rename to src/main/java/org/unicitylabs/sdk/token/TokenState.java index 6c2a259..61be45f 100644 --- a/src/main/java/com/unicity/sdk/token/TokenState.java +++ b/src/main/java/org/unicitylabs/sdk/token/TokenState.java @@ -1,14 +1,14 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -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.predicate.Predicate; +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; import java.util.Optional; diff --git a/src/main/java/com/unicity/sdk/token/TokenType.java b/src/main/java/org/unicitylabs/sdk/token/TokenType.java similarity index 91% rename from src/main/java/com/unicity/sdk/token/TokenType.java rename to src/main/java/org/unicitylabs/sdk/token/TokenType.java index 38ccf91..3649696 100644 --- a/src/main/java/com/unicity/sdk/token/TokenType.java +++ b/src/main/java/org/unicitylabs/sdk/token/TokenType.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; /** diff --git a/src/main/java/com/unicity/sdk/token/fungible/CoinId.java b/src/main/java/org/unicitylabs/sdk/token/fungible/CoinId.java similarity index 85% rename from src/main/java/com/unicity/sdk/token/fungible/CoinId.java rename to src/main/java/org/unicitylabs/sdk/token/fungible/CoinId.java index f91c4aa..91fa62d 100644 --- a/src/main/java/com/unicity/sdk/token/fungible/CoinId.java +++ b/src/main/java/org/unicitylabs/sdk/token/fungible/CoinId.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.token.fungible; +package org.unicitylabs.sdk.token.fungible; -import com.unicity.sdk.util.BitString; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.BitString; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; public class CoinId { diff --git a/src/main/java/com/unicity/sdk/token/fungible/TokenCoinData.java b/src/main/java/org/unicitylabs/sdk/token/fungible/TokenCoinData.java similarity index 95% rename from src/main/java/com/unicity/sdk/token/fungible/TokenCoinData.java rename to src/main/java/org/unicitylabs/sdk/token/fungible/TokenCoinData.java index 122b8b8..de9b4c8 100644 --- a/src/main/java/com/unicity/sdk/token/fungible/TokenCoinData.java +++ b/src/main/java/org/unicitylabs/sdk/token/fungible/TokenCoinData.java @@ -1,5 +1,5 @@ -package com.unicity.sdk.token.fungible; +package org.unicitylabs.sdk.token.fungible; import java.math.BigInteger; import java.util.Collections; diff --git a/src/main/java/com/unicity/sdk/transaction/Commitment.java b/src/main/java/org/unicitylabs/sdk/transaction/Commitment.java similarity index 93% rename from src/main/java/com/unicity/sdk/transaction/Commitment.java rename to src/main/java/org/unicitylabs/sdk/transaction/Commitment.java index f5f5fd1..11458a7 100644 --- a/src/main/java/com/unicity/sdk/transaction/Commitment.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/Commitment.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; import java.util.Objects; /** diff --git a/src/main/java/com/unicity/sdk/transaction/InclusionProof.java b/src/main/java/org/unicitylabs/sdk/transaction/InclusionProof.java similarity index 86% rename from src/main/java/com/unicity/sdk/transaction/InclusionProof.java rename to src/main/java/org/unicitylabs/sdk/transaction/InclusionProof.java index eecd6dc..276396c 100644 --- a/src/main/java/com/unicity/sdk/transaction/InclusionProof.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/InclusionProof.java @@ -1,15 +1,14 @@ -package com.unicity.sdk.transaction; - -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.LeafValue; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.mtree.MerkleTreePathVerificationResult; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import java.io.IOException; +package org.unicitylabs.sdk.transaction; + +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.LeafValue; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.mtree.MerkleTreePathVerificationResult; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.serializer.cbor.CborSerializationException; import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/com/unicity/sdk/transaction/InclusionProofVerificationStatus.java b/src/main/java/org/unicitylabs/sdk/transaction/InclusionProofVerificationStatus.java similarity index 91% rename from src/main/java/com/unicity/sdk/transaction/InclusionProofVerificationStatus.java rename to src/main/java/org/unicitylabs/sdk/transaction/InclusionProofVerificationStatus.java index 10142c5..74fd941 100644 --- a/src/main/java/com/unicity/sdk/transaction/InclusionProofVerificationStatus.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/InclusionProofVerificationStatus.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; /** * Status codes for verifying an InclusionProof. diff --git a/src/main/java/com/unicity/sdk/transaction/MintCommitment.java b/src/main/java/org/unicitylabs/sdk/transaction/MintCommitment.java similarity index 88% rename from src/main/java/com/unicity/sdk/transaction/MintCommitment.java rename to src/main/java/org/unicitylabs/sdk/transaction/MintCommitment.java index c9ddee1..374456d 100644 --- a/src/main/java/com/unicity/sdk/transaction/MintCommitment.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/MintCommitment.java @@ -1,11 +1,11 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Objects; /** diff --git a/src/main/java/com/unicity/sdk/transaction/MintReasonType.java b/src/main/java/org/unicitylabs/sdk/transaction/MintReasonType.java similarity index 57% rename from src/main/java/com/unicity/sdk/transaction/MintReasonType.java rename to src/main/java/org/unicitylabs/sdk/transaction/MintReasonType.java index 9b9f73c..801dd19 100644 --- a/src/main/java/com/unicity/sdk/transaction/MintReasonType.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/MintReasonType.java @@ -1,5 +1,5 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; public enum MintReasonType { GENESIS, diff --git a/src/main/java/com/unicity/sdk/transaction/MintTransactionData.java b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionData.java similarity index 89% rename from src/main/java/com/unicity/sdk/transaction/MintTransactionData.java rename to src/main/java/org/unicitylabs/sdk/transaction/MintTransactionData.java index 0781621..36f08e8 100644 --- a/src/main/java/com/unicity/sdk/transaction/MintTransactionData.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionData.java @@ -1,17 +1,17 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.address.Address; +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.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/com/unicity/sdk/transaction/MintTransactionReason.java b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionReason.java similarity index 58% rename from src/main/java/com/unicity/sdk/transaction/MintTransactionReason.java rename to src/main/java/org/unicitylabs/sdk/transaction/MintTransactionReason.java index 8d344fe..dd2ea00 100644 --- a/src/main/java/com/unicity/sdk/transaction/MintTransactionReason.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionReason.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.util.VerificationResult; +import org.unicitylabs.sdk.util.VerificationResult; public interface MintTransactionReason { VerificationResult verify(Transaction> genesis); diff --git a/src/main/java/com/unicity/sdk/transaction/MintTransactionState.java b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionState.java similarity index 67% rename from src/main/java/com/unicity/sdk/transaction/MintTransactionState.java rename to src/main/java/org/unicitylabs/sdk/transaction/MintTransactionState.java index 0cbe97f..f933610 100644 --- a/src/main/java/com/unicity/sdk/transaction/MintTransactionState.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/MintTransactionState.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.util.HexConverter; public class MintTransactionState extends RequestId { private static final byte[] MINT_SUFFIX = HexConverter.decode( diff --git a/src/main/java/org/unicitylabs/sdk/transaction/NametagMintTransactionData.java b/src/main/java/org/unicitylabs/sdk/transaction/NametagMintTransactionData.java new file mode 100644 index 0000000..8985828 --- /dev/null +++ b/src/main/java/org/unicitylabs/sdk/transaction/NametagMintTransactionData.java @@ -0,0 +1,38 @@ +package org.unicitylabs.sdk.transaction; + +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import java.nio.charset.StandardCharsets; + +public class NametagMintTransactionData extends + MintTransactionData { + + public NametagMintTransactionData( + String name, + TokenType tokenType, + byte[] tokenData, + TokenCoinData coinData, + Address recipient, + byte[] salt, + Address targetAddress + ) { + super( + TokenId.fromNameTag(name), + tokenType, + tokenData, + coinData, + recipient, + salt, + targetAddress == null + ? null + : new DataHasher(HashAlgorithm.SHA256) + .update(targetAddress.getAddress().getBytes(StandardCharsets.UTF_8)) + .digest(), + null + ); + } +} \ No newline at end of file diff --git a/src/main/java/com/unicity/sdk/transaction/Transaction.java b/src/main/java/org/unicitylabs/sdk/transaction/Transaction.java similarity index 91% rename from src/main/java/com/unicity/sdk/transaction/Transaction.java rename to src/main/java/org/unicitylabs/sdk/transaction/Transaction.java index e9aa011..9d2e4b6 100644 --- a/src/main/java/com/unicity/sdk/transaction/Transaction.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/Transaction.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/transaction/TransactionData.java b/src/main/java/org/unicitylabs/sdk/transaction/TransactionData.java similarity index 55% rename from src/main/java/com/unicity/sdk/transaction/TransactionData.java rename to src/main/java/org/unicitylabs/sdk/transaction/TransactionData.java index a93d8a8..cade5ad 100644 --- a/src/main/java/com/unicity/sdk/transaction/TransactionData.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/TransactionData.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; import java.util.Optional; public interface TransactionData { diff --git a/src/main/java/com/unicity/sdk/transaction/TransferCommitment.java b/src/main/java/org/unicitylabs/sdk/transaction/TransferCommitment.java similarity index 87% rename from src/main/java/com/unicity/sdk/transaction/TransferCommitment.java rename to src/main/java/org/unicitylabs/sdk/transaction/TransferCommitment.java index e057417..7cfe93c 100644 --- a/src/main/java/com/unicity/sdk/transaction/TransferCommitment.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/TransferCommitment.java @@ -1,12 +1,12 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.Token; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.Token; import java.util.Objects; /** diff --git a/src/main/java/com/unicity/sdk/transaction/TransferTransactionData.java b/src/main/java/org/unicitylabs/sdk/transaction/TransferTransactionData.java similarity index 86% rename from src/main/java/com/unicity/sdk/transaction/TransferTransactionData.java rename to src/main/java/org/unicitylabs/sdk/transaction/TransferTransactionData.java index bfd4d10..f7cc8cb 100644 --- a/src/main/java/com/unicity/sdk/transaction/TransferTransactionData.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/TransferTransactionData.java @@ -1,19 +1,19 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.serializer.cbor.CborSerializationException; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.address.Address; +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.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/unicity/sdk/transaction/split/SplitMintReason.java b/src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReason.java similarity index 82% rename from src/main/java/com/unicity/sdk/transaction/split/SplitMintReason.java rename to src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReason.java index 4a2f883..b496717 100644 --- a/src/main/java/com/unicity/sdk/transaction/split/SplitMintReason.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReason.java @@ -1,17 +1,17 @@ -package com.unicity.sdk.transaction.split; - -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.PredicateType; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.MintTransactionReason; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.util.VerificationResult; +package org.unicitylabs.sdk.transaction.split; + +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePathStep.Branch; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.PredicateType; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.util.VerificationResult; import java.math.BigInteger; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/unicity/sdk/transaction/split/SplitMintReasonProof.java b/src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReasonProof.java similarity index 80% rename from src/main/java/com/unicity/sdk/transaction/split/SplitMintReasonProof.java rename to src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReasonProof.java index 050901a..beb08c3 100644 --- a/src/main/java/com/unicity/sdk/transaction/split/SplitMintReasonProof.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/split/SplitMintReasonProof.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.transaction.split; +package org.unicitylabs.sdk.transaction.split; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreePath; -import com.unicity.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreePath; +import org.unicitylabs.sdk.token.fungible.CoinId; import java.util.Objects; public class SplitMintReasonProof { diff --git a/src/main/java/com/unicity/sdk/transaction/split/TokenSplitBuilder.java b/src/main/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilder.java similarity index 83% rename from src/main/java/com/unicity/sdk/transaction/split/TokenSplitBuilder.java rename to src/main/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilder.java index 0567da4..2514d5e 100644 --- a/src/main/java/com/unicity/sdk/transaction/split/TokenSplitBuilder.java +++ b/src/main/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilder.java @@ -1,29 +1,29 @@ -package com.unicity.sdk.transaction.split; - -import com.unicity.sdk.address.Address; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; -import com.unicity.sdk.mtree.plain.SparseMerkleTree; -import com.unicity.sdk.mtree.plain.SparseMerkleTreeRootNode; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTree; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTreeRootNode; -import com.unicity.sdk.predicate.BurnPredicate; -import com.unicity.sdk.predicate.BurnPredicateReference; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -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; +package org.unicitylabs.sdk.transaction.split; + +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.BranchExistsException; +import org.unicitylabs.sdk.mtree.LeafOutOfBoundsException; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTree; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreeRootNode; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTreeRootNode; +import org.unicitylabs.sdk.predicate.BurnPredicate; +import org.unicitylabs.sdk.predicate.BurnPredicateReference; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +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.math.BigInteger; import java.security.SecureRandom; import java.util.Arrays; diff --git a/src/main/java/com/unicity/sdk/util/BigIntegerConverter.java b/src/main/java/org/unicitylabs/sdk/util/BigIntegerConverter.java similarity index 96% rename from src/main/java/com/unicity/sdk/util/BigIntegerConverter.java rename to src/main/java/org/unicitylabs/sdk/util/BigIntegerConverter.java index 382ca12..a740c8c 100644 --- a/src/main/java/com/unicity/sdk/util/BigIntegerConverter.java +++ b/src/main/java/org/unicitylabs/sdk/util/BigIntegerConverter.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.util; +package org.unicitylabs.sdk.util; import java.math.BigInteger; diff --git a/src/main/java/com/unicity/sdk/util/BitString.java b/src/main/java/org/unicitylabs/sdk/util/BitString.java similarity index 96% rename from src/main/java/com/unicity/sdk/util/BitString.java rename to src/main/java/org/unicitylabs/sdk/util/BitString.java index 4eb52d4..9805998 100644 --- a/src/main/java/com/unicity/sdk/util/BitString.java +++ b/src/main/java/org/unicitylabs/sdk/util/BitString.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.util; +package org.unicitylabs.sdk.util; -import com.unicity.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHash; import java.math.BigInteger; /** diff --git a/src/main/java/com/unicity/sdk/util/HexConverter.java b/src/main/java/org/unicitylabs/sdk/util/HexConverter.java similarity index 97% rename from src/main/java/com/unicity/sdk/util/HexConverter.java rename to src/main/java/org/unicitylabs/sdk/util/HexConverter.java index e1889e8..20637e1 100644 --- a/src/main/java/com/unicity/sdk/util/HexConverter.java +++ b/src/main/java/org/unicitylabs/sdk/util/HexConverter.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.util; +package org.unicitylabs.sdk.util; /** * Utility class for converting between byte arrays and hexadecimal strings. diff --git a/src/main/java/com/unicity/sdk/util/InclusionProofUtils.java b/src/main/java/org/unicitylabs/sdk/util/InclusionProofUtils.java similarity index 91% rename from src/main/java/com/unicity/sdk/util/InclusionProofUtils.java rename to src/main/java/org/unicitylabs/sdk/util/InclusionProofUtils.java index 6b6cfdd..44e3582 100644 --- a/src/main/java/com/unicity/sdk/util/InclusionProofUtils.java +++ b/src/main/java/org/unicitylabs/sdk/util/InclusionProofUtils.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.util; +package org.unicitylabs.sdk.util; -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.transaction.Commitment; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.InclusionProofVerificationStatus; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.transaction.Commitment; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.InclusionProofVerificationStatus; import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/com/unicity/sdk/util/VerificationResult.java b/src/main/java/org/unicitylabs/sdk/util/VerificationResult.java similarity index 97% rename from src/main/java/com/unicity/sdk/util/VerificationResult.java rename to src/main/java/org/unicitylabs/sdk/util/VerificationResult.java index 1a63425..c40ba71 100644 --- a/src/main/java/com/unicity/sdk/util/VerificationResult.java +++ b/src/main/java/org/unicitylabs/sdk/util/VerificationResult.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.util; +package org.unicitylabs.sdk.util; import java.util.List; diff --git a/src/test/java/com/unicity/sdk/AndroidCompatibilityTest.java b/src/test/java/org/unicitylabs/sdk/AndroidCompatibilityTest.java similarity index 91% rename from src/test/java/com/unicity/sdk/AndroidCompatibilityTest.java rename to src/test/java/org/unicitylabs/sdk/AndroidCompatibilityTest.java index d055939..a590b2c 100644 --- a/src/test/java/com/unicity/sdk/AndroidCompatibilityTest.java +++ b/src/test/java/org/unicitylabs/sdk/AndroidCompatibilityTest.java @@ -1,9 +1,9 @@ -package com.unicity.sdk; +package org.unicitylabs.sdk; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.TokenType; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/com/unicity/sdk/TestAggregatorClient.java b/src/test/java/org/unicitylabs/sdk/TestAggregatorClient.java similarity index 71% rename from src/test/java/com/unicity/sdk/TestAggregatorClient.java rename to src/test/java/org/unicitylabs/sdk/TestAggregatorClient.java index c607e7d..6c3f9f8 100644 --- a/src/test/java/com/unicity/sdk/TestAggregatorClient.java +++ b/src/test/java/org/unicitylabs/sdk/TestAggregatorClient.java @@ -1,18 +1,16 @@ -package com.unicity.sdk; - -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.IAggregatorClient; -import com.unicity.sdk.api.LeafValue; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.api.SubmitCommitmentStatus; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; -import com.unicity.sdk.mtree.plain.SparseMerkleTree; -import com.unicity.sdk.mtree.plain.SparseMerkleTreeRootNode; -import com.unicity.sdk.transaction.InclusionProof; +package org.unicitylabs.sdk; + +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.IAggregatorClient; +import org.unicitylabs.sdk.api.LeafValue; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTree; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreeRootNode; +import org.unicitylabs.sdk.transaction.InclusionProof; import java.util.AbstractMap; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/com/unicity/sdk/api/AuthenticatorTest.java b/src/test/java/org/unicitylabs/sdk/api/AuthenticatorTest.java similarity index 83% rename from src/test/java/com/unicity/sdk/api/AuthenticatorTest.java rename to src/test/java/org/unicitylabs/sdk/api/AuthenticatorTest.java index 67e54dc..2ce351d 100644 --- a/src/test/java/com/unicity/sdk/api/AuthenticatorTest.java +++ b/src/test/java/org/unicitylabs/sdk/api/AuthenticatorTest.java @@ -1,12 +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.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; -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.hash.HashAlgorithm; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.signing.Signature; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.util.HexConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/api/RequestIdTest.java b/src/test/java/org/unicitylabs/sdk/api/RequestIdTest.java similarity index 84% rename from src/test/java/com/unicity/sdk/api/RequestIdTest.java rename to src/test/java/org/unicitylabs/sdk/api/RequestIdTest.java index d75dc49..41bf8a0 100644 --- a/src/test/java/com/unicity/sdk/api/RequestIdTest.java +++ b/src/test/java/org/unicitylabs/sdk/api/RequestIdTest.java @@ -1,9 +1,9 @@ -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.HashAlgorithm; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import java.math.BigInteger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/common/split/BaseTokenSplitTest.java b/src/test/java/org/unicitylabs/sdk/common/split/BaseTokenSplitTest.java similarity index 78% rename from src/test/java/com/unicity/sdk/common/split/BaseTokenSplitTest.java rename to src/test/java/org/unicitylabs/sdk/common/split/BaseTokenSplitTest.java index ada2f55..aa317d4 100644 --- a/src/test/java/com/unicity/sdk/common/split/BaseTokenSplitTest.java +++ b/src/test/java/org/unicitylabs/sdk/common/split/BaseTokenSplitTest.java @@ -1,32 +1,33 @@ -package com.unicity.sdk.common.split; - -import static com.unicity.sdk.utils.TestUtils.randomBytes; - -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.address.ProxyAddress; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.api.SubmitCommitmentStatus; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.MintCommitment; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.TransferCommitment; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.transaction.split.TokenSplitBuilder; -import com.unicity.sdk.transaction.split.TokenSplitBuilder.TokenSplit; -import com.unicity.sdk.util.InclusionProofUtils; -import com.unicity.sdk.utils.TokenUtils; +package org.unicitylabs.sdk.common.split; + +import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; + +import java.util.UUID; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.DirectAddress; +import org.unicitylabs.sdk.address.ProxyAddress; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.MintCommitment; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.TransferCommitment; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.transaction.split.TokenSplitBuilder; +import org.unicitylabs.sdk.transaction.split.TokenSplitBuilder.TokenSplit; +import org.unicitylabs.sdk.util.InclusionProofUtils; +import org.unicitylabs.sdk.utils.TokenUtils; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.List; @@ -59,14 +60,13 @@ void testTokenSplitFullAmounts() throws Exception { null ); - String nametag = "my_nametag"; + String nametag = UUID.randomUUID().toString(); Token nametagToken = TokenUtils.mintNametagToken( this.client, secret, nametag, - // Direct to random address in the beginning - DirectAddress.create(DataHash.fromImprint(new byte[34])) + null ); TokenSplitBuilder builder = new TokenSplitBuilder(); diff --git a/src/test/java/com/unicity/sdk/e2e/BasicE2ETest.java b/src/test/java/org/unicitylabs/sdk/e2e/BasicE2ETest.java similarity index 92% rename from src/test/java/com/unicity/sdk/e2e/BasicE2ETest.java rename to src/test/java/org/unicitylabs/sdk/e2e/BasicE2ETest.java index d70cdfa..7c38e92 100644 --- a/src/test/java/com/unicity/sdk/e2e/BasicE2ETest.java +++ b/src/test/java/org/unicitylabs/sdk/e2e/BasicE2ETest.java @@ -1,10 +1,14 @@ -package com.unicity.sdk.e2e; - -import com.unicity.sdk.api.*; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.signing.SigningService; +package org.unicitylabs.sdk.e2e; + +import org.unicitylabs.sdk.api.AggregatorClient; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.signing.SigningService; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/src/test/java/com/unicity/sdk/e2e/CommonTestFlow.java b/src/test/java/org/unicitylabs/sdk/e2e/CommonTestFlow.java similarity index 88% rename from src/test/java/com/unicity/sdk/e2e/CommonTestFlow.java rename to src/test/java/org/unicitylabs/sdk/e2e/CommonTestFlow.java index e9916a4..5895c0f 100644 --- a/src/test/java/com/unicity/sdk/e2e/CommonTestFlow.java +++ b/src/test/java/org/unicitylabs/sdk/e2e/CommonTestFlow.java @@ -1,43 +1,43 @@ -package com.unicity.sdk.e2e; +package org.unicitylabs.sdk.e2e; -import static com.unicity.sdk.utils.TestUtils.randomBytes; -import static com.unicity.sdk.utils.TestUtils.randomCoinData; +import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; +import static org.unicitylabs.sdk.utils.TestUtils.randomCoinData; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.address.ProxyAddress; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.api.SubmitCommitmentStatus; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.UnmaskedPredicate; -import com.unicity.sdk.predicate.UnmaskedPredicateReference; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.NameTagTokenState; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.transaction.MintTransactionReason; -import com.unicity.sdk.transaction.NametagMintTransactionData; -import com.unicity.sdk.transaction.split.SplitMintReason; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.InclusionProof; -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 com.unicity.sdk.transaction.split.TokenSplitBuilder; -import com.unicity.sdk.transaction.split.TokenSplitBuilder.TokenSplit; -import com.unicity.sdk.util.InclusionProofUtils; -import com.unicity.sdk.utils.TestTokenData; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.DirectAddress; +import org.unicitylabs.sdk.address.ProxyAddress; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.UnmaskedPredicate; +import org.unicitylabs.sdk.predicate.UnmaskedPredicateReference; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.NameTagTokenState; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.NametagMintTransactionData; +import org.unicitylabs.sdk.transaction.split.SplitMintReason; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.InclusionProof; +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 org.unicitylabs.sdk.transaction.split.TokenSplitBuilder; +import org.unicitylabs.sdk.transaction.split.TokenSplitBuilder.TokenSplit; +import org.unicitylabs.sdk.util.InclusionProofUtils; +import org.unicitylabs.sdk.utils.TestTokenData; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/src/test/java/com/unicity/sdk/e2e/TokenE2ETest.java b/src/test/java/org/unicitylabs/sdk/e2e/TokenE2ETest.java similarity index 91% rename from src/test/java/com/unicity/sdk/e2e/TokenE2ETest.java rename to src/test/java/org/unicitylabs/sdk/e2e/TokenE2ETest.java index 837f7b0..f326964 100644 --- a/src/test/java/com/unicity/sdk/e2e/TokenE2ETest.java +++ b/src/test/java/org/unicitylabs/sdk/e2e/TokenE2ETest.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.e2e; +package org.unicitylabs.sdk.e2e; -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.api.AggregatorClient; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.api.AggregatorClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/functional/FunctionalTokenSplitTest.java b/src/test/java/org/unicitylabs/sdk/functional/FunctionalTokenSplitTest.java similarity index 52% rename from src/test/java/com/unicity/sdk/functional/FunctionalTokenSplitTest.java rename to src/test/java/org/unicitylabs/sdk/functional/FunctionalTokenSplitTest.java index f3f8c4d..efebba6 100644 --- a/src/test/java/com/unicity/sdk/functional/FunctionalTokenSplitTest.java +++ b/src/test/java/org/unicitylabs/sdk/functional/FunctionalTokenSplitTest.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.functional; +package org.unicitylabs.sdk.functional; -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.TestAggregatorClient; -import com.unicity.sdk.common.split.BaseTokenSplitTest; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.TestAggregatorClient; +import org.unicitylabs.sdk.common.split.BaseTokenSplitTest; import org.junit.jupiter.api.BeforeEach; public class FunctionalTokenSplitTest extends BaseTokenSplitTest { diff --git a/src/test/java/com/unicity/sdk/hash/DataHashTest.java b/src/test/java/org/unicitylabs/sdk/hash/DataHashTest.java similarity index 95% rename from src/test/java/com/unicity/sdk/hash/DataHashTest.java rename to src/test/java/org/unicitylabs/sdk/hash/DataHashTest.java index e227ce2..702551b 100644 --- a/src/test/java/com/unicity/sdk/hash/DataHashTest.java +++ b/src/test/java/org/unicitylabs/sdk/hash/DataHashTest.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.hash; +package org.unicitylabs.sdk.hash; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/hash/DataHasherTest.java b/src/test/java/org/unicitylabs/sdk/hash/DataHasherTest.java similarity index 98% rename from src/test/java/com/unicity/sdk/hash/DataHasherTest.java rename to src/test/java/org/unicitylabs/sdk/hash/DataHasherTest.java index e18b9b7..12f2d5d 100644 --- a/src/test/java/com/unicity/sdk/hash/DataHasherTest.java +++ b/src/test/java/org/unicitylabs/sdk/hash/DataHasherTest.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.hash; +package org.unicitylabs.sdk.hash; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/integration/TokenIntegrationTest.java b/src/test/java/org/unicitylabs/sdk/integration/TokenIntegrationTest.java similarity index 97% rename from src/test/java/com/unicity/sdk/integration/TokenIntegrationTest.java rename to src/test/java/org/unicitylabs/sdk/integration/TokenIntegrationTest.java index b9ea4ff..bb5a21e 100644 --- a/src/test/java/com/unicity/sdk/integration/TokenIntegrationTest.java +++ b/src/test/java/org/unicitylabs/sdk/integration/TokenIntegrationTest.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.integration; +package org.unicitylabs.sdk.integration; -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.api.AggregatorClient; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.api.AggregatorClient; import org.junit.jupiter.api.*; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; diff --git a/src/test/java/com/unicity/sdk/jsonrpc/JsonRpcRequestTest.java b/src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequestTest.java similarity index 88% rename from src/test/java/com/unicity/sdk/jsonrpc/JsonRpcRequestTest.java rename to src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequestTest.java index 551a8c7..b59b581 100644 --- a/src/test/java/com/unicity/sdk/jsonrpc/JsonRpcRequestTest.java +++ b/src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcRequestTest.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.jsonrpc; +package org.unicitylabs.sdk.jsonrpc; import com.fasterxml.jackson.core.JsonProcessingException; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import java.util.List; import java.util.UUID; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/com/unicity/sdk/jsonrpc/JsonRpcResponseTest.java b/src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponseTest.java similarity index 84% rename from src/test/java/com/unicity/sdk/jsonrpc/JsonRpcResponseTest.java rename to src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponseTest.java index ec4ff02..26e5ee8 100644 --- a/src/test/java/com/unicity/sdk/jsonrpc/JsonRpcResponseTest.java +++ b/src/test/java/org/unicitylabs/sdk/jsonrpc/JsonRpcResponseTest.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.jsonrpc; +package org.unicitylabs.sdk.jsonrpc; import com.fasterxml.jackson.core.JsonProcessingException; -import com.unicity.sdk.api.BlockHeightResponse; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.api.BlockHeightResponse; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import java.util.UUID; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/mtree/CommonPathTest.java b/src/test/java/org/unicitylabs/sdk/mtree/CommonPathTest.java similarity index 95% rename from src/test/java/com/unicity/sdk/mtree/CommonPathTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/CommonPathTest.java index 5b13afa..47134a9 100644 --- a/src/test/java/com/unicity/sdk/mtree/CommonPathTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/CommonPathTest.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepBranchTest.java b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepBranchTest.java similarity index 87% rename from src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepBranchTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepBranchTest.java index 2d6d868..08ce650 100644 --- a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepBranchTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepBranchTest.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep.Branch; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepTest.java b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepTest.java similarity index 90% rename from src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepTest.java index 0874839..e7eaad2 100644 --- a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathStepTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathStepTest.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; import java.math.BigInteger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathTest.java b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathTest.java similarity index 93% rename from src/test/java/com/unicity/sdk/mtree/MerkleTreePathTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathTest.java index 527e039..0c5e21c 100644 --- a/src/test/java/com/unicity/sdk/mtree/MerkleTreePathTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/MerkleTreePathTest.java @@ -1,4 +1,4 @@ -package com.unicity.sdk.mtree; +package org.unicitylabs.sdk.mtree; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -6,12 +6,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePathStep; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePathStep; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.util.HexConverter; import java.math.BigInteger; import java.util.List; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeTest.java b/src/test/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeTest.java similarity index 95% rename from src/test/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeTest.java index ddf0c14..0627e9a 100644 --- a/src/test/java/com/unicity/sdk/mtree/plain/SparseMerkleTreeTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/plain/SparseMerkleTreeTest.java @@ -1,10 +1,10 @@ -package com.unicity.sdk.mtree.plain; +package org.unicitylabs.sdk.mtree.plain; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; -import com.unicity.sdk.mtree.MerkleTreePathVerificationResult; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.BranchExistsException; +import org.unicitylabs.sdk.mtree.LeafOutOfBoundsException; +import org.unicitylabs.sdk.mtree.MerkleTreePathVerificationResult; +import org.unicitylabs.sdk.util.HexConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeTest.java b/src/test/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeTest.java similarity index 94% rename from src/test/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeTest.java rename to src/test/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeTest.java index b50d557..f4a7bbf 100644 --- a/src/test/java/com/unicity/sdk/mtree/sum/SparseMerkleSumTreeTest.java +++ b/src/test/java/org/unicitylabs/sdk/mtree/sum/SparseMerkleSumTreeTest.java @@ -1,8 +1,8 @@ -package com.unicity.sdk.mtree.sum; +package org.unicitylabs.sdk.mtree.sum; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.sum.SparseMerkleSumTree.LeafValue; import java.math.BigInteger; import java.util.Map; import java.util.Map.Entry; diff --git a/src/test/java/com/unicity/sdk/predicate/MaskedPredicateReferenceTest.java b/src/test/java/org/unicitylabs/sdk/predicate/MaskedPredicateReferenceTest.java similarity index 81% rename from src/test/java/com/unicity/sdk/predicate/MaskedPredicateReferenceTest.java rename to src/test/java/org/unicitylabs/sdk/predicate/MaskedPredicateReferenceTest.java index 5b9af54..034a8bb 100644 --- a/src/test/java/com/unicity/sdk/predicate/MaskedPredicateReferenceTest.java +++ b/src/test/java/org/unicitylabs/sdk/predicate/MaskedPredicateReferenceTest.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.predicate; +package org.unicitylabs.sdk.predicate; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.token.TokenType; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.token.TokenType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/signing/SignatureRecoveryTest.java b/src/test/java/org/unicitylabs/sdk/signing/SignatureRecoveryTest.java similarity index 94% rename from src/test/java/com/unicity/sdk/signing/SignatureRecoveryTest.java rename to src/test/java/org/unicitylabs/sdk/signing/SignatureRecoveryTest.java index 4b3611d..7744327 100644 --- a/src/test/java/com/unicity/sdk/signing/SignatureRecoveryTest.java +++ b/src/test/java/org/unicitylabs/sdk/signing/SignatureRecoveryTest.java @@ -1,9 +1,9 @@ -package com.unicity.sdk.signing; +package org.unicitylabs.sdk.signing; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.hash.DataHasher; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.util.HexConverter; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/unicity/sdk/signing/SigningServiceTest.java b/src/test/java/org/unicitylabs/sdk/signing/SigningServiceTest.java similarity index 96% rename from src/test/java/com/unicity/sdk/signing/SigningServiceTest.java rename to src/test/java/org/unicitylabs/sdk/signing/SigningServiceTest.java index c971392..b2e8397 100644 --- a/src/test/java/com/unicity/sdk/signing/SigningServiceTest.java +++ b/src/test/java/org/unicitylabs/sdk/signing/SigningServiceTest.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.signing; +package org.unicitylabs.sdk.signing; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/com/unicity/sdk/token/TokenIdTest.java b/src/test/java/org/unicitylabs/sdk/token/TokenIdTest.java similarity index 91% rename from src/test/java/com/unicity/sdk/token/TokenIdTest.java rename to src/test/java/org/unicitylabs/sdk/token/TokenIdTest.java index 20c431e..9335be6 100644 --- a/src/test/java/com/unicity/sdk/token/TokenIdTest.java +++ b/src/test/java/org/unicitylabs/sdk/token/TokenIdTest.java @@ -1,5 +1,5 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/token/TokenTest.java b/src/test/java/org/unicitylabs/sdk/token/TokenTest.java similarity index 82% rename from src/test/java/com/unicity/sdk/token/TokenTest.java rename to src/test/java/org/unicitylabs/sdk/token/TokenTest.java index 01d16d9..84d7c29 100644 --- a/src/test/java/com/unicity/sdk/token/TokenTest.java +++ b/src/test/java/org/unicitylabs/sdk/token/TokenTest.java @@ -1,20 +1,20 @@ -package com.unicity.sdk.token; +package org.unicitylabs.sdk.token; -import com.unicity.sdk.address.DirectAddress; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.NametagMintTransactionData; -import com.unicity.sdk.transaction.Transaction; -import com.unicity.sdk.transaction.TransferTransactionData; -import com.unicity.sdk.utils.TestUtils; +import org.unicitylabs.sdk.address.DirectAddress; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.NametagMintTransactionData; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.utils.TestUtils; import java.io.IOException; import java.math.BigInteger; import java.util.List; diff --git a/src/test/java/com/unicity/sdk/transaction/CommitmentTest.java b/src/test/java/org/unicitylabs/sdk/transaction/CommitmentTest.java similarity index 73% rename from src/test/java/com/unicity/sdk/transaction/CommitmentTest.java rename to src/test/java/org/unicitylabs/sdk/transaction/CommitmentTest.java index 9ccae49..9e8bf63 100644 --- a/src/test/java/com/unicity/sdk/transaction/CommitmentTest.java +++ b/src/test/java/org/unicitylabs/sdk/transaction/CommitmentTest.java @@ -1,17 +1,17 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicateReference; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicateReference; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.util.HexConverter; import java.io.IOException; import java.math.BigInteger; import java.util.Map; diff --git a/src/test/java/com/unicity/sdk/transaction/InclusionProofTest.java b/src/test/java/org/unicitylabs/sdk/transaction/InclusionProofTest.java similarity index 84% rename from src/test/java/com/unicity/sdk/transaction/InclusionProofTest.java rename to src/test/java/org/unicitylabs/sdk/transaction/InclusionProofTest.java index 9f30eb8..707e3bf 100644 --- a/src/test/java/com/unicity/sdk/transaction/InclusionProofTest.java +++ b/src/test/java/org/unicitylabs/sdk/transaction/InclusionProofTest.java @@ -1,15 +1,15 @@ -package com.unicity.sdk.transaction; +package org.unicitylabs.sdk.transaction; -import com.unicity.sdk.api.Authenticator; -import com.unicity.sdk.api.LeafValue; -import com.unicity.sdk.api.RequestId; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.plain.SparseMerkleTree; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.serializer.UnicityObjectMapper; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.api.Authenticator; +import org.unicitylabs.sdk.api.LeafValue; +import org.unicitylabs.sdk.api.RequestId; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTree; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.util.HexConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/unicity/sdk/transaction/split/TokenSplitBuilderTest.java b/src/test/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilderTest.java similarity index 83% rename from src/test/java/com/unicity/sdk/transaction/split/TokenSplitBuilderTest.java rename to src/test/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilderTest.java index dd9ff3a..5459d71 100644 --- a/src/test/java/com/unicity/sdk/transaction/split/TokenSplitBuilderTest.java +++ b/src/test/java/org/unicitylabs/sdk/transaction/split/TokenSplitBuilderTest.java @@ -1,21 +1,21 @@ -package com.unicity.sdk.transaction.split; - -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.mtree.BranchExistsException; -import com.unicity.sdk.mtree.LeafOutOfBoundsException; -import com.unicity.sdk.mtree.plain.SparseMerkleTreePath; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.predicate.Predicate; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.Transaction; +package org.unicitylabs.sdk.transaction.split; + +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.mtree.BranchExistsException; +import org.unicitylabs.sdk.mtree.LeafOutOfBoundsException; +import org.unicitylabs.sdk.mtree.plain.SparseMerkleTreePath; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.Transaction; import java.math.BigInteger; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/unicity/sdk/utils/TestTokenData.java b/src/test/java/org/unicitylabs/sdk/utils/TestTokenData.java similarity index 90% rename from src/test/java/com/unicity/sdk/utils/TestTokenData.java rename to src/test/java/org/unicitylabs/sdk/utils/TestTokenData.java index 6b8f47e..9c6abd6 100644 --- a/src/test/java/com/unicity/sdk/utils/TestTokenData.java +++ b/src/test/java/org/unicitylabs/sdk/utils/TestTokenData.java @@ -1,6 +1,6 @@ -package com.unicity.sdk.utils; +package org.unicitylabs.sdk.utils; -import com.unicity.sdk.util.HexConverter; +import org.unicitylabs.sdk.util.HexConverter; import java.util.Arrays; diff --git a/src/test/java/com/unicity/sdk/utils/TestUtils.java b/src/test/java/org/unicitylabs/sdk/utils/TestUtils.java similarity index 87% rename from src/test/java/com/unicity/sdk/utils/TestUtils.java rename to src/test/java/org/unicitylabs/sdk/utils/TestUtils.java index ae64031..a8a7193 100644 --- a/src/test/java/com/unicity/sdk/utils/TestUtils.java +++ b/src/test/java/org/unicitylabs/sdk/utils/TestUtils.java @@ -1,7 +1,7 @@ -package com.unicity.sdk.utils; +package org.unicitylabs.sdk.utils; -import com.unicity.sdk.token.fungible.CoinId; -import com.unicity.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; import java.math.BigInteger; import java.security.SecureRandom; diff --git a/src/test/java/com/unicity/sdk/utils/TokenUtils.java b/src/test/java/org/unicitylabs/sdk/utils/TokenUtils.java similarity index 77% rename from src/test/java/com/unicity/sdk/utils/TokenUtils.java rename to src/test/java/org/unicitylabs/sdk/utils/TokenUtils.java index d2fa9bf..4f68142 100644 --- a/src/test/java/com/unicity/sdk/utils/TokenUtils.java +++ b/src/test/java/org/unicitylabs/sdk/utils/TokenUtils.java @@ -1,28 +1,28 @@ -package com.unicity.sdk.utils; - -import static com.unicity.sdk.utils.TestUtils.randomBytes; -import static com.unicity.sdk.utils.TestUtils.randomCoinData; - -import com.unicity.sdk.StateTransitionClient; -import com.unicity.sdk.address.Address; -import com.unicity.sdk.api.SubmitCommitmentResponse; -import com.unicity.sdk.api.SubmitCommitmentStatus; -import com.unicity.sdk.hash.DataHash; -import com.unicity.sdk.hash.HashAlgorithm; -import com.unicity.sdk.predicate.MaskedPredicate; -import com.unicity.sdk.signing.SigningService; -import com.unicity.sdk.token.NameTagTokenState; -import com.unicity.sdk.token.Token; -import com.unicity.sdk.token.TokenId; -import com.unicity.sdk.token.TokenState; -import com.unicity.sdk.token.TokenType; -import com.unicity.sdk.token.fungible.TokenCoinData; -import com.unicity.sdk.transaction.InclusionProof; -import com.unicity.sdk.transaction.MintCommitment; -import com.unicity.sdk.transaction.MintTransactionData; -import com.unicity.sdk.transaction.MintTransactionReason; -import com.unicity.sdk.transaction.NametagMintTransactionData; -import com.unicity.sdk.util.InclusionProofUtils; +package org.unicitylabs.sdk.utils; + +import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; +import static org.unicitylabs.sdk.utils.TestUtils.randomCoinData; + +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHash; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.NameTagTokenState; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.InclusionProof; +import org.unicitylabs.sdk.transaction.MintCommitment; +import org.unicitylabs.sdk.transaction.MintTransactionData; +import org.unicitylabs.sdk.transaction.MintTransactionReason; +import org.unicitylabs.sdk.transaction.NametagMintTransactionData; +import org.unicitylabs.sdk.util.InclusionProofUtils; public class TokenUtils { public static Token mintToken(StateTransitionClient client, byte[] secret) throws Exception { From 57d3c2d39c958d978eaca6639a5b5b6f3571c9d2 Mon Sep 17 00:00:00 2001 From: Martti Marran Date: Mon, 8 Sep 2025 23:21:54 +0400 Subject: [PATCH 2/5] Added escrow test --- .../sdk/common/BaseEscrowSwap.java | 219 ++++++++++++++++++ .../functional/FunctionalEscrowSwapTest.java | 13 ++ 2 files changed, 232 insertions(+) create mode 100644 src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java create mode 100644 src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java diff --git a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java new file mode 100644 index 0000000..763a46e --- /dev/null +++ b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java @@ -0,0 +1,219 @@ +package org.unicitylabs.sdk.common; + +import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; + +import java.math.BigInteger; +import java.nio.charset.StandardCharsets; +import java.util.AbstractMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.shadow.com.univocity.parsers.common.ContextWrapper; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.address.Address; +import org.unicitylabs.sdk.address.ProxyAddress; +import org.unicitylabs.sdk.api.SubmitCommitmentResponse; +import org.unicitylabs.sdk.api.SubmitCommitmentStatus; +import org.unicitylabs.sdk.hash.DataHasher; +import org.unicitylabs.sdk.hash.HashAlgorithm; +import org.unicitylabs.sdk.predicate.MaskedPredicate; +import org.unicitylabs.sdk.predicate.Predicate; +import org.unicitylabs.sdk.serializer.UnicityObjectMapper; +import org.unicitylabs.sdk.signing.SigningService; +import org.unicitylabs.sdk.token.Token; +import org.unicitylabs.sdk.token.TokenId; +import org.unicitylabs.sdk.token.TokenState; +import org.unicitylabs.sdk.token.TokenType; +import org.unicitylabs.sdk.token.fungible.CoinId; +import org.unicitylabs.sdk.token.fungible.TokenCoinData; +import org.unicitylabs.sdk.transaction.Transaction; +import org.unicitylabs.sdk.transaction.TransferCommitment; +import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.util.InclusionProofUtils; +import org.unicitylabs.sdk.utils.TokenUtils; + +public class BaseEscrowSwap { + + protected StateTransitionClient client; + private final byte[] ALICE_SECRET = "ALICE_SECRET".getBytes(StandardCharsets.UTF_8); + private final byte[] BOB_SECRET = "BOB_SECRET".getBytes(StandardCharsets.UTF_8); + private final byte[] CAROL_SECRET = "CAROL_SECRET".getBytes(StandardCharsets.UTF_8); + + private String[] transferToken(Token token, byte[] secret, String nametag) throws Exception { + TransferCommitment commitment = TransferCommitment.create( + token, + ProxyAddress.create(nametag), + randomBytes(32), + null, + null, + SigningService.createFromSecret(secret, token.getState().getUnlockPredicate().getNonce()) + ); + + SubmitCommitmentResponse response = this.client.submitCommitment(token, commitment).get(); + if (response.getStatus() != SubmitCommitmentStatus.SUCCESS) { + throw new RuntimeException("Failed to submit transfer commitment: " + response); + } + + return new String[]{ + UnicityObjectMapper.JSON.writeValueAsString(token), + UnicityObjectMapper.JSON.writeValueAsString(commitment.toTransaction(token, + InclusionProofUtils.waitInclusionProof(client, commitment).get())) + }; + } + + private Token mintToken(byte[] secret) throws Exception { + return TokenUtils.mintToken( + this.client, + secret, + new TokenId(randomBytes(32)), + new TokenType(randomBytes(32)), + randomBytes(32), + new TokenCoinData(Map.of( + new CoinId("test_eur".getBytes(StandardCharsets.UTF_8)), + BigInteger.valueOf(100), + new CoinId("test_usd".getBytes(StandardCharsets.UTF_8)), + BigInteger.valueOf(100) + )), + randomBytes(32), + randomBytes(32), + null + ); + } + + private Token receiveToken(String[] tokenInfo, byte[] secret, + NametagWrapper nametagToken) throws Exception { + Token token = UnicityObjectMapper.JSON.readValue(tokenInfo[0], Token.class); + Transaction transaction = UnicityObjectMapper.JSON.readValue( + tokenInfo[1], + UnicityObjectMapper.JSON.getTypeFactory() + .constructParametricType(Transaction.class, TransferTransactionData.class)); + + byte[] nonce = randomBytes(32); + TokenState state = new TokenState( + MaskedPredicate.create( + SigningService.createFromSecret(secret, nonce), + HashAlgorithm.SHA256, + nonce + ), + null + ); + + nametagToken.updateNameTag(this.client, secret, + state.getUnlockPredicate().getReference(token.getType()).toAddress()); + + return this.client.finalizeTransaction( + token, + state, + transaction, + List.of(nametagToken.getNametagToken()) + ); + } + + @Test + void testEscrow() throws Exception { + String[] bobData = transferToken( + mintToken(BOB_SECRET), + BOB_SECRET, + "ALICE" + ); + String[] carolData = transferToken( + mintToken(CAROL_SECRET), + CAROL_SECRET, + "ALICE" + ); + + NametagWrapper aliceNametagToken = new NametagWrapper( + TokenUtils.mintNametagToken( + this.client, + ALICE_SECRET, + "ALICE", + null + ) + ); + + Token aliceBobToken = receiveToken(bobData, ALICE_SECRET, aliceNametagToken); + Assertions.assertTrue(aliceBobToken.verify().isSuccessful()); + Token aliceCarolToken = receiveToken(carolData, ALICE_SECRET, aliceNametagToken); + Assertions.assertTrue(aliceCarolToken.verify().isSuccessful()); + + Token aliceToCarolToken = receiveToken( + transferToken(aliceBobToken, ALICE_SECRET, "CAROL"), + CAROL_SECRET, + new NametagWrapper( + TokenUtils.mintNametagToken( + this.client, + CAROL_SECRET, + "CAROL", + null + ) + )); + Assertions.assertTrue(aliceToCarolToken.verify().isSuccessful()); + + Token aliceToBobToken = receiveToken( + transferToken(aliceCarolToken, ALICE_SECRET, "BOB"), + BOB_SECRET, + new NametagWrapper( + TokenUtils.mintNametagToken( + this.client, + BOB_SECRET, + "BOB", + null + ) + )); + Assertions.assertTrue(aliceToBobToken.verify().isSuccessful()); + } + + static class NametagWrapper { + + private Token nametagToken; + + public NametagWrapper(Token nametagToken) { + this.nametagToken = nametagToken; + } + + public Token getNametagToken() { + return this.nametagToken; + } + + public void updateNameTag(StateTransitionClient client, byte[] secret, Address address) + throws Exception { + byte[] nonce = randomBytes(32); + Predicate predicate = MaskedPredicate.create( + SigningService.createFromSecret(secret, nonce), + HashAlgorithm.SHA256, + nonce + ); + + TransferCommitment commitment = TransferCommitment.create( + this.nametagToken, + predicate.getReference(this.nametagToken.getType()).toAddress(), + randomBytes(32), + new DataHasher(HashAlgorithm.SHA256) + .update(address.getAddress().getBytes(StandardCharsets.UTF_8)) + .digest(), + null, + SigningService.createFromSecret( + secret, + this.nametagToken.getState().getUnlockPredicate().getNonce() + ) + ); + + SubmitCommitmentResponse response = client.submitCommitment(this.nametagToken, commitment) + .get(); + if (response.getStatus() != SubmitCommitmentStatus.SUCCESS) { + throw new RuntimeException("Failed to submit transfer commitment: " + response); + } + + this.nametagToken = client.finalizeTransaction( + this.nametagToken, + new TokenState(predicate, address.getAddress().getBytes(StandardCharsets.UTF_8)), + commitment.toTransaction( + this.nametagToken, + InclusionProofUtils.waitInclusionProof(client, commitment).get() + ) + ); + } + } +} diff --git a/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java b/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java new file mode 100644 index 0000000..08c7482 --- /dev/null +++ b/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java @@ -0,0 +1,13 @@ +package org.unicitylabs.sdk.functional; + +import org.junit.jupiter.api.BeforeEach; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.TestAggregatorClient; +import org.unicitylabs.sdk.common.BaseEscrowSwap; + +public class FunctionalEscrowSwapTest extends BaseEscrowSwap { + @BeforeEach + void setUp() { + this.client = new StateTransitionClient(new TestAggregatorClient()); + } +} From 0a4d614890b45ee4d465fa204baf4569d29fc097 Mon Sep 17 00:00:00 2001 From: Martti Marran Date: Mon, 8 Sep 2025 23:42:16 +0400 Subject: [PATCH 3/5] Add e2e test for escrow, add unique nametags for each run --- .../sdk/common/BaseEscrowSwap.java | 64 +++++++++++++------ .../sdk/e2e/E2EEscrowSwapTest.java | 21 ++++++ 2 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java diff --git a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java index 763a46e..a222680 100644 --- a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java +++ b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java @@ -1,6 +1,7 @@ package org.unicitylabs.sdk.common; import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; +import static org.unicitylabs.sdk.utils.TestUtils.randomCoinData; import java.math.BigInteger; import java.nio.charset.StandardCharsets; @@ -8,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.UUID; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.shadow.com.univocity.parsers.common.ContextWrapper; @@ -31,6 +33,7 @@ import org.unicitylabs.sdk.transaction.Transaction; import org.unicitylabs.sdk.transaction.TransferCommitment; import org.unicitylabs.sdk.transaction.TransferTransactionData; +import org.unicitylabs.sdk.util.HexConverter; import org.unicitylabs.sdk.util.InclusionProofUtils; import org.unicitylabs.sdk.utils.TokenUtils; @@ -41,6 +44,10 @@ public class BaseEscrowSwap { private final byte[] BOB_SECRET = "BOB_SECRET".getBytes(StandardCharsets.UTF_8); private final byte[] CAROL_SECRET = "CAROL_SECRET".getBytes(StandardCharsets.UTF_8); + private final String ALICE_NAMETAG = String.format("ALICE_%s", System.currentTimeMillis()); + private final String BOB_NAMETAG = String.format("BOB_%s", System.currentTimeMillis()); + private final String CAROL_NAMETAG = String.format("CAROL_%s", System.currentTimeMillis()); + private String[] transferToken(Token token, byte[] secret, String nametag) throws Exception { TransferCommitment commitment = TransferCommitment.create( token, @@ -68,14 +75,10 @@ private Token mintToken(byte[] secret) throws Exception { this.client, secret, new TokenId(randomBytes(32)), - new TokenType(randomBytes(32)), + new TokenType(HexConverter.decode( + "f8aa13834268d29355ff12183066f0cb902003629bbc5eb9ef0efbe397867509")), randomBytes(32), - new TokenCoinData(Map.of( - new CoinId("test_eur".getBytes(StandardCharsets.UTF_8)), - BigInteger.valueOf(100), - new CoinId("test_usd".getBytes(StandardCharsets.UTF_8)), - BigInteger.valueOf(100) - )), + null, randomBytes(32), randomBytes(32), null @@ -113,53 +116,72 @@ private Token receiveToken(String[] tokenInfo, byte[] secret, @Test void testEscrow() throws Exception { - String[] bobData = transferToken( + // Make nametags unique for each test run + String[] bobSerializedData = transferToken( mintToken(BOB_SECRET), BOB_SECRET, - "ALICE" + ALICE_NAMETAG ); - String[] carolData = transferToken( + String[] carolSerializedData = transferToken( mintToken(CAROL_SECRET), CAROL_SECRET, - "ALICE" + ALICE_NAMETAG ); NametagWrapper aliceNametagToken = new NametagWrapper( TokenUtils.mintNametagToken( this.client, ALICE_SECRET, - "ALICE", - null + new TokenType(HexConverter.decode( + "f8aa13834268d29355ff12183066f0cb902003629bbc5eb9ef0efbe397867509")), + randomBytes(32), + null, + ALICE_NAMETAG, + null, + randomBytes(32), + randomBytes(32) ) ); - Token aliceBobToken = receiveToken(bobData, ALICE_SECRET, aliceNametagToken); + Token aliceBobToken = receiveToken(bobSerializedData, ALICE_SECRET, aliceNametagToken); Assertions.assertTrue(aliceBobToken.verify().isSuccessful()); - Token aliceCarolToken = receiveToken(carolData, ALICE_SECRET, aliceNametagToken); + Token aliceCarolToken = receiveToken(carolSerializedData, ALICE_SECRET, aliceNametagToken); Assertions.assertTrue(aliceCarolToken.verify().isSuccessful()); Token aliceToCarolToken = receiveToken( - transferToken(aliceBobToken, ALICE_SECRET, "CAROL"), + transferToken(aliceBobToken, ALICE_SECRET, CAROL_NAMETAG), CAROL_SECRET, new NametagWrapper( TokenUtils.mintNametagToken( this.client, CAROL_SECRET, - "CAROL", - null + new TokenType(HexConverter.decode( + "f8aa13834268d29355ff12183066f0cb902003629bbc5eb9ef0efbe397867509")), + randomBytes(32), + null, + CAROL_NAMETAG, + null, + randomBytes(32), + randomBytes(32) ) )); Assertions.assertTrue(aliceToCarolToken.verify().isSuccessful()); Token aliceToBobToken = receiveToken( - transferToken(aliceCarolToken, ALICE_SECRET, "BOB"), + transferToken(aliceCarolToken, ALICE_SECRET, BOB_NAMETAG), BOB_SECRET, new NametagWrapper( TokenUtils.mintNametagToken( this.client, BOB_SECRET, - "BOB", - null + new TokenType(HexConverter.decode( + "f8aa13834268d29355ff12183066f0cb902003629bbc5eb9ef0efbe397867509")), + randomBytes(32), + null, + BOB_NAMETAG, + null, + randomBytes(32), + randomBytes(32) ) )); Assertions.assertTrue(aliceToBobToken.verify().isSuccessful()); diff --git a/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java b/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java new file mode 100644 index 0000000..5e55ff5 --- /dev/null +++ b/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java @@ -0,0 +1,21 @@ +package org.unicitylabs.sdk.e2e; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.unicitylabs.sdk.StateTransitionClient; +import org.unicitylabs.sdk.api.AggregatorClient; +import org.unicitylabs.sdk.common.BaseEscrowSwap; + +@Tag("integration") +@EnabledIfEnvironmentVariable(named = "AGGREGATOR_URL", matches = ".+") +public class E2EEscrowSwapTest extends BaseEscrowSwap { + @BeforeEach + void setUp() { + String aggregatorUrl = System.getenv("AGGREGATOR_URL"); + Assertions.assertNotNull(aggregatorUrl, "AGGREGATOR_URL environment variable must be set"); + + this.client = new StateTransitionClient(new AggregatorClient(aggregatorUrl)); + } +} From 6b8661268cfc148340cd3faec876f4f838f6ed6e Mon Sep 17 00:00:00 2001 From: Pavel Grigorenko Date: Tue, 9 Sep 2025 00:01:05 +0400 Subject: [PATCH 4/5] minor refactoring --- ...scrowSwap.java => BaseEscrowSwapTest.java} | 22 ++++++++++--------- .../sdk/e2e/E2EEscrowSwapTest.java | 4 ++-- .../functional/FunctionalEscrowSwapTest.java | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) rename src/test/java/org/unicitylabs/sdk/common/{BaseEscrowSwap.java => BaseEscrowSwapTest.java} (95%) diff --git a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java similarity index 95% rename from src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java rename to src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java index a222680..1b94ef7 100644 --- a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwap.java +++ b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java @@ -1,18 +1,12 @@ package org.unicitylabs.sdk.common; import static org.unicitylabs.sdk.utils.TestUtils.randomBytes; -import static org.unicitylabs.sdk.utils.TestUtils.randomCoinData; -import java.math.BigInteger; import java.nio.charset.StandardCharsets; -import java.util.AbstractMap; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.shadow.com.univocity.parsers.common.ContextWrapper; import org.unicitylabs.sdk.StateTransitionClient; import org.unicitylabs.sdk.address.Address; import org.unicitylabs.sdk.address.ProxyAddress; @@ -28,8 +22,6 @@ import org.unicitylabs.sdk.token.TokenId; import org.unicitylabs.sdk.token.TokenState; import org.unicitylabs.sdk.token.TokenType; -import org.unicitylabs.sdk.token.fungible.CoinId; -import org.unicitylabs.sdk.token.fungible.TokenCoinData; import org.unicitylabs.sdk.transaction.Transaction; import org.unicitylabs.sdk.transaction.TransferCommitment; import org.unicitylabs.sdk.transaction.TransferTransactionData; @@ -37,7 +29,17 @@ import org.unicitylabs.sdk.util.InclusionProofUtils; import org.unicitylabs.sdk.utils.TokenUtils; -public class BaseEscrowSwap { +/** + * Alice has a nametag and acts as an escrow for the swap + * Bob transfers token to Alice + * Carol transfers token to Alice + *

+ * Alice transfers Bob's token to Carol + * Alice transfers Carol's token to Bob + *

+ * Everyone's happy :) + */ +public class BaseEscrowSwapTest { protected StateTransitionClient client; private final byte[] ALICE_SECRET = "ALICE_SECRET".getBytes(StandardCharsets.UTF_8); diff --git a/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java b/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java index 5e55ff5..1a5ec97 100644 --- a/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java +++ b/src/test/java/org/unicitylabs/sdk/e2e/E2EEscrowSwapTest.java @@ -6,11 +6,11 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.unicitylabs.sdk.StateTransitionClient; import org.unicitylabs.sdk.api.AggregatorClient; -import org.unicitylabs.sdk.common.BaseEscrowSwap; +import org.unicitylabs.sdk.common.BaseEscrowSwapTest; @Tag("integration") @EnabledIfEnvironmentVariable(named = "AGGREGATOR_URL", matches = ".+") -public class E2EEscrowSwapTest extends BaseEscrowSwap { +public class E2EEscrowSwapTest extends BaseEscrowSwapTest { @BeforeEach void setUp() { String aggregatorUrl = System.getenv("AGGREGATOR_URL"); diff --git a/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java b/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java index 08c7482..e9b6c49 100644 --- a/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java +++ b/src/test/java/org/unicitylabs/sdk/functional/FunctionalEscrowSwapTest.java @@ -3,9 +3,9 @@ import org.junit.jupiter.api.BeforeEach; import org.unicitylabs.sdk.StateTransitionClient; import org.unicitylabs.sdk.TestAggregatorClient; -import org.unicitylabs.sdk.common.BaseEscrowSwap; +import org.unicitylabs.sdk.common.BaseEscrowSwapTest; -public class FunctionalEscrowSwapTest extends BaseEscrowSwap { +public class FunctionalEscrowSwapTest extends BaseEscrowSwapTest { @BeforeEach void setUp() { this.client = new StateTransitionClient(new TestAggregatorClient()); From 0d2b57f2bbe67f6eeffa4b9573330617075481aa Mon Sep 17 00:00:00 2001 From: Martti Marran Date: Tue, 9 Sep 2025 10:45:22 +0400 Subject: [PATCH 5/5] Fix escrow test class, make it abstract --- .../java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java index 1b94ef7..cb87a1a 100644 --- a/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java +++ b/src/test/java/org/unicitylabs/sdk/common/BaseEscrowSwapTest.java @@ -39,7 +39,7 @@ *

* Everyone's happy :) */ -public class BaseEscrowSwapTest { +public abstract class BaseEscrowSwapTest { protected StateTransitionClient client; private final byte[] ALICE_SECRET = "ALICE_SECRET".getBytes(StandardCharsets.UTF_8);