switch devnet to mango group with pyth

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockworks-foundation/mango-client",
-  "version": "2.1.5",
+  "version": "2.2.1",
   "description": "Library for interacting with Mango Markets' solana smart contracts.",
   "repository": "blockworks-foundation/mango-client-ts",
   "author": {
@@ -56,15 +56,12 @@
     "trailingComma": "all"
   },
   "dependencies": {
-    "@project-serum/common": "^0.0.1-beta.3",
+    "@project-serum/serum": "^0.13.65",
-    "@project-serum/serum": "^0.13.20",
+    "@project-serum/sol-wallet-adapter": "^0.2.6",
-    "@project-serum/sol-wallet-adapter": "^0.1.4",
     "@pythnetwork/client": "^2.7.2",
-    "@solana/spl-token": "0.0.13",
+    "@solana/spl-token": "^0.1.6",
-    "@solana/web3.js": "^0.95.0",
+    "@solana/web3.js": "^1.30.2",
-    "bn.js": "^5.1.2",
+    "borsh": "https://github.com/defactojob/borsh-js#field-mapper"
-    "borsh": "https://github.com/defactojob/borsh-js#field-mapper",
-    "buffer-layout": "^1.2.0"
   },
   "browserslist": [
     ">0.2%",

src/client.ts

@@ -480,7 +480,7 @@ export class MangoClient {
       await connection.getRecentBlockhash('singleGossip')
     ).blockhash;
     transaction.setSigners(
-      payer.publicKey,
+      payer.publicKey!,
       ...additionalSigners.map((a) => a.publicKey),
     );
 
@@ -761,7 +761,7 @@ export class MangoClient {
     programId: PublicKey,
     mangoGroup: MangoGroup,
     marginAccount: MarginAccount,
-    wallet: Wallet | Account,
+    wallet: Account,
     token: PublicKey,
     tokenAcc: PublicKey,
 
@@ -801,7 +801,7 @@ export class MangoClient {
       programId,
       mangoGroup.publicKey,
       marginAccount.publicKey,
-      wallet.publicKey,
+      wallet.publicKey!,
       mangoGroup.signerKey,
       tokenAcc,
       mangoGroup.vaults[tokenIndex],
@@ -1882,7 +1882,7 @@ export class MangoClient {
       {
         memcmp: {
           offset: MarginAccountLayout.offsetOf('owner'),
-          bytes: owner.publicKey.toBase58(),
+          bytes: owner.publicKey!.toBase58(),
         },
       },
 
@@ -1946,7 +1946,7 @@ export class MangoClient {
       {
         memcmp: {
           offset: MangoSrmAccountLayout.offsetOf('owner'),
-          bytes: owner.publicKey.toBase58(),
+          bytes: owner.publicKey!.toBase58(),
         },
       },
 

src/ids.json

@@ -19,7 +19,7 @@
     "fee_symbol": "SRM",
     "mango_groups": {
       "BTC_ETH_SOL_SRM_USDC": {
-        "mango_group_pk": "B9Uddrao7b7sCjNZp1BJSQqFzqhMEmBxD2SvYTs2TSBn",
+        "mango_group_pk": "145AQpczEW6dMpMjhbRvL3harKAgFFg8atGVRyzQm47E",
         "mint_pks": [
           "bypQzRBaSDWiKhoAw3hNkf35eF3z3AZCU8Sxks6mTPP",
           "ErWGBLBQMwdyC4H3MR8ef6pFK6gyHAyBxy4o1mHoqKzm",
@@ -28,10 +28,10 @@
           "EMjjdsqERN4wJUR9jMBax2pzqQPeGLNn5NeucbHpDUZK"
         ],
         "oracle_pks": [
-          "FuEnReoxhqW8Li6EMLoaaUWbWAEjTfSRuBARo5GrGCqN",
+          "HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J",
-          "GzfYWGM1oeVrha9zvM1awnTJEUAuinpnVRUyYQYELzqg",
+          "EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw",
-          "AshULbjkGvse8YW2ojjeqHdMbFGigLy2xxiGVhsLqX5T",
+          "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix",
-          "B3nWGxqNQzJeRfpYSXU8qJaTQxspZmqAt91FRAhfoFQL"
+          "992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs"
         ],
         "spot_market_pks": [
           "E1mfsnnCcL24JcDQxr7F2BpWjkyy5x2WHys8EL2pnCj9",
@@ -45,7 +45,7 @@
           "SOL/USDC": "4Rf4qZYwBVo6RsxisBnm8RJCRMehiZ2TsDwfyoR9X4dF",
           "SRM/USDC": "4SZ7MvMfW2fbEu5SgLMfRaeTR2bXhP6GGLMr1L6N9PeW"
         },
-        "srm_vault_pk": "6Jj5MEKHrkeorbSayCk9xHWDmBjuyuLDkLsdngefGHCr",
+        "srm_vault_pk": "CiaHg2ucpiEwm25QUwf1XdDkxJ8vLczsDB996toMZzsf",
         "symbols": {
           "BTC": "bypQzRBaSDWiKhoAw3hNkf35eF3z3AZCU8Sxks6mTPP",
           "ETH": "ErWGBLBQMwdyC4H3MR8ef6pFK6gyHAyBxy4o1mHoqKzm",
@@ -54,11 +54,11 @@
           "USDC": "EMjjdsqERN4wJUR9jMBax2pzqQPeGLNn5NeucbHpDUZK"
         },
         "vault_pks": [
-          "EeTjEgYGYS6Ki45zBY5jQ3upVN65Eh8v1TU1ape8Pu7u",
+          "5GbvR4fywH2gWMLDDUxByczjQyB9hDFXQ1pFNVoVdFsb",
-          "EmSaqX8VvhZKqgFwWDjgzRrGEKnW97svL8EKjVpW8vM9",
+          "BMBQiQMu6MQcUX6Avex7qWbvB7HRTnRp8ddDwZrFDxTL",
-          "8BU955zFdqCzzcvHf9XBiRBMraYvAYGZWqyMw5Etd9gv",
+          "7ueccNJNGyrVj2uqMK4prutVv1yg5J5UhC9ZWtpTjTy3",
-          "6Jj5MEKHrkeorbSayCk9xHWDmBjuyuLDkLsdngefGHCr",
+          "CiaHg2ucpiEwm25QUwf1XdDkxJ8vLczsDB996toMZzsf",
-          "CRZemtdc8FjHYWqLDVPwYK5PGbVSxPCKoyf6fyEFkfjq"
+          "uf69e5eXfvUASXrHRHFcjpao9jdJnMr1CEZy49SXgbL"
         ]
       },
       "BTC_ETH_USDT": {
@@ -95,14 +95,14 @@
     },
     "mango_program_id": "9XzhtAtDXxW2rjbeVFhTq4fnhD8dqzr154r5b2z6pxEp",
     "oracles": {
-      "BTC/USDC": "FuEnReoxhqW8Li6EMLoaaUWbWAEjTfSRuBARo5GrGCqN",
+      "BTC/USDC": "HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J",
       "BTC/USDT": "6Xvk6VC423bbhwnCfMyPfE4C1vytoqsVMUY1Lbqeh6pf",
       "BTC/WUSDT": "6Xvk6VC423bbhwnCfMyPfE4C1vytoqsVMUY1Lbqeh6pf",
-      "ETH/USDC": "GzfYWGM1oeVrha9zvM1awnTJEUAuinpnVRUyYQYELzqg",
+      "ETH/USDC": "EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw",
       "ETH/USDT": "4CoKvk3NUXYiHKGbQvihadw6TC8LTN1qjfadPcsaURbW",
       "ETH/WUSDT": "4CoKvk3NUXYiHKGbQvihadw6TC8LTN1qjfadPcsaURbW",
-      "SOL/USDC": "AshULbjkGvse8YW2ojjeqHdMbFGigLy2xxiGVhsLqX5T",
+      "SOL/USDC": "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix",
-      "SRM/USDC": "B3nWGxqNQzJeRfpYSXU8qJaTQxspZmqAt91FRAhfoFQL"
+      "SRM/USDC": "992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs"
     },
     "spot_markets": {
       "BTC/USDC": "E1mfsnnCcL24JcDQxr7F2BpWjkyy5x2WHys8EL2pnCj9",

src/utils.ts

@@ -88,7 +88,9 @@ export async function awaitTransactionSignatureConfirmation(
 ) {
   let done = false;
 
-  const confirmLevels: (TransactionConfirmationStatus | null)[] = ['finalized'];
+  const confirmLevels: (TransactionConfirmationStatus | undefined)[] = [
+    'finalized',
+  ];
   if (confirmLevel === 'confirmed') {
     confirmLevels.push('confirmed');
   } else if (confirmLevel === 'processed') {