Code updates for latest changes #3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| .env | ||
| .idea | ||
| .gradle | ||
| .claude | ||
| build | ||
| src/test/resources/docker/aggregator/mongo-data |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.unicity.sdk; | ||
|
|
||
| import com.unicity.sdk.hash.DataHash; | ||
|
|
||
| public interface Hashable { | ||
| DataHash getHash(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,218 +1,82 @@ | ||
|
|
||
| package com.unicity.sdk; | ||
|
|
||
| import com.unicity.sdk.api.AggregatorClient; | ||
| 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 java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class StateTransitionClient { | ||
|
|
||
| protected final AggregatorClient client; | ||
|
|
||
| public StateTransitionClient(AggregatorClient client) { | ||
| this.client = client; | ||
| } | ||
|
|
||
| public <T extends MintTransactionData<?>> CompletableFuture<SubmitCommitmentResponse> submitCommitment( | ||
| MintCommitment<T> commitment) { | ||
| return this.client.submitCommitment( | ||
| commitment.getRequestId(), | ||
| commitment.getTransactionData().calculateHash(), | ||
| commitment.getAuthenticator() | ||
| ); | ||
| } | ||
|
|
||
| public CompletableFuture<SubmitCommitmentResponse> submitCommitment( | ||
| Token<?> token, | ||
| TransferCommitment commitment) { | ||
| if (!commitment.getTransactionData().getSourceState().getUnlockPredicate() | ||
| .isOwner(commitment.getAuthenticator().getPublicKey())) { | ||
| throw new IllegalArgumentException( | ||
| "Ownership verification failed: Authenticator does not match source state predicate."); | ||
| } | ||
|
|
||
| return this.client.submitCommitment(commitment.getRequestId(), commitment.getTransactionData() | ||
| .calculateHash(token.getId(), token.getType()), commitment.getAuthenticator()); | ||
|
Member
There was a problem hiding this comment. to extend my previous comment: transfer could also have |
||
| } | ||
|
|
||
| public <T extends Transaction<MintTransactionData<?>>> Token<T> finishTransaction( | ||
| Token<T> token, | ||
| TokenState state, | ||
| Transaction<TransferTransactionData> transaction | ||
| ) { | ||
| return this.finishTransaction(token, state, transaction, List.of()); | ||
| } | ||
|
|
||
| public <T extends Transaction<MintTransactionData<?>>> Token<T> finishTransaction( | ||
|
martti007 marked this conversation as resolved.
Outdated
|
||
| Token<T> token, | ||
| TokenState state, | ||
| Transaction<TransferTransactionData> transaction, | ||
| List<Token<?>> nametagTokens | ||
| ) { | ||
| Objects.requireNonNull(token, "Token is null"); | ||
|
|
||
| return token.update(state, transaction, nametagTokens); | ||
| } | ||
|
|
||
| public CompletableFuture<InclusionProofVerificationStatus> getTokenStatus( | ||
|
|
||
| Token<? extends Transaction<MintTransactionData<?>>> token, | ||
| byte[] publicKey) { | ||
| RequestId requestId = RequestId.create(publicKey, | ||
| token.getState().calculateHash(token.getId(), token.getType())); | ||
| return this.client.getInclusionProof(requestId) | ||
| .thenApply(inclusionProof -> inclusionProof.verify(requestId)); | ||
| } | ||
|
|
||
| public CompletableFuture<InclusionProof> getInclusionProof(Commitment<?> commitment) { | ||
| return this.client.getInclusionProof(commitment.getRequestId()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
|
|
||
| package com.unicity.sdk.address; | ||
|
|
||
| public interface Address { | ||
| AddressScheme getScheme(); | ||
| String getAddress(); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aggregator client coult simply take Commitment object as input, MintCommitment and TransferCommitment both extend it.
TransactionDatacould know how to calculate its own hash (MintTransactionDataalready does) andTransferTransactionDatahas all the token info it needs at creation time.