.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.6.4-sdk",
+  "version": "4.7.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

package.json

@@ -10,8 +10,8 @@
     "*.{md,js,json,yml,yaml,css,md}": "prettier --write"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.0",
-    "@babel/preset-env": "^7.18.0",
+    "@babel/core": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
     "@project-serum/anchor": "^0.24.2",
     "@rushstack/eslint-patch": "^1.1.3",
@@ -29,20 +29,20 @@
     "@types/react": "^18.0.9",
     "@types/source-map-support": "^0.5.4",
     "@yarnpkg/doctor": "^3.1.3",
-    "bn.js": "^5.2.0",
+    "bn.js": "^5.2.1",
     "buffer": "^6.0.3",
     "eslint": "^8.16.0",
     "husky": "^8.0.1",
     "jest": "^28.1.0",
     "jsbi": "^4.3.0",
-    "lint-staged": "^12.4.1",
+    "lint-staged": "^12.4.2",
     "prettier": "^2.6.2",
     "react": "^18.1.0",
     "size-limit": "^7.0.8",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.8.0",
     "typedoc": "^0.22.15",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.2"
   },
   "resolutions": {
     "@solana/web3.js": "^1.42"
@@ -62,6 +62,6 @@
     "test": "jest **/*.test.ts",
     "doctor:packages": "yarn doctor packages/"
   },
-  "version": "1.13.16",
+  "version": "1.13.17",
   "packageManager": "yarn@3.2.1"
 }

packages/anchor-contrib/package.json

@@ -6,7 +6,7 @@
   },
   "homepage": "https://saber.so",
   "description": "TypeScript client for Anchor programs.",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "author": "Ian Macalinao <ian@saber.so>",
@@ -26,11 +26,11 @@
     "@solana/web3.js": "^1.43.1",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.mapvalues": "^4.6.7",
-    "bn.js": "^5.2.0",
-    "typescript": "^4.6.4"
+    "bn.js": "^5.2.1",
+    "typescript": "^4.7.2"
   },
   "dependencies": {
-    "@saberhq/solana-contrib": "^1.13.16",
+    "@saberhq/solana-contrib": "^1.13.17",
     "eventemitter3": "^4.0.7",
     "lodash.camelcase": "^4.3.0",
     "lodash.mapvalues": "^4.6.0",

packages/browserslist-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saberhq/browserslist-config",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "homepage": "https://saber.so",
   "description": "Saber shareable config for Browserslist.",
   "repository": "git@github.com:saber-hq/saber-common.git",

packages/chai-solana/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saberhq/chai-solana",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "description": "Solana Chai helpers",
   "author": "Ian Macalinao <ian@saber.so>",
   "homepage": "https://github.com/saber-hq/saber-common#readme",
@@ -24,9 +24,9 @@
     "src/"
   ],
   "dependencies": {
-    "@saberhq/anchor-contrib": "^1.13.16",
-    "@saberhq/solana-contrib": "^1.13.16",
-    "@saberhq/token-utils": "^1.13.16",
+    "@saberhq/anchor-contrib": "^1.13.17",
+    "@saberhq/solana-contrib": "^1.13.17",
+    "@saberhq/token-utils": "^1.13.17",
     "@types/chai": "^4.3.1",
     "@types/chai-as-promised": "^7.1.5",
     "@types/promise-retry": "^1.1.3",
@@ -49,8 +49,8 @@
   "devDependencies": {
     "@project-serum/anchor": "^0.24.2",
     "@solana/web3.js": "^1.43.1",
-    "bn.js": "^5.2.0",
+    "bn.js": "^5.2.1",
     "jsbi": "^4.3.0",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.2"
   }
 }

packages/chai-solana/src/printInstructionLogs.ts

@@ -44,9 +44,12 @@ export const formatInstructionLogsForConsole = (
 export const printSendTransactionError = (err: SendTransactionError) => {
   try {
     const parsed = parseTransactionLogs(err.logs ?? null, err);
-    console.error(formatInstructionLogsForConsole(parsed));
+    console.log(formatInstructionLogsForConsole(parsed));
   } catch (e) {
-    console.error(`Could not parse transaction error`, e);
-    console.error("SendTransactionError", err);
+    console.warn(
+      colors.yellow("Could not print logs due to error. Printing raw logs"),
+      e
+    );
+    console.log(err.logs?.join("\n"));
   }
 };

packages/chai-solana/src/utils.ts

@@ -2,42 +2,23 @@ import "chai-as-promised";
 
 import type { Idl } from "@project-serum/anchor";
 import type {
-  TransactionEnvelope,
+  PromiseOrValue,
+  TransactionLike,
   TransactionReceipt,
 } from "@saberhq/solana-contrib";
-import { PendingTransaction } from "@saberhq/solana-contrib";
-import type { SendTransactionError } from "@solana/web3.js";
+import { confirmTransactionLike } from "@saberhq/solana-contrib";
 import { assert, expect } from "chai";
 
-import { printSendTransactionError } from "./printInstructionLogs";
-
-const processTX = async (
-  tx: TransactionEnvelope | PendingTransaction | null
-): Promise<TransactionReceipt> => {
-  if (tx instanceof PendingTransaction) {
-    return await tx.wait();
-  } else if (tx) {
-    try {
-      const pending = await tx.send({ printLogs: false });
-      return await pending.wait();
-    } catch (err) {
-      if (err && err instanceof Error && "logs" in err) {
-        printSendTransactionError(err as SendTransactionError);
-      }
-      throw err;
-    }
-  } else {
-    throw new Error("tx is null");
-  }
-};
-
+/**
+ * Processes a transaction, expecting rejection or fulfillment.
+ *
+ * @param tx
+ * @param msg
+ * @param cb
+ * @returns
+ */
 export const expectTX = (
-  tx:
-    | TransactionEnvelope
-    | null
-    | Promise<TransactionEnvelope | null>
-    | PendingTransaction
-    | Promise<PendingTransaction>,
+  tx: PromiseOrValue<TransactionLike | null>,
   msg?: string,
   cb?: (receipt: TransactionReceipt) => Promise<void>
 ): Chai.PromisedAssertion => {
@@ -47,12 +28,23 @@ export const expectTX = (
   };
 
   if (tx && "then" in tx) {
-    return expect(tx.then(processTX).then(handleReceipt), msg).eventually;
-  }
-  if (tx instanceof PendingTransaction) {
-    return expect(tx.wait().then(handleReceipt), msg).eventually;
+    return expect(
+      tx
+        .then(async (v) => {
+          if (v === null) {
+            throw new Error("transaction is null");
+          }
+          return await confirmTransactionLike(v);
+        })
+        .then(handleReceipt),
+      msg
+    ).eventually;
+  } else if (tx) {
+    return expect(confirmTransactionLike(tx).then(handleReceipt), msg)
+      .eventually;
   } else {
-    return expect(processTX(tx).then(handleReceipt), msg).eventually;
+    return expect(Promise.reject(new Error("transaction is null")), msg)
+      .eventually;
   }
 };
 

packages/eslint-config-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saberhq/eslint-config-react",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "description": "Saber base React ESLint config",
   "keywords": [
     "eslint",
@@ -28,7 +28,7 @@
     "eslint": ">=7"
   },
   "dependencies": {
-    "@saberhq/eslint-config": "^1.13.16",
+    "@saberhq/eslint-config": "^1.13.17",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.5.0"

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saberhq/eslint-config",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "description": "Saber base ESLint config",
   "keywords": [
     "eslint",
@@ -27,8 +27,8 @@
     "eslint": ">=7"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
+    "@typescript-eslint/eslint-plugin": "^5.26.0",
+    "@typescript-eslint/parser": "^5.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-import": "^2.26.0",

packages/solana-contrib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saberhq/solana-contrib",
-  "version": "1.13.16",
+  "version": "1.13.17",
   "description": "Common types and libraries for Solana",
   "author": "Ian Macalinao <ian@saber.so>",
   "homepage": "https://github.com/saber-hq/saber-common#readme",
@@ -37,8 +37,8 @@
     "@types/bn.js": "^5.1.0",
     "@types/jest": "^27.5.1",
     "@types/node": "^17.0.35",
-    "bn.js": "^5.2.0",
-    "typescript": "^4.6.4"
+    "bn.js": "^5.2.1",
+    "typescript": "^4.7.2"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.42",

packages/solana-contrib/src/interfaces.ts

@@ -12,7 +12,7 @@ import type {
   Transaction,
 } from "@solana/web3.js";
 
-import type { PendingTransaction } from ".";
+import type { BroadcastOptions, PendingTransaction } from ".";
 
 /**
  * Wallet interface for objects that can be used to sign provider transactions.
@@ -103,7 +103,7 @@ export interface Broadcaster {
    */
   broadcast: (
     tx: Transaction,
-    opts?: ConfirmOptions
+    opts?: BroadcastOptions
   ) => Promise<PendingTransaction>;
 
   /**
@@ -121,12 +121,34 @@ export interface Broadcaster {
   ): Promise<RpcResponseAndContext<SimulatedTransactionResponse>>;
 }
 
+/**
+ * Sign and broadcast options.
+ */
+export type SignAndBroadcastOptions = BroadcastOptions & {
+  /**
+   * Additional signers
+   */
+  signers?: Signer[];
+};
+
 /**
  * An interface that can sign transactions.
  */
 export interface TransactionSigner {
   publicKey: PublicKey;
 
+  /**
+   * Signs and broadcasts a transaction.
+   *
+   * @param transaction
+   * @param broadcaster
+   * @param options
+   */
+  signAndBroadcastTransaction(
+    transaction: Transaction,
+    opts?: SignAndBroadcastOptions
+  ): Promise<PendingTransaction>;
+
   /**
    * Signs the given transaction, paid for and signed by the provider's wallet.
    *
@@ -204,6 +226,18 @@ export interface Provider extends ReadonlyProvider {
     opts?: ConfirmOptions
   ) => Promise<PendingTransaction[]>;
 
+  /**
+   * Signs and broadcasts a transaction.
+   *
+   * @param transaction
+   * @param broadcaster
+   * @param options
+   */
+  signAndBroadcastTransaction(
+    transaction: Transaction,
+    opts?: SignAndBroadcastOptions
+  ): Promise<PendingTransaction>;
+
   /**
    * Simulates the given transaction, returning emitted logs from execution.
    *