Merge remote-tracking branch 'origin/main' into man0s/sdk-prep-2

mrgnlabs · Sep 3, 2023 · dcbd18d · dcbd18d
2 parents 9be7ef3 + ea61c4b
commit dcbd18d
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 87 deletions.
diff --git a/apps/marginfi-landing-page/package.json b/apps/marginfi-landing-page/package.json
@@ -11,7 +11,7 @@
     "lint-fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@coral-xyz/borsh": "^0.26.0",
+    "@coral-xyz/borsh": "^0.28.0",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mrgnlabs/mrgn-common": "*",

diff --git a/apps/marginfi-v2-ui/package.json b/apps/marginfi-v2-ui/package.json
@@ -11,7 +11,7 @@
     "lint-fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@coral-xyz/borsh": "^0.26.0",
+    "@coral-xyz/borsh": "^0.28.0",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mrgnlabs/lip-client": "*",

diff --git a/apps/marginfi-v2-ui/src/components/AssetsList/AssetRow/AssetRow.tsx b/apps/marginfi-v2-ui/src/components/AssetsList/AssetRow/AssetRow.tsx
@@ -453,8 +453,8 @@ const AssetRow: FC<{
         style={{ fontWeight: 300 }}
       >
         {isInLendingMode
-          ? bank.info.rawBank.config.assetWeightMaint.toNumber() > 0
-            ? (bank.info.rawBank.config.assetWeightMaint.toNumber() * 100).toFixed(0) + "%"
+          ? bank.info.rawBank.config.assetWeightInit.toNumber() > 0
+            ? (bank.info.rawBank.config.assetWeightInit.toNumber() * 100).toFixed(0) + "%"
             : "-"
           : ((1 / bank.info.rawBank.config.liabilityWeightInit.toNumber()) * 100).toFixed(0) + "%"}
       </TableCell>

diff --git a/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx b/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx
@@ -1,6 +1,5 @@
 import React, { FC, useCallback, useEffect, useMemo, useState } from "react";
 import { Keypair, SystemProgram, Transaction } from "@solana/web3.js";
-import { associatedAddress } from "@project-serum/anchor/dist/cjs/utils/token";
 import BN from "bn.js";
 import {
   uiToNative,
@@ -11,6 +10,7 @@ import {
   createAssociatedTokenAccountIdempotentInstruction,
   createSyncNativeInstruction,
   NATIVE_MINT,
+  getAssociatedTokenAddressSync,
 } from "@mrgnlabs/mrgn-common";
 import { useLipClient } from "~/context";
 import { useWallet } from "@solana/wallet-adapter-react";
@@ -133,10 +133,7 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
 
     const campaignKeypair = Keypair.generate();
     console.log("creating campaign", campaignKeypair.publicKey.toBase58());
-    const userTokenAtaPk = await associatedAddress({
-      mint: campaignBank.mint,
-      owner: lipClient.wallet.publicKey,
-    });
+    const userTokenAtaPk = getAssociatedTokenAddressSync(campaignBank.mint, lipClient.wallet.publicKey);
 
     const tx = new Transaction();
 

diff --git a/apps/marginfi-v2-xnft/package.json b/apps/marginfi-v2-xnft/package.json
@@ -11,7 +11,7 @@
     "clean": "rimraf dist node_modules .expo web-build"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.28.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
     "@coral-xyz/common": "^0.6.6-latest.5027",
     "@expo-google-fonts/dev": "*",
     "@expo/vector-icons": "^13.0.0",

diff --git a/apps/omni/package.json b/apps/omni/package.json
@@ -14,8 +14,8 @@
     "lint-fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.27.0",
-    "@coral-xyz/borsh": "^0.26.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
+    "@coral-xyz/borsh": "^0.28.0",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@google-cloud/bigquery": "^6.2.0",

diff --git a/apps/omni/src/api/ai/tools/decodedAccounts.ts b/apps/omni/src/api/ai/tools/decodedAccounts.ts
@@ -1,11 +1,9 @@
 import { Tool } from "langchain/tools";
-import { Wallet } from "@coral-xyz/anchor";
 import { inflate } from "pako";
 import { AccountInfo, Connection, PublicKey } from "@solana/web3.js";
-import { AnchorProvider, BorshAccountsCoder, Program, translateAddress } from "@coral-xyz/anchor";
+import { AnchorProvider, BorshAccountsCoder, Program, translateAddress, Wallet, Idl } from "@coral-xyz/anchor";
 import { decodeIdlAccount, idlAddress } from "@coral-xyz/anchor/dist/cjs/idl";
 import { utf8 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
-import { Idl } from "@project-serum/anchor";
 import { MARGINFI_IDL } from "@mrgnlabs/marginfi-client-v2";
 
 const SUPPORTED_PROGRAMS: { [programId: string]: string } = {

diff --git a/packages/lip-client/package.json b/packages/lip-client/package.json
@@ -12,13 +12,13 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.26.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
     "@mrgnlabs/marginfi-client-v2": "*",
     "@mrgnlabs/mrgn-common": "*",
-    "@project-serum/anchor": "^0.26.0",
     "@solana/wallet-adapter-base": "^0.9.20",
     "@solana/web3.js": "^1.71.0",
     "bignumber.js": "^9.1.1",
+    "bs58": "^5.0.0",
     "decimal.js": "^10.4.3",
     "superstruct": "^1.0.3"
   },

diff --git a/packages/lip-client/src/account.ts b/packages/lip-client/src/account.ts
@@ -1,4 +1,4 @@
-import { Address, BN, BorshCoder, translateAddress } from "@project-serum/anchor";
+import { Address, BN, BorshCoder, translateAddress } from "@coral-xyz/anchor";
 import { Keypair, PublicKey, Transaction } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
 import { LIP_IDL } from ".";

diff --git a/packages/lip-client/src/client.ts b/packages/lip-client/src/client.ts
@@ -1,6 +1,4 @@
-import { AnchorProvider, Program } from "@project-serum/anchor";
-import { associatedAddress } from "@project-serum/anchor/dist/cjs/utils/token";
-import { bs58 } from "@project-serum/anchor/dist/cjs/utils/bytes";
+import { AnchorProvider, Program, Address, translateAddress } from "@coral-xyz/anchor";
 import {
   ConfirmOptions,
   Connection,
@@ -18,19 +16,20 @@ import { LIP_IDL } from "./idl";
 import instructions from "./instructions";
 import { DEPOSIT_MFI_AUTH_SIGNER_SEED, MARGINFI_ACCOUNT_SEED } from "./constants";
 import { Bank, MarginfiClient } from "@mrgnlabs/marginfi-client-v2";
-import { Address, translateAddress } from "@coral-xyz/anchor";
 import { Campaign, DepositData } from "./account";
 import {
   Amount,
   createAssociatedTokenAccountIdempotentInstruction,
   createSyncNativeInstruction,
   DEFAULT_CONFIRM_OPTS,
+  getAssociatedTokenAddressSync,
   InstructionsWrapper,
   NATIVE_MINT,
   TransactionOptions,
   uiToNative,
   Wallet,
 } from "@mrgnlabs/mrgn-common";
+import base58 from "bs58";
 /**
  * Entrypoint to interact with the LIP contract.
  */
@@ -151,10 +150,7 @@ class LipClient {
   async makeDepositIx(campaign: PublicKey, amount: Amount, bank: Bank): Promise<InstructionsWrapper> {
     const depositKeypair = Keypair.generate();
     const tempTokenAccountKeypair = Keypair.generate();
-    const userTokenAtaPk = await associatedAddress({
-      mint: bank.mint,
-      owner: this.mfiClient.provider.wallet.publicKey,
-    });
+    const userTokenAtaPk = getAssociatedTokenAddressSync(bank.mint, this.mfiClient.provider.wallet.publicKey);
     const amountNative = uiToNative(amount, bank.mintDecimals);
 
     const ixs = [];
@@ -236,7 +232,7 @@ class LipClient {
 
       const versionedMessage = new TransactionMessage({
         instructions: transaction.instructions,
-        payerKey: this.mfiClient.provider.publicKey,
+        payerKey: this.mfiClient.provider.wallet.publicKey,
         recentBlockhash: blockhash,
       });
 
@@ -257,7 +253,7 @@ class LipClient {
         console.log(response.value.logs);
 
         const signaturesEncoded = encodeURIComponent(
-          JSON.stringify(versionedTransaction.signatures.map((s) => bs58.encode(s)))
+          JSON.stringify(versionedTransaction.signatures.map((s) => base58.encode(s)))
         );
         const messageEncoded = encodeURIComponent(
           Buffer.from(versionedTransaction.message.serialize()).toString("base64")

diff --git a/packages/marginfi-client-v2/package.json b/packages/marginfi-client-v2/package.json
@@ -15,12 +15,12 @@
     "src"
   ],
   "dependencies": {
-    "@coral-xyz/anchor": "^0.26.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
     "@mrgnlabs/mrgn-common": "*",
-    "@project-serum/anchor": "^0.26.0",
     "@solana/wallet-adapter-base": "^0.9.20",
     "@solana/web3.js": "^1.71.0",
     "bignumber.js": "^9.1.1",
+    "bs58": "^5.0.0",
     "decimal.js": "^10.4.3",
     "superstruct": "^1.0.3"
   },

diff --git a/packages/marginfi-client-v2/src/client.ts b/packages/marginfi-client-v2/src/client.ts
@@ -1,5 +1,5 @@
-import { Address, AnchorProvider, BorshAccountsCoder, Program, translateAddress } from "@project-serum/anchor";
-import { bs58 } from "@project-serum/anchor/dist/cjs/utils/bytes";
+import { Address, AnchorProvider, BorshAccountsCoder, Program, translateAddress } from "@coral-xyz/anchor";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 import {
   Commitment,
   ConfirmOptions,

diff --git a/packages/marginfi-client-v2/src/models/account/wrapper.ts b/packages/marginfi-client-v2/src/models/account/wrapper.ts
@@ -1,5 +1,5 @@
 import { Amount, DEFAULT_COMMITMENT, InstructionsWrapper, shortenAddress } from "@mrgnlabs/mrgn-common";
-import { Address, BorshCoder, translateAddress } from "@project-serum/anchor";
+import { Address, BorshCoder, translateAddress } from "@coral-xyz/anchor";
 import { AccountMeta, Commitment, PublicKey, Transaction } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
 import { MarginfiClient, MarginfiGroup } from "../..";

diff --git a/packages/marginfi-client-v2/src/models/balance.ts b/packages/marginfi-client-v2/src/models/balance.ts
@@ -3,6 +3,7 @@ import { PublicKey } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
 import { OraclePrice, MarginRequirementType, PriceBias } from "..";
 import { Bank } from "./bank";
+import BN from "bn.js";
 
 // ----------------------------------------------------------------------------
 // On-chain types
@@ -14,7 +15,7 @@ interface BalanceRaw {
   assetShares: WrappedI80F48;
   liabilityShares: WrappedI80F48;
   emissionsOutstanding: WrappedI80F48;
-  lastUpdate: number;
+  lastUpdate: BN;
 }
 
 export type { BalanceRaw };
@@ -53,7 +54,7 @@ class Balance {
     const assetShares = wrappedI80F48toBigNumber(balanceRaw.assetShares);
     const liabilityShares = wrappedI80F48toBigNumber(balanceRaw.liabilityShares);
     const emissionsOutstanding = wrappedI80F48toBigNumber(balanceRaw.emissionsOutstanding);
-    const lastUpdate = balanceRaw.lastUpdate;
+    const lastUpdate = balanceRaw.lastUpdate.toNumber();
 
     return new Balance(active, bankPk, assetShares, liabilityShares, emissionsOutstanding, lastUpdate);
   }

diff --git a/packages/marginfi-client-v2/src/models/group.ts b/packages/marginfi-client-v2/src/models/group.ts
@@ -1,4 +1,4 @@
-import { BorshCoder } from "@project-serum/anchor";
+import { BorshCoder } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 import { MARGINFI_IDL } from "../idl";

diff --git a/packages/marginfi-client-v2/src/utils.ts b/packages/marginfi-client-v2/src/utils.ts
@@ -9,15 +9,13 @@ import {
 } from "./constants";
 import { BankVaultType } from "./types";
 import {
-  Amount,
   NATIVE_MINT,
   createAssociatedTokenAccountIdempotentInstruction,
   uiToNative,
   createSyncNativeInstruction,
   createCloseAccountInstruction,
   getAssociatedTokenAddressSync,
 } from "@mrgnlabs/mrgn-common";
-import { associatedAddress } from "@project-serum/anchor/dist/cjs/utils/token";
 import BigNumber from "bignumber.js";
 
 export function getBankVaultSeeds(type: BankVaultType): Buffer {

diff --git a/packages/marginfi-v2-ui-state/package.json b/packages/marginfi-v2-ui-state/package.json
@@ -12,9 +12,8 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.26.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
     "@mrgnlabs/marginfi-client-v2": "*",
-    "@project-serum/anchor": "^0.26.0",
     "@solana/buffer-layout-utils": "^0.2.0",
     "@solana/wallet-adapter-base": "^0.9.20",
     "@solana/web3.js": "^1.71.0",

diff --git a/packages/mrgn-common/package.json b/packages/mrgn-common/package.json
@@ -12,8 +12,7 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.26.0",
-    "@project-serum/anchor": "^0.26.0",
+    "@coral-xyz/anchor": "^0.28.1-beta.2",
     "@solana/buffer-layout-utils": "^0.2.0",
     "@solana/wallet-adapter-base": "^0.9.20",
     "@solana/web3.js": "^1.71.0",

diff --git a/packages/mrgn-common/src/conversion.ts b/packages/mrgn-common/src/conversion.ts
@@ -1,4 +1,4 @@
-import { Address, BN } from "@project-serum/anchor";
+import { Address, BN } from "@coral-xyz/anchor";
 import BigNumber from "bignumber.js";
 import { Decimal } from "decimal.js";
 import { Amount } from "./types";

diff --git a/packages/mrgn-common/src/misc.ts b/packages/mrgn-common/src/misc.ts
@@ -1,4 +1,4 @@
-import { AnchorProvider } from "@project-serum/anchor";
+import { AnchorProvider } from "@coral-xyz/anchor";
 import { ConfirmOptions, Connection, Keypair, Signer, Transaction, TransactionSignature } from "@solana/web3.js";
 
 /**

diff --git a/packages/mrgn-common/src/types.ts b/packages/mrgn-common/src/types.ts
@@ -1,4 +1,4 @@
-import { AnchorProvider, BN, Program as AnchorProgram } from "@project-serum/anchor";
+import { AnchorProvider, BN, Program as AnchorProgram } from "@coral-xyz/anchor";
 import { SignerWalletAdapter } from "@solana/wallet-adapter-base";
 import { ConfirmOptions, Keypair, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BigNumber from "bignumber.js";