From 483999e8707cb7b073e728c477b042d211d35222 Mon Sep 17 00:00:00 2001
From: Neco <necmettin.karakaya@gmail.com>
Date: Mon, 20 Dec 2021 16:51:02 +0700
Subject: [PATCH] ts: remove deprecated commitment settings  (#1128)

---
 CHANGELOG.md                    | 3 ++-
 tests/cfo/scripts/fees.js       | 2 +-
 tests/cfo/tests/cfo.js          | 4 ++--
 tests/cfo/tests/utils/index.js  | 9 +++++----
 tests/swap/tests/utils/index.js | 7 ++++---
 ts/src/provider.ts              | 6 +++---
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9df4351507..b4d01a8771 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,9 @@ incremented for features.
 
 ## [Unreleased]
 
-### Fixes
 
+### Fixes
+* ts: Change commitment message `recent` to `processed` and `max` to `finalized` ([#1128](https://github.com/project-serum/anchor/pull/1128))
 * ts: fix `translateAddress` which currently leads to failing browser code. Now uses `PublicKey` constructor instead of prototype chain constructor name checking which doesn't work in the presence of code minifying/mangling([1138](https://github.com/project-serum/anchor/pull/1138))
 
 ### Features
diff --git a/tests/cfo/scripts/fees.js b/tests/cfo/scripts/fees.js
index c0265946fa..62249fcfb1 100755
--- a/tests/cfo/scripts/fees.js
+++ b/tests/cfo/scripts/fees.js
@@ -19,7 +19,7 @@ async function main() {
     let marketClient = await Market.load(
       provider.connection,
       market,
-      { commitment: "recent" },
+      { commitment: "processed" },
       DEX_PID
     );
     console.log("Fees: ", marketClient._decoded.quoteFeesAccrued.toString());
diff --git a/tests/cfo/tests/cfo.js b/tests/cfo/tests/cfo.js
index ae28b7407f..8bf06ce800 100644
--- a/tests/cfo/tests/cfo.js
+++ b/tests/cfo/tests/cfo.js
@@ -102,13 +102,13 @@ describe("cfo", () => {
     marketAClient = await Market.load(
       program.provider.connection,
       ORDERBOOK_ENV.marketA.address,
-      { commitment: "recent" },
+      { commitment: "processed" },
       DEX_PID
     );
     marketBClient = await Market.load(
       program.provider.connection,
       ORDERBOOK_ENV.marketB.address,
-      { commitment: "recent" },
+      { commitment: "processed" },
       DEX_PID
     );
     assert.ok(marketAClient._decoded.quoteFeesAccrued.toString() === FEES);
diff --git a/tests/cfo/tests/utils/index.js b/tests/cfo/tests/utils/index.js
index a8654e0637..3988262aa1 100644
--- a/tests/cfo/tests/utils/index.js
+++ b/tests/cfo/tests/utils/index.js
@@ -201,7 +201,7 @@ async function setupMarket({
   const MARKET_A_USDC = await Market.load(
     provider.connection,
     marketAPublicKey,
-    { commitment: "recent" },
+    { commitment: "processed" },
     DEX_PID
   );
   for (let k = 0; k < asks.length; k += 1) {
@@ -382,7 +382,8 @@ async function signTransactions({
   wallet,
   connection,
 }) {
-  const blockhash = (await connection.getRecentBlockhash("max")).blockhash;
+  const blockhash = (await connection.getRecentBlockhash("finalized"))
+    .blockhash;
   transactionsAndSigners.forEach(({ transaction, signers = [] }) => {
     transaction.recentBlockhash = blockhash;
     transaction.setSigners(
@@ -401,7 +402,7 @@ async function signTransactions({
 async function sendAndConfirmRawTransaction(
   connection,
   raw,
-  commitment = "recent"
+  commitment = "processed"
 ) {
   let tx = await connection.sendRawTransaction(raw, {
     skipPreflight: true,
@@ -429,7 +430,7 @@ async function runTradeBot(market, provider, iterations = undefined) {
   let marketClient = await Market.load(
     provider.connection,
     market,
-    { commitment: "recent" },
+    { commitment: "processed" },
     DEX_PID
   );
   const baseTokenUser1 = (
diff --git a/tests/swap/tests/utils/index.js b/tests/swap/tests/utils/index.js
index c7241cae54..ac31831be3 100644
--- a/tests/swap/tests/utils/index.js
+++ b/tests/swap/tests/utils/index.js
@@ -272,7 +272,7 @@ async function setupMarket({
   const MARKET_A_USDC = await Market.load(
     provider.connection,
     marketAPublicKey,
-    { commitment: "recent" },
+    { commitment: "processed" },
     DEX_PID
   );
   for (let k = 0; k < asks.length; k += 1) {
@@ -453,7 +453,8 @@ async function signTransactions({
   wallet,
   connection,
 }) {
-  const blockhash = (await connection.getRecentBlockhash("max")).blockhash;
+  const blockhash = (await connection.getRecentBlockhash("finalized"))
+    .blockhash;
   transactionsAndSigners.forEach(({ transaction, signers = [] }) => {
     transaction.recentBlockhash = blockhash;
     transaction.setSigners(
@@ -472,7 +473,7 @@ async function signTransactions({
 async function sendAndConfirmRawTransaction(
   connection,
   raw,
-  commitment = "recent"
+  commitment = "processed"
 ) {
   let tx = await connection.sendRawTransaction(raw, {
     skipPreflight: true,
diff --git a/ts/src/provider.ts b/ts/src/provider.ts
index a41e4b13b2..887f3c8208 100644
--- a/ts/src/provider.ts
+++ b/ts/src/provider.ts
@@ -30,8 +30,8 @@ export default class Provider {
 
   static defaultOptions(): ConfirmOptions {
     return {
-      preflightCommitment: "recent",
-      commitment: "recent",
+      preflightCommitment: "processed",
+      commitment: "processed",
     };
   }
 
@@ -207,7 +207,7 @@ export default class Provider {
     return await simulateTransaction(
       this.connection,
       tx,
-      opts.commitment ?? this.opts.commitment ?? "recent"
+      opts.commitment ?? this.opts.commitment ?? "processed"
     );
   }
 }