Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/stellar/sdk/SorobanServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ public SendTransactionResponse sendTransaction(Transaction transaction) {
"sendTransaction", params, new TypeToken<SorobanRpcResponse<SendTransactionResponse>>() {});
}

private Transaction assembleTransaction(
public static Transaction assembleTransaction(
Transaction transaction, SimulateTransactionResponse simulateTransactionResponse) {
if (!transaction.isSorobanTransaction()) {
throw new IllegalArgumentException(
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/org/stellar/sdk/TransactionBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import lombok.Getter;
import lombok.NonNull;
import org.stellar.sdk.operations.Operation;
import org.stellar.sdk.xdr.SorobanTransactionData;

/** Builds a new Transaction object. */
public class TransactionBuilder {
private final TransactionBuilderAccount sourceAccount;
@Getter private final TransactionBuilderAccount sourceAccount;
private Memo memo;
private final List<Operation> operations;
private Long baseFee;
private final Network network;
@Getter private Long baseFee;
@Getter private final Network network;
@NonNull private TransactionPreconditions preconditions;
private SorobanTransactionData sorobanData;
private BigInteger txTimeout;
Expand Down Expand Up @@ -158,16 +159,20 @@ public Transaction build() {
"Can not set both TransactionPreconditions.timeBounds and timeout.");
}

TransactionPreconditions txPreconditions;

if (txTimeout != null) {
BigInteger maxTime =
!TIMEOUT_INFINITE.equals(txTimeout)
? txTimeout.add(BigInteger.valueOf(System.currentTimeMillis() / 1000L))
: TIMEOUT_INFINITE;
preconditions =
txPreconditions =
preconditions.toBuilder().timeBounds(new TimeBounds(BigInteger.ZERO, maxTime)).build();
} else {
txPreconditions = preconditions;
}

preconditions.validate();
txPreconditions.validate();

if (baseFee == null) {
throw new IllegalStateException("baseFee has to be set. you must call setBaseFee().");
Expand All @@ -193,7 +198,7 @@ public Transaction build() {
sequenceNumber,
operations,
memo,
preconditions,
txPreconditions,
sorobanData,
network);
sourceAccount.setSequenceNumber(sequenceNumber);
Expand Down
Loading