diff --git a/ts-client/package.json b/ts-client/package.json index 4a82f29..5b3350a 100644 --- a/ts-client/package.json +++ b/ts-client/package.json @@ -13,22 +13,20 @@ "dist" ], "dependencies": { + "@meteora-ag/config": "workspace:*", + "@meteora-ag/vault-sdk": "workspace:*", "@coral-xyz/borsh": "^0.28.0", "@mercurial-finance/token-math": "6.0.0", "@metaplex-foundation/mpl-token-metadata": "~2.13.0", - "@meteora-ag/config": "workspace:*", "@meteora-ag/stake-for-fee": "1.0.28", - "@meteora-ag/vault-sdk": "workspace:*", "@solana/buffer-layout": "^4.0.1", "bn-sqrt": "^1.0.0", - "bn.js": "5.2.1", - "decimal.js": "^10.4.1", "dotenv": "^16.0.1", "invariant": "^2.2.4" }, "devDependencies": { "@tsconfig/recommended": "^1.0.1", - "@types/bn.js": "^5.1.0", + "@types/bn.js": "^5.1.6", "@types/chai": "^4.3.1", "@types/invariant": "^2.2.35", "@types/jest": "^27.5.1", @@ -46,7 +44,8 @@ "@solana/buffer-layout": "^4.0.1", "@solana/spl-token": "^0.4.9", "@solana/web3.js": "^1.95.5", - "bn.js": "^5.2.1" + "bn.js": "^5.2.1", + "decimal.js": "^10.4.1" }, "directories": { "test": "tests" diff --git a/ts-client/pnpm-lock.yaml b/ts-client/pnpm-lock.yaml index f3ba927..abb41cf 100644 --- a/ts-client/pnpm-lock.yaml +++ b/ts-client/pnpm-lock.yaml @@ -42,7 +42,7 @@ importers: specifier: ^1.0.0 version: 1.0.0 bn.js: - specifier: 5.2.1 + specifier: ^5.2.1 version: 5.2.1 decimal.js: specifier: ^10.4.1 @@ -58,8 +58,8 @@ importers: specifier: ^1.0.1 version: 1.0.2 '@types/bn.js': - specifier: ^5.1.0 - version: 5.1.1 + specifier: ^5.1.6 + version: 5.1.6 '@types/chai': specifier: ^4.3.1 version: 4.3.4 @@ -538,8 +538,8 @@ packages: '@types/big.js@6.2.2': resolution: {integrity: sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA==} - '@types/bn.js@5.1.1': - resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} + '@types/bn.js@5.1.6': + resolution: {integrity: sha512-Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w==} '@types/chai@4.3.4': resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==} @@ -2778,7 +2778,7 @@ snapshots: '@types/big.js@6.2.2': {} - '@types/bn.js@5.1.1': + '@types/bn.js@5.1.6': dependencies: '@types/node': 18.15.11 diff --git a/ts-client/src/amm/tests/bundlePoolQuote.test.ts b/ts-client/src/amm/tests/bundlePoolQuote.test.ts index 3c58062..1bef9c7 100644 --- a/ts-client/src/amm/tests/bundlePoolQuote.test.ts +++ b/ts-client/src/amm/tests/bundlePoolQuote.test.ts @@ -1,4 +1,4 @@ -import VaultImpl from '@mercurial-finance/vault-sdk'; +import VaultImpl from '@meteora-ag/vault-sdk'; import { AccountLayout, MintLayout, NATIVE_MINT, RawAccount, RawMint } from '@solana/spl-token'; import { clusterApiUrl, Connection, PublicKey, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js'; import { calculateSwapQuoteForGoingToCreateMemecoinPool } from '../utils'; diff --git a/ts-client/src/amm/tests/constantProduct.test.ts b/ts-client/src/amm/tests/constantProduct.test.ts index 63ae9f1..d06eb6d 100644 --- a/ts-client/src/amm/tests/constantProduct.test.ts +++ b/ts-client/src/amm/tests/constantProduct.test.ts @@ -31,6 +31,7 @@ describe('Constant product pool', () => { beforeAll(async () => { await airDropSol(connection, mockWallet.publicKey, 10); BTC = await createMint(provider.connection, mockWallet.payer, mockWallet.publicKey, null, btcDecimal); + USDC = await createMint(provider.connection, mockWallet.payer, mockWallet.publicKey, null, usdcDecimal); mockWalletBtcATA = await getOrCreateATA(connection, BTC, mockWallet.publicKey, mockWallet.payer); mockWalletUsdcATA = await getOrCreateATA(connection, USDC, mockWallet.publicKey, mockWallet.payer);