diff --git a/apps/marginfi-landing-page/package.json b/apps/marginfi-landing-page/package.json index bddf252799..452896487e 100644 --- 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 index 86df66dc3c..4f42be0b9b 100644 --- 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 index 120caa9a2b..e864508a44 100644 --- 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) + "%"} diff --git a/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx b/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx index d768adfbf6..1534305ec8 100644 --- 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 = () => { 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 index 8e1211ff10..2eddd62a10 100644 --- 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 index 157e017646..cd909a9091 100644 --- 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 index 37b5a5fadb..6b9d01b072 100644 --- 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 index 95c9b06f8b..2b506af002 100644 --- 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 index 532f7c4f09..569851731a 100644 --- 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 index 06b7c909ba..b3f8bcd75f 100644 --- 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 { 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 index 51aa9a8b3e..ac4a8a02e2 100644 --- 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 index dc0dcc8843..df6a5feda3 100644 --- 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 index 2f51961b1c..135c09686f 100644 --- 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 index f8bd52d427..5795f5dbfc 100644 --- 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 index fa8cc4b0e1..d22e491932 100644 --- 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 index 9b786e6de3..ae2aa79ece 100644 --- a/packages/marginfi-client-v2/src/utils.ts +++ b/packages/marginfi-client-v2/src/utils.ts @@ -9,7 +9,6 @@ import { } from "./constants"; import { BankVaultType } from "./types"; import { - Amount, NATIVE_MINT, createAssociatedTokenAccountIdempotentInstruction, uiToNative, @@ -17,7 +16,6 @@ import { 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 index 552474fe8f..d5d410ac87 100644 --- 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 index 0bfd1d833f..b409915bdd 100644 --- 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 index 45d417c0ac..0e5679e5da 100644 --- 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 index e9a2e84cc3..437aa29bf2 100644 --- 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 index 36b233e3ee..dca51225cb 100644 --- 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"; diff --git a/yarn.lock b/yarn.lock index 50f33d0d14..5e1d91c896 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1643,12 +1643,13 @@ superstruct "^0.15.4" toml "^3.0.0" -"@coral-xyz/anchor@^0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1" - integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg== +"@coral-xyz/anchor@0.28.1-beta.2", "@coral-xyz/anchor@^0.28.1-beta.1", "@coral-xyz/anchor@^0.28.1-beta.2": + version "0.28.1-beta.2" + resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.28.1-beta.2.tgz#4ddd4b2b66af04407be47cf9524147793ec514a0" + integrity sha512-xreUcOFF8+IQKWOBUrDKJbIw2ftpRVybFlEPVrbSlOBCbreCWrQ5754Gt9cHIcuBDAzearCDiBqzsGQdNgPJiw== dependencies: - "@coral-xyz/borsh" "^0.26.0" + "@coral-xyz/borsh" "^0.28.0" + "@noble/hashes" "^1.3.1" "@solana/web3.js" "^1.68.0" base64-js "^1.5.1" bn.js "^5.1.2" @@ -1658,18 +1659,17 @@ cross-fetch "^3.1.5" crypto-hash "^1.3.0" eventemitter3 "^4.0.7" - js-sha256 "^0.9.0" pako "^2.0.3" snake-case "^3.0.4" superstruct "^0.15.4" toml "^3.0.0" -"@coral-xyz/anchor@^0.27.0": - version "0.27.0" - resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.27.0.tgz#621e5ef123d05811b97e49973b4ed7ede27c705c" - integrity sha512-+P/vPdORawvg3A9Wj02iquxb4T0C5m4P6aZBVYysKl4Amk+r6aMPZkUhilBkD6E4Nuxnoajv3CFykUfkGE0n5g== +"@coral-xyz/anchor@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1" + integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg== dependencies: - "@coral-xyz/borsh" "^0.27.0" + "@coral-xyz/borsh" "^0.26.0" "@solana/web3.js" "^1.68.0" base64-js "^1.5.1" bn.js "^5.1.2" @@ -1685,27 +1685,6 @@ superstruct "^0.15.4" toml "^3.0.0" -"@coral-xyz/anchor@^0.28.1-beta.1": - version "0.28.1-beta.2" - resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.28.1-beta.2.tgz#4ddd4b2b66af04407be47cf9524147793ec514a0" - integrity sha512-xreUcOFF8+IQKWOBUrDKJbIw2ftpRVybFlEPVrbSlOBCbreCWrQ5754Gt9cHIcuBDAzearCDiBqzsGQdNgPJiw== - dependencies: - "@coral-xyz/borsh" "^0.28.0" - "@noble/hashes" "^1.3.1" - "@solana/web3.js" "^1.68.0" - base64-js "^1.5.1" - bn.js "^5.1.2" - bs58 "^4.0.1" - buffer-layout "^1.2.2" - camelcase "^6.3.0" - cross-fetch "^3.1.5" - crypto-hash "^1.3.0" - eventemitter3 "^4.0.7" - pako "^2.0.3" - snake-case "^3.0.4" - superstruct "^0.15.4" - toml "^3.0.0" - "@coral-xyz/borsh@^0.26.0": version "0.26.0" resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.26.0.tgz#d054f64536d824634969e74138f9f7c52bbbc0d5" @@ -1714,14 +1693,6 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@coral-xyz/borsh@^0.27.0": - version "0.27.0" - resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.27.0.tgz#700c647ea5262b1488957ac7fb4e8acf72c72b63" - integrity sha512-tJKzhLukghTWPLy+n8K8iJKgBq1yLT/AxaNd10yJrX8mI56ao5+OFAKAqW/h0i79KCvb4BK0VGO5ECmmolFz9A== - dependencies: - bn.js "^5.1.2" - buffer-layout "^1.2.0" - "@coral-xyz/borsh@^0.28.0": version "0.28.0" resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.28.0.tgz#fa368a2f2475bbf6f828f4657f40a52102e02b6d" @@ -3859,6 +3830,17 @@ bs58 "^4.0.1" jsbi "4.3.0" +"@jup-ag/common@^6.0.0-beta.2": + version "6.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@jup-ag/common/-/common-6.0.0-beta.2.tgz#64cce00a04299b8047c1fa5e0c821b0328cef591" + integrity sha512-KHXKs+6aE+Y4rtzisIeZcC2j4iRVJeS0mX8H3wIBQ2D/FQtVrZp1mI6A/kA3ifPad1jmjWTLPLTwLAcf1Y/Fjw== + dependencies: + "@coral-xyz/anchor" "0.28.1-beta.2" + "@mercurial-finance/optimist" "0.3.0" + "@solana/spl-token" "0.1.8" + bs58 "^4.0.1" + jsbi "4.3.0" + "@jup-ag/core@4.0.0-beta.3-fbed36": version "4.0.0-beta.3-fbed36" resolved "https://registry.yarnpkg.com/@jup-ag/core/-/core-4.0.0-beta.3-fbed36.tgz#a2b47a90572ac0c6bb92fe2a30d3b8102efbfa03" @@ -3894,7 +3876,7 @@ jsbi "4.3.0" promise-retry "2.0.1" -"@jup-ag/core@^4.0.0-beta.20", "@jup-ag/core@^4.0.0-beta.21": +"@jup-ag/core@^4.0.0-beta.20": version "4.0.0-beta.21" resolved "https://registry.yarnpkg.com/@jup-ag/core/-/core-4.0.0-beta.21.tgz#fefb14871222dd2435271e566a4c5a260158dc0b" integrity sha512-GoVlnv6FC9T1Oh8BjNDM0lNuRSLiunJG0SgsRcMGdOZvscwqz6EP5kVOZ6c8k8eMLDz0stOYO+SP4dOqWg6MlQ== @@ -4372,6 +4354,14 @@ dependencies: promise-retry "2.0.1" +"@mercurial-finance/optimist@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@mercurial-finance/optimist/-/optimist-0.3.0.tgz#a943b8a910062d3a3b78078262bd688a6159c709" + integrity sha512-StFgenETULc8VM4V/8p11ESE0CA0e4H7suXppkFHhKfV0AdJ6T4m9Xc0puEqlkzWVQCZAGaOIesDPFCfwyMPiQ== + dependencies: + "@metaplex-foundation/mpl-token-metadata" "~2.13.0" + promise-retry "2.0.1" + "@mercurial-finance/optimist@^0.1.4": version "0.1.9" resolved "https://registry.yarnpkg.com/@mercurial-finance/optimist/-/optimist-0.1.9.tgz#82b612fc6d602c1010cada4fb396d92b7fcae03a" @@ -4685,7 +4675,7 @@ "@solana/spl-token" "^0.1.8" "@solana/web3.js" "^1.31.0" -"@metaplex-foundation/mpl-token-metadata@^2.2.2", "@metaplex-foundation/mpl-token-metadata@^2.5.1", "@metaplex-foundation/mpl-token-metadata@^2.7.0", "@metaplex-foundation/mpl-token-metadata@^2.8.6": +"@metaplex-foundation/mpl-token-metadata@^2.2.2", "@metaplex-foundation/mpl-token-metadata@^2.5.1", "@metaplex-foundation/mpl-token-metadata@^2.7.0", "@metaplex-foundation/mpl-token-metadata@^2.8.6", "@metaplex-foundation/mpl-token-metadata@~2.13.0": version "2.13.0" resolved "https://registry.yarnpkg.com/@metaplex-foundation/mpl-token-metadata/-/mpl-token-metadata-2.13.0.tgz#ea498190ad4ed1d4c0b8218a72d03bd17a883d11" integrity sha512-Fl/8I0L9rv4bKTV/RAl5YIbJe9SnQPInKvLz+xR1fEc4/VQkuCn3RPgypfUMEKWmCznzaw4sApDxy6CFS4qmJw==