From 9d87589c2b74c4165a4e3b6eadfe9c38423bb6d4 Mon Sep 17 00:00:00 2001
From: Armani Ferrante <armaniferrante@gmail.com>
Date: Mon, 31 May 2021 16:45:31 -0700
Subject: [PATCH] Use anchor v0.7.0 (#29)

---
 package.json        |  8 ++++----
 src/context/Dex.tsx |  4 ++--
 yarn.lock           | 22 ++++++++++++++--------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 475a87a..d3d10b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@project-serum/swap-ui",
-  "version": "0.1.0-alpha.19",
+  "version": "0.1.0-alpha.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/project-serum/swap-ui",
@@ -8,7 +8,7 @@
   "dependencies": {
     "@fontsource/roboto": "^4.3.0",
     "@project-serum/serum": "^0.13.34",
-    "@project-serum/swap": "^0.1.0-alpha.14",
+    "@project-serum/swap": "^0.1.0-alpha.15",
     "@solana/spl-token": "^0.1.4"
   },
   "peerDependencies": {
@@ -38,10 +38,10 @@
     "@material-ui/core": "^4.11.4",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.58",
-    "@project-serum/anchor": "^0.6.0-beta.2",
+    "@project-serum/anchor": "^0.7.0",
     "@project-serum/serum": "^0.13.34",
     "@project-serum/sol-wallet-adapter": "^0.2.0",
-    "@project-serum/swap": "^0.1.0-alpha.14",
+    "@project-serum/swap": "^0.1.0-alpha.15",
     "@solana/spl-token": "^0.1.4",
     "@solana/spl-token-registry": "^0.2.86",
     "@solana/web3.js": "^1.10.1",
diff --git a/src/context/Dex.tsx b/src/context/Dex.tsx
index b220b21..1854782 100644
--- a/src/context/Dex.tsx
+++ b/src/context/Dex.tsx
@@ -70,7 +70,7 @@ export function DexContextProvider(props: any) {
           "Too many markets. Please file an issue to update this"
         );
       }
-      const multipleMarkets = await anchor.utils.getMultipleAccounts(
+      const multipleMarkets = await anchor.utils.rpc.getMultipleAccounts(
         swapClient.program.provider.connection,
         Array.from(markets.values()).map((m) => new PublicKey(m))
       );
@@ -112,7 +112,7 @@ export function DexContextProvider(props: any) {
         throw new Error("Too many mints. Please file an issue to update this");
       }
 
-      const mints = await anchor.utils.getMultipleAccounts(
+      const mints = await anchor.utils.rpc.getMultipleAccounts(
         swapClient.program.provider.connection,
         mintPubkeys
       );
diff --git a/yarn.lock b/yarn.lock
index 11c1928..9685b21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1609,10 +1609,10 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@project-serum/anchor@^0.6.0-beta.2":
-  version "0.6.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.6.0-beta.3.tgz#2e89e7739ccb708bff81b656e8f36a05352ccb80"
-  integrity sha512-nQ8GegtgyejhI/CRey8gorhdcbryEo2p76EMApxLoI4qhdeNws4rUcR7L5lRzQNaOPBuVXVrG8mEiw+qLzFsjw==
+"@project-serum/anchor@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.7.0.tgz#ef48b8233c0fbe6763699451eccfc5402503b012"
+  integrity sha512-SwY5OxJ6mYO3tTsYr3uQjlRX8tmb0P00u8T4ORWiYVz491fTcWIrGzqcrMHCvq9JFHMPvS6OR8BM0mfefx/DWw==
   dependencies:
     "@project-serum/borsh" "^0.2.2"
     "@solana/web3.js" "^1.11.0"
@@ -1627,6 +1627,7 @@
     js-sha256 "^0.9.0"
     pako "^2.0.3"
     snake-case "^3.0.4"
+    toml "^3.0.0"
 
 "@project-serum/borsh@^0.2.2":
   version "0.2.2"
@@ -1653,10 +1654,10 @@
     bs58 "^4.0.1"
     eventemitter3 "^4.0.4"
 
-"@project-serum/swap@^0.1.0-alpha.14":
-  version "0.1.0-alpha.14"
-  resolved "https://registry.yarnpkg.com/@project-serum/swap/-/swap-0.1.0-alpha.14.tgz#f97fdc3d7782c8cc86130d25c4a2d68d5d196110"
-  integrity sha512-F9YrsN2kx3CaitSR9MfjvdoePhjB7+7Pt9TkDfqCn44BMpffiONmc0mb7PCRTQXjdhBPRTZwTSwLYh6Xj4msyA==
+"@project-serum/swap@^0.1.0-alpha.15":
+  version "0.1.0-alpha.15"
+  resolved "https://registry.yarnpkg.com/@project-serum/swap/-/swap-0.1.0-alpha.15.tgz#3650294c579e99c60dd502ce6bdea5ac55a90f3d"
+  integrity sha512-/388h8vXzhZ5koeXjeXIJk8gErbGdDqVzhH/W09XLKl7p//eiJ7DWdFUKVPZxUaHe8XhYrWoRzbWdBOvUXmdYA==
   dependencies:
     "@project-serum/serum" "^0.13.34"
     "@solana/spl-token" "^0.1.3"
@@ -11811,6 +11812,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"