Add the fromXdrBase64, fromXdrByteArray, toXdrBase64 and toXdrByteArray methods to the XDR classes. #503
There are no files selected for viewing
This file contains 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 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 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 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 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 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,10 +1,7 @@ | ||
| package org.stellar.sdk; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import com.google.gson.reflect.TypeToken; | ||
| import java.io.Closeable; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
|
|
@@ -14,7 +11,6 @@ | |
| import java.util.Optional; | ||
| import java.util.UUID; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.annotation.Nullable; | ||
| import okhttp3.HttpUrl; | ||
| import okhttp3.MediaType; | ||
|
|
@@ -48,8 +44,6 @@ | |
| import org.stellar.sdk.xdr.SCVal; | ||
| import org.stellar.sdk.xdr.SorobanAuthorizationEntry; | ||
| import org.stellar.sdk.xdr.SorobanTransactionData; | ||
|
|
||
| /** | ||
| * Main class used to connect to the Soroban-RPC instance and exposes an interface for requests to | ||
|
|
@@ -122,8 +116,12 @@ public TransactionBuilderAccount getAccount(String accountId) | |
| if (entries == null || entries.isEmpty()) { | ||
| throw new AccountNotFoundException(accountId); | ||
| } | ||
| LedgerEntry.LedgerEntryData ledgerEntryData; | ||
| try { | ||
| ledgerEntryData = LedgerEntry.LedgerEntryData.fromXdrBase64(entries.get(0).getXdr()); | ||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException("Invalid ledgerEntryData: " + entries.get(0).getXdr(), e); | ||
| } | ||
| long sequence = ledgerEntryData.getAccount().getSeqNum().getSequenceNumber().getInt64(); | ||
| return new Account(accountId, sequence); | ||
| } | ||
|
|
@@ -220,8 +218,16 @@ public GetLedgerEntriesResponse getLedgerEntries(Collection<LedgerKey> keys) | |
| throw new IllegalArgumentException("At least one key must be provided."); | ||
| } | ||
|
|
||
| List<String> xdrKeys = new ArrayList<>(keys.size()); | ||
| for (LedgerKey key : keys) { | ||
| String xdrBase64; | ||
| try { | ||
| xdrBase64 = key.toXdrBase64(); | ||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException("Invalid ledgerKey: " + key, e); | ||
| } | ||
| xdrKeys.add(xdrBase64); | ||
| } | ||
| GetLedgerEntriesRequest params = new GetLedgerEntriesRequest(xdrKeys); | ||
| return this.sendRequest( | ||
| "getLedgerEntries", | ||
|
|
@@ -421,7 +427,11 @@ private Transaction assembleTransaction( | |
| List<SorobanAuthorizationEntry> newEntries = new ArrayList<>(originalEntries); | ||
| if (simulateHostFunctionResult.getAuth() != null) { | ||
| for (String auth : simulateHostFunctionResult.getAuth()) { | ||
| try { | ||
| newEntries.add(SorobanAuthorizationEntry.fromXdrBase64(auth)); | ||
|
There was a problem hiding this comment. @overcat , please refer to the js soroban client for a reference on how it merges simulation results to original transaction, https://github.com/stellar/js-soroban-client/blob/main/src/transaction.ts#L21 the java sdk should be consistent to how that handles merging auths, the js sdk will not apply simulated auths if the original tx had auths. |
||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException("Invalid auth: " + auth, e); | ||
| } | ||
| } | ||
| } | ||
| operation = | ||
|
|
@@ -432,8 +442,14 @@ private Transaction assembleTransaction( | |
| .build(); | ||
| } | ||
|
|
||
| SorobanTransactionData sorobanData; | ||
| try { | ||
| sorobanData = | ||
| SorobanTransactionData.fromXdrBase64(simulateTransactionResponse.getTransactionData()); | ||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException( | ||
| "Invalid transactionData: " + simulateTransactionResponse.getTransactionData(), e); | ||
| } | ||
|
|
||
| return new Transaction( | ||
| transaction.getAccountConverter(), | ||
|
|
@@ -477,44 +493,6 @@ private static String generateRequestId() { | |
| return UUID.randomUUID().toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Represents the "durability keyspace" that this ledger key belongs to, check {@link | ||
| * SorobanServer#getContractData} for more details. | ||
|
|
||
This file contains 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
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.
rather than declare
ledgerEntryDataoutside of try/catch, just use it inside when it's valid.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.
I personally prefer to include as little code as possible within the try block. Assuming there is some other business logic before returning Account, should we also place it within the try block?