@stellar/typescript-wallet-sdk 1.0.0-beta.0 → 1.0.0

package/test/wallet.test.ts

@@ -1,14 +1,23 @@
-import StellarSdk, { Keypair } from "stellar-sdk";
+import StellarSdk, { Keypair, Memo, MemoText } from "stellar-sdk";
 import http from "http";
 import sinon from "sinon";
+import axios, { AxiosInstance } from "axios";
 
 import sdk from "../src";
-import { AssetNotSupportedError, ServerRequestFailedError } from "../src/walletSdk/Exceptions";
+import {
+  AssetNotSupportedError,
+  ServerRequestFailedError,
+} from "../src/walletSdk/Exceptions";
 import { Watcher } from "../src/walletSdk/Watcher";
-import { TransactionStatus } from "../src/walletSdk/Types";
+import { TransactionStatus, AnchorTransaction } from "../src/walletSdk/Types";
 
 import { TransactionsResponse } from "../test/fixtures/TransactionsResponse";
-import { WalletSigner } from "../src/walletSdk/Auth/WalletSigner";
+import {
+  WalletSigner,
+  DefaultSigner,
+} from "../src/walletSdk/Auth/WalletSigner";
+import { SigningKeypair } from "../src/walletSdk/Horizon/Account";
+import { Sep24 } from "../src/walletSdk/Anchor/Sep24";
 
 const originalSetTimeout = global.setTimeout;
 function sleep(time: number) {
@@ -27,14 +36,22 @@ describe("Wallet", () => {
     let appConfig = new walletSdk.ApplicationConfiguration();
     let wal = new walletSdk.Wallet({
       stellarConfiguration: walletSdk.StellarConfiguration.TestNet(),
-      applicationConfiguration: appConfig
+      applicationConfiguration: appConfig,
     });
-
-    let client = wal.getClient();
-
-    // custom client
-    client = wal.getClient({
-      httpAgent: new http.Agent({ keepAlive: false }),
+  });
+  it("should be able to customize a client", async () => {
+    const customClient: AxiosInstance = axios.create({
+      baseURL: "https://some-url.com/api",
+      timeout: 1000,
+      headers: { "X-Custom-Header": "foobar" },
+    });
+    let appConfig = new walletSdk.ApplicationConfiguration(
+      DefaultSigner,
+      customClient,
+    );
+    let wal = new walletSdk.Wallet({
+      stellarConfiguration: walletSdk.StellarConfiguration.TestNet(),
+      applicationConfiguration: appConfig,
     });
   });
 });
@@ -53,18 +70,18 @@ describe("Anchor", () => {
   beforeEach(() => {
     const Wal = walletSdk.Wallet.TestNet();
     anchor = Wal.anchor({ homeDomain: "testanchor.stellar.org" });
-    accountKp = Keypair.fromSecret(
-      "SDXC3OHSJZEQIXKEWFDNEZEQ7SW5DWBPW7RKUWI36ILY3QZZ6VER7TXV"
+    accountKp = SigningKeypair.fromSecret(
+      "SDXC3OHSJZEQIXKEWFDNEZEQ7SW5DWBPW7RKUWI36ILY3QZZ6VER7TXV",
     );
   });
   it("should give TOML info", async () => {
-    const resp = await anchor.getInfo();
+    const resp = await anchor.sep1();
 
     expect(resp.webAuthEndpoint).toBe("https://testanchor.stellar.org/auth");
     expect(resp.currencies.length).toBe(2);
   });
   it("should be able to authenticate", async () => {
-    const auth = await anchor.auth();
+    const auth = await anchor.sep10();
 
     authToken = await auth.authenticate({ accountKp });
     expect(authToken).toBeTruthy();
@@ -72,24 +89,28 @@ describe("Anchor", () => {
   });
 
   it("should be able to authenticate with client domain", async () => {
-    const auth = await anchor.auth();
+    const auth = await anchor.sep10();
     let signedByClient = false;
     let signedByDomain = false;
 
     const walletSigner: WalletSigner = {
       signWithClientAccount: ({ transaction, accountKp }) => {
-        transaction.sign(accountKp);
+        transaction.sign(accountKp.keypair);
         signedByClient = true;
         return transaction;
       },
-      signWithDomainAccount: ({ transactionXDR, networkPassphrase, accountKp }) => {
+      signWithDomainAccount: async ({
+        transactionXDR,
+        networkPassphrase,
+        accountKp,
+      }) => {
         // dummy secret key for signing
         const clientDomainKp = Keypair.fromSecret(
-          "SC7PKBRGRI5X4XP4QICBZ2NL67VUJJVKFKXDTGSPI3SQYZGC4NZWONIH"
+          "SC7PKBRGRI5X4XP4QICBZ2NL67VUJJVKFKXDTGSPI3SQYZGC4NZWONIH",
         );
         const transaction = StellarSdk.TransactionBuilder.fromXDR(
           transactionXDR,
-          networkPassphrase
+          networkPassphrase,
         );
         transaction.sign(clientDomainKp);
         signedByDomain = true;
@@ -100,15 +121,15 @@ describe("Anchor", () => {
     // because using dummy sk and not real demo wallet sk, lets just check that signing is called
     const challengeResponse = await auth.challenge({
       accountKp,
-      clientDomain: "demo-wallet-server.stellar.org"
+      clientDomain: "demo-wallet-server.stellar.org",
     });
-    const txn = auth.sign({ accountKp, challengeResponse, walletSigner });
+    const txn = await auth.sign({ accountKp, challengeResponse, walletSigner });
     expect(txn).toBeTruthy();
     expect(signedByClient).toBe(true);
     expect(signedByDomain).toBe(true);
   });
   it("should get anchor services info", async () => {
-    const serviceInfo = await anchor.getServicesInfo();
+    const serviceInfo = await anchor.sep24().getServicesInfo();
 
     expect(serviceInfo.deposit).toBeTruthy();
     expect(serviceInfo.withdraw).toBeTruthy();
@@ -116,11 +137,28 @@ describe("Anchor", () => {
 
   it("should give interactive deposit url", async () => {
     const assetCode = "SRT";
-    const resp = await anchor.interactive().deposit({
-      accountAddress: accountKp.publicKey(),
+    const resp = await anchor.sep24().deposit({
+      destinationAccount: accountKp.publicKey,
+      assetCode,
+      authToken,
+      lang: "en-US",
+      extraFields: {
+        wallet_name: "Test Wallet",
+        wallet_url: "https://stellar.org/",
+      },
+    });
+
+    expect(resp.url).toBeTruthy();
+    expect(resp.id).toBeTruthy();
+  });
+
+  it("should give interactive deposit url without giving account and giving memo", async () => {
+    const assetCode = "SRT";
+    const resp = await anchor.sep24().deposit({
       assetCode,
       authToken,
       lang: "en-US",
+      destinationMemo: new Memo(MemoText, "test-memo"),
       extraFields: {
         wallet_name: "Test Wallet",
         wallet_url: "https://stellar.org/",
@@ -133,8 +171,8 @@ describe("Anchor", () => {
 
   it("should give interactive withdraw url", async () => {
     const assetCode = "SRT";
-    const resp = await anchor.interactive().withdraw({
-      accountAddress: accountKp.publicKey(),
+    const resp = await anchor.sep24().withdraw({
+      withdrawalAccount: accountKp.publicKey,
       assetCode,
       authToken,
       lang: "en-US",
@@ -152,14 +190,14 @@ describe("Anchor", () => {
     const assetCode = "SRT";
 
     // creates new 'incomplete' deposit transaction
-    const { id: transactionId } = await anchor.interactive().deposit({
-      accountAddress: accountKp.publicKey(),
+    const { id: transactionId } = await anchor.sep24().deposit({
+      accountAddress: accountKp.publicKey,
       assetCode,
       authToken,
     });
 
     // fetches transaction that has just been created
-    const transaction = await anchor.getTransactionBy({
+    const transaction = await anchor.sep24().getTransactionBy({
       authToken,
       id: transactionId,
     });
@@ -178,7 +216,7 @@ describe("Anchor", () => {
   it("should error fetching non-existing transaction by id", async () => {
     await expect(async () => {
       const nonExistingTransactionId = "da8575e9-edc6-4f99-98cf-2b302f203cc7";
-      await anchor.getTransactionBy({
+      await anchor.sep24().getTransactionBy({
         authToken,
         id: nonExistingTransactionId,
       });
@@ -186,7 +224,7 @@ describe("Anchor", () => {
   });
 
   it("should fetch 5 existing transactions by token code", async () => {
-    const transactions = await anchor.getTransactionsForAsset({
+    const transactions = await anchor.sep24().getTransactionsForAsset({
       authToken,
       assetCode: "SRT",
       limit: 5,
@@ -202,7 +240,7 @@ describe("Anchor", () => {
   });
 
   it("should fetch 3 existing deposit transactions by token code", async () => {
-    const transactions = await anchor.getTransactionsForAsset({
+    const transactions = await anchor.sep24().getTransactionsForAsset({
       authToken,
       assetCode: "SRT",
       limit: 3,
@@ -218,7 +256,7 @@ describe("Anchor", () => {
   });
 
   it("should fetch 2 existing withdrawal transactions by token code", async () => {
-    const transactions = await anchor.getTransactionsForAsset({
+    const transactions = await anchor.sep24().getTransactionsForAsset({
       authToken,
       assetCode: "SRT",
       limit: 2,
@@ -235,7 +273,7 @@ describe("Anchor", () => {
 
   it("should error fetching transactions with invalid pading id", async () => {
     await expect(async () => {
-      await anchor.getTransactionsForAsset({
+      await anchor.sep24().getTransactionsForAsset({
         authToken,
         assetCode: "SRT",
         lang: "en-US",
@@ -244,64 +282,13 @@ describe("Anchor", () => {
     }).rejects.toThrowError(ServerRequestFailedError);
   });
 
-  it("should fetch only finished transactions", async () => {
-    // mock TOML response to include the "SRT" currency
-    jest
-      .spyOn(anchor, "getInfo")
-      .mockResolvedValue({
-        networkPassphrase: 'Test SDF Network ; September 2015',
-        transferServerSep24: 'https://testanchor.stellar.org/sep24',
-        webAuthEndpoint: 'https://testanchor.stellar.org/auth',
-        accounts: [
-          'GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE',
-          'GDRND2IUXVMHZ4XTB2RZ4AJ3AOLON3WTAOC23XEASB56NHDFW3ED57TW'
-        ],
-        documentation: {
-          orgName: 'Stellar Development Foundation',
-          orgUrl: 'https://stellar.org',
-          orgGithub: 'stellar',
-        },
-        principals: [],
-        currencies: [{ code: "SRT" }, { code: "USDC" }],
-        validators: []
-      });
-
-    // mock transactions response so we have a few completed/refunded
-    jest
-      .spyOn(anchor, "getTransactionsForAsset")
-      .mockResolvedValue(TransactionsResponse);
-
-    const transactions = await anchor.getHistory({
-      authToken,
-      assetCode: "SRT",
-    });
-
-    expect(transactions.length).toBeGreaterThan(0);
-
-    transactions.forEach(({ status }) => {
-      expect([
-        TransactionStatus.completed, 
-        TransactionStatus.refunded
-      ].includes(status)).toBeTruthy();
-    });
-  });
-
-  it("should error fetching history for unsupported asset", async () => {
-    await expect(async () => {
-      await anchor.getHistory({
-        authToken,
-        assetCode: "ABC",
-      });
-    }).rejects.toThrowError(AssetNotSupportedError);
-  });
-
   describe("watchAllTransactions", () => {
     let clock: sinon.SinonFakeTimers;
     let watcher: Watcher;
 
     beforeEach(async () => {
       clock = sinon.useFakeTimers(0);
-      watcher = anchor.watcher();
+      watcher = anchor.sep24().watcher();
     });
 
     afterEach(() => {
@@ -319,7 +306,7 @@ describe("Anchor", () => {
 
       // mock default transactions response
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(TransactionsResponse);
 
       // start watching
@@ -357,7 +344,7 @@ describe("Anchor", () => {
 
       // mock default transactions response
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(TransactionsResponse);
 
       // start watching
@@ -401,7 +388,7 @@ describe("Anchor", () => {
 
       // mock default transactions response
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(TransactionsResponse);
 
       // start watching
@@ -436,7 +423,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -465,7 +452,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -489,7 +476,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -514,7 +501,7 @@ describe("Anchor", () => {
 
       // mock default transactions response
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(TransactionsResponse);
 
       // start watching
@@ -549,7 +536,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -578,7 +565,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -605,7 +592,7 @@ describe("Anchor", () => {
 
       // update mock with new transaction status
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue(updatedTransactions);
 
       clock.next();
@@ -626,7 +613,9 @@ describe("Anchor", () => {
       });
 
       // mock an empty transactions array
-      jest.spyOn(anchor, "getTransactionsForAsset").mockResolvedValue([]);
+      jest
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
+        .mockResolvedValue([]);
 
       // start watching
       const { stop } = watcher.watchAllTransactions({
@@ -648,10 +637,10 @@ describe("Anchor", () => {
       expect(onMessage.callCount).toBe(0);
       expect(onError.callCount).toBe(0);
 
-      const completedTransaction = {
+      const completedTransaction: AnchorTransaction = {
         id: "uyt1576b-ac28-4c02-a521-ddbfd9ae7oiu",
         kind: "deposit",
-        status: "completed",
+        status: TransactionStatus.completed,
         status_eta: null,
         amount_in: "150.45",
         amount_out: "149.45",
@@ -663,7 +652,6 @@ describe("Anchor", () => {
         external_transaction_id: null,
         more_info_url:
           "https://testanchor.stellar.org/sep24/transaction/more_info?id=uyt1576b-ac28-4c02-a521-ddbfd9ae7oiu",
-        refunded: false,
         message: "deposit completed!",
         claimable_balance_id: null,
         to: "GCZSYKPDWAKPGR7GYFBOIQB3TH352X7ELZL27WSJET5PDVFORDMGYTB5",
@@ -674,7 +662,7 @@ describe("Anchor", () => {
 
       // add a new success message
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([completedTransaction]);
 
       clock.next();
@@ -686,7 +674,7 @@ describe("Anchor", () => {
 
       // getting the same thing again should change nothing
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([completedTransaction]);
 
       clock.next();
@@ -696,10 +684,10 @@ describe("Anchor", () => {
       expect(onMessage.callCount).toBe(1);
       expect(onError.callCount).toBe(0);
 
-      const refundedTransaction = {
+      const refundedTransaction: AnchorTransaction = {
         id: "def5d166-5a5e-4d5c-ba5d-271c32cd8abc",
         kind: "withdrawal",
-        status: "refunded",
+        status: TransactionStatus.refunded,
         status_eta: null,
         amount_in: "95.35",
         amount_in_asset:
@@ -716,7 +704,6 @@ describe("Anchor", () => {
         external_transaction_id: null,
         more_info_url:
           "https://testanchor.stellar.org/sep24/transaction/more_info?id=def5d166-5a5e-4d5c-ba5d-271c32cd8abc",
-        refunded: true,
         refunds: {
           amount_refunded: "95.35",
           amount_fee: "5",
@@ -728,8 +715,7 @@ describe("Anchor", () => {
               fee: "5",
             },
             {
-              id:
-                "b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020",
+              id: "b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020",
               id_type: "stellar",
               amount: "55.35",
               fee: "0",
@@ -747,7 +733,7 @@ describe("Anchor", () => {
 
       // add a new success message
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([completedTransaction, refundedTransaction]);
 
       clock.next();
@@ -759,7 +745,7 @@ describe("Anchor", () => {
 
       // getting the same thing again should change nothing
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([completedTransaction, refundedTransaction]);
 
       clock.next();
@@ -769,10 +755,10 @@ describe("Anchor", () => {
       expect(onMessage.callCount).toBe(2);
       expect(onError.callCount).toBe(0);
 
-      const expiredTransaction = {
+      const expiredTransaction: AnchorTransaction = {
         id: "hytcf7c4-927d-4b7a-8a1f-d7188ebddu8i",
         kind: "withdrawal",
-        status: "expired",
+        status: TransactionStatus.expired,
         status_eta: null,
         amount_in: null,
         amount_out: null,
@@ -783,7 +769,6 @@ describe("Anchor", () => {
         external_transaction_id: null,
         more_info_url:
           "https://testanchor.stellar.org/sep24/transaction/more_info?id=hytcf7c4-927d-4b7a-8a1f-d7188ebddu8i",
-        refunded: false,
         message: "transaction has expired",
         to: null,
         from: "GCZSYKPDWAKPGR7GYFBOIQB3TH352X7ELZL27WSJET5PDVFORDMGYTB5",
@@ -794,7 +779,7 @@ describe("Anchor", () => {
 
       // add a new success message
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([
           completedTransaction,
           refundedTransaction,
@@ -810,7 +795,7 @@ describe("Anchor", () => {
 
       // getting the same thing again should change nothing
       jest
-        .spyOn(anchor, "getTransactionsForAsset")
+        .spyOn(Sep24.prototype, "getTransactionsForAsset")
         .mockResolvedValue([
           completedTransaction,
           refundedTransaction,
@@ -842,7 +827,8 @@ describe("Anchor", () => {
 
     beforeEach(async () => {
       clock = sinon.useFakeTimers(0);
-      watcher = anchor.watcher();
+      watcher = anchor.sep24().watcher();
+      jest.resetAllMocks();
     });
 
     afterEach(() => {
@@ -864,12 +850,12 @@ describe("Anchor", () => {
 
       const successfulTransaction = makeTransaction(
         0,
-        TransactionStatus.completed
+        TransactionStatus.completed,
       );
 
       // queue up a success
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(successfulTransaction);
 
       // start watching
@@ -901,12 +887,12 @@ describe("Anchor", () => {
 
       const refundedTransaction = makeTransaction(
         0,
-        TransactionStatus.refunded
+        TransactionStatus.refunded,
       );
 
       // queue up a success
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(refundedTransaction);
 
       // start watching
@@ -940,7 +926,7 @@ describe("Anchor", () => {
 
       // queue up a success
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(expiredTransaction);
 
       // start watching
@@ -986,12 +972,12 @@ describe("Anchor", () => {
 
       const incompleteTransaction = makeTransaction(
         0,
-        TransactionStatus.incomplete
+        TransactionStatus.incomplete,
       );
 
       // queue up an incomplete transaction response
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(incompleteTransaction);
 
       // start watching
@@ -1020,12 +1006,12 @@ describe("Anchor", () => {
 
       const pendingTransaction = makeTransaction(
         0,
-        TransactionStatus.pending_user_transfer_start
+        TransactionStatus.pending_user_transfer_start,
       );
 
       // queue up a pending transaction response
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(pendingTransaction);
 
       // start watching
@@ -1071,7 +1057,7 @@ describe("Anchor", () => {
 
       // queue up an error transaction response
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(errorTransaction);
 
       // start watching
@@ -1100,12 +1086,12 @@ describe("Anchor", () => {
 
       const noMarketTransaction = makeTransaction(
         0,
-        TransactionStatus.no_market
+        TransactionStatus.no_market,
       );
 
       // queue up a "no market" transaction response
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValue(noMarketTransaction);
 
       // start watching
@@ -1148,35 +1134,35 @@ describe("Anchor", () => {
 
       // queue up several pending status updates
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(makeTransaction(0, TransactionStatus.incomplete))
         .mockResolvedValueOnce(
-          makeTransaction(1, TransactionStatus.pending_user)
+          makeTransaction(1, TransactionStatus.pending_user),
         )
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         )
         .mockResolvedValueOnce(
-          makeTransaction(4, TransactionStatus.pending_stellar)
+          makeTransaction(4, TransactionStatus.pending_stellar),
         )
         .mockResolvedValueOnce(
-          makeTransaction(5, TransactionStatus.pending_trust)
+          makeTransaction(5, TransactionStatus.pending_trust),
         )
         .mockResolvedValueOnce(
-          makeTransaction(6, TransactionStatus.pending_user_transfer_start)
+          makeTransaction(6, TransactionStatus.pending_user_transfer_start),
         )
         .mockResolvedValueOnce(
-          makeTransaction(7, TransactionStatus.pending_user_transfer_complete)
+          makeTransaction(7, TransactionStatus.pending_user_transfer_complete),
         )
         .mockResolvedValueOnce(makeTransaction(8, TransactionStatus.completed))
         .mockResolvedValueOnce(
-          makeTransaction(9, TransactionStatus.pending_anchor)
+          makeTransaction(9, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(10, TransactionStatus.pending_external)
+          makeTransaction(10, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1260,22 +1246,22 @@ describe("Anchor", () => {
 
       // queue up several pending status updates
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(makeTransaction(0, TransactionStatus.incomplete))
         .mockResolvedValueOnce(
-          makeTransaction(1, TransactionStatus.pending_user)
+          makeTransaction(1, TransactionStatus.pending_user),
         )
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         )
         .mockResolvedValueOnce(
-          makeTransaction(4, TransactionStatus.pending_stellar)
+          makeTransaction(4, TransactionStatus.pending_stellar),
         )
         .mockResolvedValueOnce(
-          makeTransaction(5, TransactionStatus.pending_trust)
+          makeTransaction(5, TransactionStatus.pending_trust),
         );
 
       // start watching
@@ -1342,16 +1328,16 @@ describe("Anchor", () => {
 
       // queue up transactions
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(
-          makeTransaction(0, TransactionStatus.pending_user_transfer_complete)
+          makeTransaction(0, TransactionStatus.pending_user_transfer_complete),
         )
         .mockResolvedValueOnce(makeTransaction(1, TransactionStatus.completed))
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1400,7 +1386,7 @@ describe("Anchor", () => {
     });
 
     test("One pending, one refunded, no more after that", async () => {
-      const onMessage = sinon.spy(() => {
+      const onMessage = sinon.spy((e) => {
         expect(onMessage.callCount).toBeLessThanOrEqual(1);
       });
 
@@ -1414,16 +1400,16 @@ describe("Anchor", () => {
 
       // queue up transactions
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(
-          makeTransaction(0, TransactionStatus.pending_user_transfer_complete)
+          makeTransaction(0, TransactionStatus.pending_user_transfer_complete),
         )
         .mockResolvedValueOnce(makeTransaction(1, TransactionStatus.refunded))
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1487,16 +1473,16 @@ describe("Anchor", () => {
 
       // queue up transactions
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(
-          makeTransaction(0, TransactionStatus.pending_user_transfer_start)
+          makeTransaction(0, TransactionStatus.pending_user_transfer_start),
         )
         .mockResolvedValueOnce(makeTransaction(1, TransactionStatus.error))
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1560,16 +1546,16 @@ describe("Anchor", () => {
 
       // queue up transactions
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(
-          makeTransaction(0, TransactionStatus.pending_user_transfer_start)
+          makeTransaction(0, TransactionStatus.pending_user_transfer_start),
         )
         .mockResolvedValueOnce(makeTransaction(1, TransactionStatus.no_market))
         .mockResolvedValueOnce(
-          makeTransaction(2, TransactionStatus.pending_anchor)
+          makeTransaction(2, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_external)
+          makeTransaction(3, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1633,19 +1619,19 @@ describe("Anchor", () => {
 
       // queue up transactions
       jest
-        .spyOn(anchor, "getTransactionBy")
+        .spyOn(Sep24.prototype, "getTransactionBy")
         .mockResolvedValueOnce(
-          makeTransaction(0, TransactionStatus.pending_user_transfer_start)
+          makeTransaction(0, TransactionStatus.pending_user_transfer_start),
         )
         .mockResolvedValueOnce(
-          makeTransaction(1, TransactionStatus.pending_user_transfer_complete)
+          makeTransaction(1, TransactionStatus.pending_user_transfer_complete),
         )
         .mockResolvedValueOnce(makeTransaction(2, TransactionStatus.error))
         .mockResolvedValueOnce(
-          makeTransaction(3, TransactionStatus.pending_anchor)
+          makeTransaction(3, TransactionStatus.pending_anchor),
         )
         .mockResolvedValueOnce(
-          makeTransaction(4, TransactionStatus.pending_external)
+          makeTransaction(4, TransactionStatus.pending_external),
         );
 
       // start watching
@@ -1706,13 +1692,12 @@ describe("Anchor", () => {
 describe("Http client", () => {
   it("should work with http", async () => {
     const accountKp = Keypair.fromSecret(
-      "SDXC3OHSJZEQIXKEWFDNEZEQ7SW5DWBPW7RKUWI36ILY3QZZ6VER7TXV"
+      "SDXC3OHSJZEQIXKEWFDNEZEQ7SW5DWBPW7RKUWI36ILY3QZZ6VER7TXV",
     );
-    const wal = walletSdk.Wallet.TestNet();
-    const client = wal.getClient();
+    const client = walletSdk.DefaultClient;
 
     const resp = await client.get(
-      `http://testanchor.stellar.org/auth?account=${accountKp.publicKey()}`
+      `http://testanchor.stellar.org/auth?account=${accountKp.publicKey()}`,
     );
     expect(resp.data.transaction).toBeTruthy();
   });