coral-xyz · paul-schaaf · Apr 11, 2022 · Mar 29, 2022 · Mar 29, 2022 · Mar 31, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 * avm: `amv install` switches to the newly installed version after installation finishes ([#1670](https://github.com/project-serum/anchor/pull/1670)).
 * spl: Re-export the `spl_token` crate ([#1665](https://github.com/project-serum/anchor/pull/1665)).
 * lang, cli, spl: Update solana toolchain to v1.9.13 ([#1653](https://github.com/project-serum/anchor/pull/1653)).
+* ts: Make `Provider` an interface and adjust its signatures and add `AnchorProvider` implementor class. ([#1707](https://github.com/project-serum/anchor/pull/1707)).
 
 ## [0.23.0] - 2022-03-20
 

diff --git a/examples/tutorial/basic-0/client.js b/examples/tutorial/basic-0/client.js
@@ -5,7 +5,7 @@
 const anchor = require("@project-serum/anchor");
 
 // Configure the local cluster.
-anchor.setProvider(anchor.Provider.local());
+anchor.setProvider(anchor.AnchorProvider.local());
 
 async function main() {
   // #region main

diff --git a/examples/tutorial/basic-0/tests/basic-0.js b/examples/tutorial/basic-0/tests/basic-0.js
@@ -2,7 +2,7 @@ const anchor = require("@project-serum/anchor");
 
 describe("basic-0", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.local());
+  anchor.setProvider(anchor.AnchorProvider.local());
 
   it("Uses the workspace to invoke the initialize instruction", async () => {
     // #region code

diff --git a/examples/tutorial/basic-1/tests/basic-1.js b/examples/tutorial/basic-1/tests/basic-1.js
@@ -4,7 +4,7 @@ const { SystemProgram } = anchor.web3;
 
 describe("basic-1", () => {
   // Use a local provider.
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);

diff --git a/examples/tutorial/basic-2/tests/basic-2.js b/examples/tutorial/basic-2/tests/basic-2.js
@@ -3,7 +3,7 @@ const anchor = require("@project-serum/anchor");
 const { SystemProgram } = anchor.web3;
 
 describe("basic-2", () => {
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);

diff --git a/examples/tutorial/basic-3/tests/basic-3.js b/examples/tutorial/basic-3/tests/basic-3.js
@@ -3,7 +3,7 @@ const anchor = require("@project-serum/anchor");
 const { SystemProgram } = anchor.web3;
 
 describe("basic-3", () => {
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);

diff --git a/examples/tutorial/basic-4/tests/basic-4.js b/examples/tutorial/basic-4/tests/basic-4.js
@@ -2,7 +2,7 @@ const assert = require("assert");
 const anchor = require("@project-serum/anchor");
 
 describe("basic-4", () => {
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);

diff --git a/tests/auction-house b/tests/auction-house
diff --git a/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts b/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts
@@ -6,7 +6,7 @@ import { assert } from "chai";
 import { BpfUpgradeableState } from "../target/types/bpf_upgradeable_state";
 
 describe("bpf_upgradeable_state", () => {
-  const provider = anchor.Provider.env();
+  const provider = anchor.AnchorProvider.env();
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);
 

diff --git a/tests/cashiers-check/tests/cashiers-check.js b/tests/cashiers-check/tests/cashiers-check.js
@@ -5,7 +5,11 @@ const { TOKEN_PROGRAM_ID } = require("@solana/spl-token");
 
 describe("cashiers-check", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  const provider = anchor.AnchorProvider.env();
+  // hack so we don't have to update serum-common library
+  // to the new AnchorProvider class and Provider interface
+  provider.send = provider.sendAndConfirm;
+  anchor.setProvider(provider);
 
   const program = anchor.workspace.CashiersCheck;
 

diff --git a/tests/cfo/deps/stake b/tests/cfo/deps/stake
diff --git a/tests/cfo/deps/swap b/tests/cfo/deps/swap
diff --git a/tests/cfo/scripts/fees.js b/tests/cfo/scripts/fees.js
@@ -6,7 +6,7 @@ const anchor = require("@project-serum/anchor");
 const { Market, OpenOrders } = require("@project-serum/serum");
 const Account = anchor.web3.Account;
 const Program = anchor.Program;
-const provider = anchor.Provider.local();
+const provider = anchor.AnchorProvider.local();
 const secret = JSON.parse(fs.readFileSync("./scripts/market-maker.json"));
 const MARKET_MAKER = new Account(secret);
 const PublicKey = anchor.web3.PublicKey;

diff --git a/tests/cfo/scripts/list-market.js b/tests/cfo/scripts/list-market.js
@@ -5,7 +5,10 @@
 const utils = require("../tests/utils");
 const fs = require("fs");
 const anchor = require("@project-serum/anchor");
-const provider = anchor.Provider.local();
+const provider = anchor.AnchorProvider.local();
+// hack so we don't have to update serum-common library
+// to the new AnchorProvider class and Provider interface
+provider.send = provider.sendAndConfirm;
 
 async function main() {
   ORDERBOOK_ENV = await utils.initMarket({

diff --git a/tests/cfo/scripts/trade-bot.js b/tests/cfo/scripts/trade-bot.js
@@ -9,7 +9,7 @@ const { runTradeBot } = require("../tests/utils");
 
 async function main() {
   const market = new PublicKey(process.argv[2]);
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
   runTradeBot(market, provider);
 }
 

diff --git a/tests/cfo/tests/cfo.js b/tests/cfo/tests/cfo.js
@@ -23,9 +23,13 @@ const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey(
 const FEES = "6160355581";
 
 describe("cfo", () => {
-  anchor.setProvider(anchor.Provider.env());
+  const provider = anchor.AnchorProvider.env();
+  anchor.setProvider(provider);
 
   const program = anchor.workspace.Cfo;
+  // hack so we don't have to update serum-common library
+  // to the new AnchorProvider class and Provider interface
+  program.provider.send = provider.sendAndConfirm;
   const sweepAuthority = program.provider.wallet.publicKey;
   let officer, srmVault, usdcVault, bVault, stake, treasury;
   let officerBump, srmBump, usdcBump, bBump, stakeBump, treasuryBump;

diff --git a/tests/cfo/tests/utils/index.js b/tests/cfo/tests/utils/index.js
@@ -125,7 +125,7 @@ async function fundAccount({ provider, mints }) {
   };
 
   // Transfer lamports to market maker.
-  await provider.send(
+  await provider.sendAndConfirm(
     (() => {
       const tx = new Transaction();
       tx.add(
@@ -155,7 +155,7 @@ async function fundAccount({ provider, mints }) {
       MARKET_MAKER.publicKey
     );
 
-    await provider.send(
+    await provider.sendAndConfirm(
       (() => {
         const tx = new Transaction();
         tx.add(
@@ -220,7 +220,10 @@ async function setupMarket({
         feeDiscountPubkey: null,
         selfTradeBehavior: "abortTransaction",
       });
-    await provider.send(transaction, signers.concat(marketMaker.account));
+    await provider.sendAndConfirm(
+      transaction,
+      signers.concat(marketMaker.account)
+    );
   }
 
   for (let k = 0; k < bids.length; k += 1) {
@@ -239,7 +242,10 @@ async function setupMarket({
         feeDiscountPubkey: null,
         selfTradeBehavior: "abortTransaction",
       });
-    await provider.send(transaction, signers.concat(marketMaker.account));
+    await provider.sendAndConfirm(
+      transaction,
+      signers.concat(marketMaker.account)
+    );
   }
 
   return [MARKET_A_USDC, vaultOwner];
@@ -527,7 +533,7 @@ async function runTradeBot(market, provider, iterations = undefined) {
         feeDiscountPubkey: null,
         selfTradeBehavior: "abortTransaction",
       });
-    let txSig = await provider.send(tx_ask, sigs_ask.concat(maker));
+    let txSig = await provider.sendAndConfirm(tx_ask, sigs_ask.concat(maker));
     console.log("Ask", txSig);
 
     // Take.
@@ -545,7 +551,7 @@ async function runTradeBot(market, provider, iterations = undefined) {
         feeDiscountPubkey: null,
         selfTradeBehavior: "abortTransaction",
       });
-    txSig = await provider.send(tx_bid, sigs_bid.concat(taker));
+    txSig = await provider.sendAndConfirm(tx_bid, sigs_bid.concat(taker));
     console.log("Bid", txSig);
 
     await sleep(1000);

diff --git a/tests/cfo/tests/utils/stake.js b/tests/cfo/tests/utils/stake.js
@@ -5,7 +5,10 @@ const utils = require("../../deps/stake/tests/utils");
 
 const lockup = anchor.workspace.Lockup;
 const registry = anchor.workspace.Registry;
-const provider = anchor.Provider.env();
+const provider = anchor.AnchorProvider.env();
+// hack so we don't have to update serum-common library
+// to the new AnchorProvider class and Provider interface
+provider.send = provider.sendAndConfirm;
 
 let lockupAddress = null;
 let mint = null;

diff --git a/tests/chat/tests/chat.js b/tests/chat/tests/chat.js
@@ -4,7 +4,7 @@ const { PublicKey } = anchor.web3;
 
 describe("chat", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   // Program client handle.
   const program = anchor.workspace.Chat;

diff --git a/tests/composite/tests/composite.js b/tests/composite/tests/composite.js
@@ -2,7 +2,7 @@ const { assert } = require("chai");
 const anchor = require("@project-serum/anchor");
 
 describe("composite", () => {
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);

diff --git a/tests/cpi-returns/tests/cpi-return.ts b/tests/cpi-returns/tests/cpi-return.ts
@@ -8,7 +8,7 @@ import { Caller } from "../target/types/caller";
 const { SystemProgram } = anchor.web3;
 
 describe("CPI return", () => {
-  const provider = anchor.Provider.env();
+  const provider = anchor.AnchorProvider.env();
   anchor.setProvider(provider);
 
   const callerProgram = anchor.workspace.Caller as Program<Caller>;

diff --git a/tests/custom-coder/tests/custom-coder.ts b/tests/custom-coder/tests/custom-coder.ts
@@ -6,7 +6,7 @@ import { Keypair, SYSVAR_RENT_PUBKEY } from "@solana/web3.js";
 
 describe("custom-coder", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   // Client.
   const program = Spl.token();

diff --git a/tests/declare-id/tests/declare-id.ts b/tests/declare-id/tests/declare-id.ts
@@ -5,7 +5,7 @@ import { DeclareId } from "../target/types/declare_id";
 import { assert } from "chai";
 
 describe("declare_id", () => {
-  anchor.setProvider(anchor.Provider.local());
+  anchor.setProvider(anchor.AnchorProvider.local());
   const program = anchor.workspace.DeclareId as Program<DeclareId>;
 
   it("throws error!", async () => {

diff --git a/tests/errors/tests/errors.ts b/tests/errors/tests/errors.ts
@@ -64,7 +64,7 @@ const withLogTest = async (callback, expectedLogs) => {
 
 describe("errors", () => {
   // Configure the client to use the local cluster.
-  const localProvider = anchor.Provider.local();
+  const localProvider = anchor.AnchorProvider.local();
   localProvider.opts.skipPreflight = true;
   // processed failed tx do not result in AnchorErrors in the client
   // because we cannot get logs for them (only through overkill `onLogs`)
@@ -279,7 +279,7 @@ describe("errors", () => {
           data: program.coder.instruction.encode("signer_error", {}),
         })
       );
-      await program.provider.send(tx);
+      await program.provider.sendAndConfirm(tx);
       assert.ok(false);
     } catch (err) {
       anchor.getProvider().connection.removeOnLogsListener(listener);

diff --git a/tests/escrow/tests/escrow.ts b/tests/escrow/tests/escrow.ts
@@ -8,7 +8,7 @@ import { Escrow } from "../target/types/escrow";
 type EscrowAccount = IdlAccounts<Escrow>["escrowAccount"];
 
 describe("escrow", () => {
-  const provider = anchor.Provider.env();
+  const provider = anchor.AnchorProvider.env();
   anchor.setProvider(provider);
 
   const program = anchor.workspace.Escrow as Program<Escrow>;

diff --git a/tests/events/tests/events.js b/tests/events/tests/events.js
@@ -3,7 +3,7 @@ const { assert } = require("chai");
 
 describe("events", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
   const program = anchor.workspace.Events;
 
   it("Is initialized!", async () => {

diff --git a/tests/floats/tests/floats.ts b/tests/floats/tests/floats.ts
@@ -6,7 +6,7 @@ import { assert } from "chai";
 
 describe("floats", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   const program = anchor.workspace.Floats as Program<Floats>;
 

diff --git a/tests/ido-pool/tests/ido-pool.js b/tests/ido-pool/tests/ido-pool.js
@@ -14,7 +14,7 @@ const {
 const { token } = require("@project-serum/anchor/dist/cjs/utils");
 
 describe("ido-pool", () => {
-  const provider = anchor.Provider.local();
+  const provider = anchor.AnchorProvider.local();
 
   // Configure the client to use the local cluster.
   anchor.setProvider(provider);
@@ -182,7 +182,7 @@ describe("ido-pool", () => {
     let createUserUsdcTrns = new anchor.web3.Transaction().add(
       createUserUsdcInstr
     );
-    await provider.send(createUserUsdcTrns);
+    await provider.sendAndConfirm(createUserUsdcTrns);
     await usdcMintAccount.mintTo(
       userUsdc,
       provider.wallet.publicKey,
@@ -283,7 +283,7 @@ describe("ido-pool", () => {
     let createSecondUserUsdcTrns = new anchor.web3.Transaction();
     createSecondUserUsdcTrns.add(transferSolInstr);
     createSecondUserUsdcTrns.add(createSecondUserUsdcInstr);
-    await provider.send(createSecondUserUsdcTrns);
+    await provider.sendAndConfirm(createSecondUserUsdcTrns);
     await usdcMintAccount.mintTo(
       secondUserUsdc,
       provider.wallet.publicKey,

diff --git a/tests/interface/tests/interface.js b/tests/interface/tests/interface.js
@@ -4,7 +4,7 @@ const nativeAssert = require("assert");
 
 describe("interface", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   const counter = anchor.workspace.Counter;
   const counterAuth = anchor.workspace.CounterAuth;

diff --git a/tests/lockup/tests/lockup.js b/tests/lockup/tests/lockup.js
@@ -9,7 +9,10 @@ anchor.utils.features.set("anchor-deprecated-state");
 
 describe("Lockup and Registry", () => {
   // Read the provider from the configured environmnet.
-  const provider = anchor.Provider.env();
+  const provider = anchor.AnchorProvider.env();
+  // hack so we don't have to update serum-common library
+  // to the new AnchorProvider class and Provider interface
+  provider.send = provider.sendAndConfirm;
 
   // Configure the client to use the provider.
   anchor.setProvider(provider);

diff --git a/tests/misc/miscNonRentExempt.ts b/tests/misc/miscNonRentExempt.ts
@@ -11,7 +11,7 @@ const { assert } = require("chai");
 
 describe("miscNonRentExempt", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
   const program = anchor.workspace.Misc as Program<Misc>;
 
   it("init_if_needed checks rent_exemption if init is not needed", async () => {

diff --git a/tests/misc/tests/misc.ts b/tests/misc/tests/misc.ts
@@ -20,7 +20,7 @@ const miscIdl = require("../target/idl/misc.json");
 
 describe("misc", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
   const program = anchor.workspace.Misc as Program<Misc>;
   const misc2Program = anchor.workspace.Misc2 as Program<Misc2>;
 
@@ -760,7 +760,7 @@ describe("misc", () => {
     const anotherProgram = new anchor.Program(
       miscIdl,
       program.programId,
-      new anchor.Provider(
+      new anchor.AnchorProvider(
         program.provider.connection,
         new anchor.Wallet(anchor.web3.Keypair.generate()),
         { commitment: program.provider.connection.commitment }

diff --git a/tests/multiple-suites/tests/another-suite/another-suite.ts b/tests/multiple-suites/tests/another-suite/another-suite.ts
@@ -6,7 +6,7 @@ import { MultipleSuites } from "../../target/types/multiple_suites";
 
 describe("multiple-suites", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   const program = anchor.workspace.MultipleSuites as Program<MultipleSuites>;
 

diff --git a/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts b/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts
@@ -6,7 +6,7 @@ import { MultipleSuites } from "../../../target/types/multiple_suites";
 
 describe("multiple-suites", () => {
   // Configure the client to use the local cluster.
-  anchor.setProvider(anchor.Provider.env());
+  anchor.setProvider(anchor.AnchorProvider.env());
 
   const program = anchor.workspace.MultipleSuites as Program<MultipleSuites>;