set timeout after simulation and before sign

.github/workflows/npm_publish.yml

@@ -21,7 +21,12 @@ jobs:
         run: yarn install
 
       - name: Build, Test, and Package
-        run: yarn preversion
+        run: |
+          npm unpublish @stellar/[email protected]
+          npm unpublish [email protected]
+          yarn preversion
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Publish npm package to both places
         run: |

CHANGELOG.md

@@ -7,16 +7,18 @@ A breaking change will get clearly marked in this log.
 ## Unreleased
 
 
-## [v12.0.0](https://github.com/stellar/js-stellar-sdk/compare/v11.3.0...v12.0.0)
+## [v12.0.0-rc.1](https://github.com/stellar/js-stellar-sdk/compare/v11.3.0...v12.0.0-rc.1)
 
 ### Breaking Changes
-* **This update supports Protocol 21** ([#949](https://github.com/stellar/js-stellar-sdk/pull/949)).
+* **This update supports Protocol 21**. It is an additive change to the protocol so there are no true backwards incompatibilities, but your software may break if you encounter new unexpected fields from this Protocol ([#949](https://github.com/stellar/js-stellar-sdk/pull/949)).
+* **Default timeout for transaction calls is now set to 60 seconds from previous default of 10**. 10 seconds is often not enough time to review transactions before signing, which would cause a `txTooLate` error response from the server.
 
 ### Fixed
 * Each item in the `GetEventsResponse.events` list will now have a `txHash` item corresponding to the transaction hash that triggered a particular event ([#939](https://github.com/stellar/js-stellar-sdk/pull/939)).
 * `ContractClient` now properly handles methods that take no arguments by making `MethodOptions` the only parameter, bringing it inline with the types generated by Soroban CLI's `soroban contract bindings typescript` ([#940](https://github.com/stellar/js-stellar-sdk/pull/940)).
 * `ContractClient` now allows `publicKey` to be undefined ([#941](https://github.com/stellar/js-stellar-sdk/pull/941)).
-
+* `SentTransaction` will only pass `allowHttp` if (and only if) its corresponding `AssembledTransaction#options` config allowed it ([#952](https://github.com/stellar/js-stellar-sdk/pull/952)).
+* `SentTransaction` will now modify the time bounds of the transaction to be `timeoutInSeconds` seconds after the transaction has been simulated. Previously this was set when the transaction is built, before the simulation. This makes the time bounds line up with the timeout retry logic in `SentTransaction`.
 
 ## [v11.3.0](https://github.com/stellar/js-stellar-sdk/compare/v11.2.2...v11.3.0)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar/stellar-sdk",
-  "version": "12.0.0",
+  "version": "12.0.0-rc.1",
   "description": "A library for working with the Stellar network, including communication with the Horizon and Soroban RPC servers.",
   "keywords": [
     "stellar"

src/contract_client/sent_transaction.ts

@@ -1,5 +1,5 @@
 import type { ContractClientOptions, Tx } from "./types";
-import { SorobanRpc, TransactionBuilder } from "..";
+import { SorobanDataBuilder, SorobanRpc, TransactionBuilder } from "..";
 import { DEFAULT_TIMEOUT, withExponentialBackoff } from "./utils";
 import { AssembledTransaction } from "./assembled_transaction";
 
@@ -41,19 +41,19 @@ export class SentTransaction<T> {
   static Errors = {
     SendFailed: class SendFailedError extends Error {},
     SendResultOnly: class SendResultOnlyError extends Error {},
-  }
+  };
 
   constructor(
     public signTransaction: ContractClientOptions["signTransaction"],
-    public assembled: AssembledTransaction<T>
+    public assembled: AssembledTransaction<T>,
   ) {
     if (!signTransaction) {
       throw new Error(
-        "You must provide a `signTransaction` function to send a transaction"
+        "You must provide a `signTransaction` function to send a transaction",
       );
     }
     this.server = new SorobanRpc.Server(this.assembled.options.rpcUrl, {
-      allowHttp: this.assembled.options.rpcUrl.startsWith("http://"),
+      allowHttp: this.assembled.options.allowHttp ?? false,
     });
   }
 
@@ -72,30 +72,35 @@ export class SentTransaction<T> {
 
   private send = async (): Promise<this> => {
     const timeoutInSeconds = this.assembled.options.timeoutInSeconds ?? DEFAULT_TIMEOUT
+    this.assembled.built = TransactionBuilder.cloneFrom(this.assembled.built!, {
+      fee: this.assembled.built!.fee,
+      timebounds: undefined,
+      sorobanData: new SorobanDataBuilder(this.assembled.simulationData.transactionData.toXDR()).build()
+    })
+      .setTimeout(timeoutInSeconds)
+      .build();
 
     const signature = await this.signTransaction!(
       // `signAndSend` checks for `this.built` before calling `SentTransaction.init`
       this.assembled.built!.toXDR(),
       {
         networkPassphrase: this.assembled.options.networkPassphrase,
-      }
+      },
     );
 
     this.signed = TransactionBuilder.fromXDR(
       signature,
-      this.assembled.options.networkPassphrase
+      this.assembled.options.networkPassphrase,
     ) as Tx;
 
-    this.sendTransactionResponse = await this.server.sendTransaction(this.signed);
+    this.sendTransactionResponse = await this.server.sendTransaction(
+      this.signed,
+    );
 
     if (this.sendTransactionResponse.status !== "PENDING") {
       throw new SentTransaction.Errors.SendFailed(
-        'Sending the transaction to the network failed!\n' +
-          JSON.stringify(
-            this.sendTransactionResponse,
-            null,
-            2
-          )
+        "Sending the transaction to the network failed!\n" +
+          JSON.stringify(this.sendTransactionResponse, null, 2),
       );
     }
 
@@ -104,7 +109,7 @@ export class SentTransaction<T> {
     this.getTransactionResponseAll = await withExponentialBackoff(
       () => this.server.getTransaction(hash),
       (resp) => resp.status === SorobanRpc.Api.GetTransactionStatus.NOT_FOUND,
-      timeoutInSeconds
+      timeoutInSeconds,
     );
 
     this.getTransactionResponse =
@@ -119,13 +124,13 @@ export class SentTransaction<T> {
           `Sent transaction: ${JSON.stringify(
             this.sendTransactionResponse,
             null,
-            2
+            2,
           )}\n` +
           `All attempts to get the result: ${JSON.stringify(
             this.getTransactionResponseAll,
             null,
-            2
-          )}`
+            2,
+          )}`,
       );
     }
 
@@ -138,7 +143,7 @@ export class SentTransaction<T> {
       // getTransactionResponse has a `returnValue` field unless it failed
       if ("returnValue" in this.getTransactionResponse) {
         return this.assembled.options.parseResultXdr(
-          this.getTransactionResponse.returnValue!
+          this.getTransactionResponse.returnValue!,
         );
       }
 
@@ -151,17 +156,17 @@ export class SentTransaction<T> {
       const errorResult = this.sendTransactionResponse.errorResult?.result();
       if (errorResult) {
         throw new SentTransaction.Errors.SendFailed(
-          `Transaction simulation looked correct, but attempting to send the transaction failed. Check \`simulation\` and \`sendTransactionResponseAll\` to troubleshoot. Decoded \`sendTransactionResponse.errorResultXdr\`: ${errorResult}`
+          `Transaction simulation looked correct, but attempting to send the transaction failed. Check \`simulation\` and \`sendTransactionResponseAll\` to troubleshoot. Decoded \`sendTransactionResponse.errorResultXdr\`: ${errorResult}`,
         );
       }
       throw new SentTransaction.Errors.SendResultOnly(
-        `Transaction was sent to the network, but not yet awaited. No result to show. Await transaction completion with \`getTransaction(sendTransactionResponse.hash)\``
+        `Transaction was sent to the network, but not yet awaited. No result to show. Await transaction completion with \`getTransaction(sendTransactionResponse.hash)\``,
       );
     }
 
     // 3. finally, if neither of those are present, throw an error
     throw new Error(
-      `Sending transaction failed: ${JSON.stringify(this.assembled)}`
+      `Sending transaction failed: ${JSON.stringify(this.assembled)}`,
     );
   }
 }

src/contract_client/utils.ts

@@ -1,7 +1,7 @@
 /**
  * The default timeout for waiting for a transaction to be included in a block.
  */
-export const DEFAULT_TIMEOUT = 10;
+export const DEFAULT_TIMEOUT = 60;
 
 /**
  * Keep calling a `fn` for `timeoutInSeconds` seconds, if `keepWaitingIf` is true.