@triadxyz/triad-protocol 2.8.3-beta → 2.8.4-beta

package/dist/index.js

@@ -368,8 +368,7 @@ class TriadProtocolClient {
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: token,
                     outToken: constants_1.TRD_MINT.toString(),
-                    amount,
-                    swapMode: 'ExactIn'
+                    amount
                 });
                 amountInTRD = outAmount;
                 if (swapIxs.length === 0) {
@@ -505,8 +504,7 @@ class TriadProtocolClient {
                         wallet: this.program.provider.publicKey.toBase58(),
                         inToken: constants_1.USDC_MINT.toBase58(),
                         outToken: constants_1.TRD_MINT.toString(),
-                        amount: order.shares / Math.pow(10, this.decimals),
-                        swapMode: 'ExactIn'
+                        amount: order.shares / Math.pow(10, this.decimals)
                     });
                     if (swapIxs.length === 0) {
                         return;
@@ -891,26 +889,23 @@ class TriadProtocolClient {
                     .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
                     .div(adjustedPrice);
                 const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
-                console.log('sharesToBuy', sharesToBuy.toNumber());
                 if (sharesToBuy.lte(new bn_js_1.default(0)))
                     continue;
                 const usdcAmount = sharesToBuy
                     .mul(adjustedPrice)
                     .div(new bn_js_1.default(Math.pow(10, this.decimals)));
-                console.log('usdcAmount', usdcAmount.toNumber());
-                console.log('--------------------------------');
                 totalUSDCNeeded = totalUSDCNeeded.add(usdcAmount);
                 tempRemainingUSDC = tempRemainingUSDC.sub(usdcAmount);
             }
-            console.log('totalUSDCNeeded', totalUSDCNeeded.toNumber());
             if (isTrdPayout && totalUSDCNeeded.gt(new bn_js_1.default(0))) {
+                const price = yield (0, swap_1.getPrice)(constants_1.TRD_MINT.toString());
+                const amountInTRD = totalUSDCNeeded.toNumber() / Math.pow(10, this.decimals) / price;
                 const { swapIxs, addressLookupTableAccounts: swapAddressLookupTableAccounts, outAmount, setupInstructions } = yield (0, swap_1.swap)({
                     connection: this.program.provider.connection,
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: constants_1.TRD_MINT.toString(),
                     outToken: constants_1.USDC_MINT.toString(),
-                    amount: totalUSDCNeeded.toNumber() / Math.pow(10, this.decimals),
-                    swapMode: 'ExactOut'
+                    amount: amountInTRD
                 });
                 if (swapIxs.length === 0) {
                     return;
@@ -1052,8 +1047,7 @@ class TriadProtocolClient {
                     wallet: this.program.provider.publicKey.toBase58(),
                     inToken: constants_1.USDC_MINT.toBase58(),
                     outToken: constants_1.TRD_MINT.toString(),
-                    amount: amountOfUSDC.toNumber(),
-                    swapMode: 'ExactIn'
+                    amount: amountOfUSDC.toNumber()
                 });
                 if (swapIxs.length > 0) {
                     ixs.push(...setupInstructions);

package/dist/utils/swap.d.ts

@@ -1,14 +1,14 @@
 import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
-export declare const swap: ({ connection, wallet, inToken, outToken, amount, swapMode }: {
+export declare const swap: ({ connection, wallet, inToken, outToken, amount }: {
     connection: Connection;
     wallet: string;
     inToken: string;
     outToken: string;
     amount: number;
-    swapMode: 'ExactIn' | 'ExactOut';
 }) => Promise<{
     swapIxs: TransactionInstruction[];
     addressLookupTableAccounts: AddressLookupTableAccount[];
     setupInstructions: TransactionInstruction[];
     outAmount: any;
 }>;
+export declare const getPrice: (token: string) => Promise<any>;

package/dist/utils/swap.js

@@ -12,19 +12,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swap = void 0;
+exports.getPrice = exports.swap = void 0;
 const index_1 = require("./pda/index");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
-const swap = ({ connection, wallet, inToken, outToken, amount, swapMode = 'ExactIn' }) => __awaiter(void 0, void 0, void 0, function* () {
+const swap = ({ connection, wallet, inToken, outToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
     const token = TOKENS[inToken];
     if (!token) {
         throw new Error('Token not found');
     }
     const formattedAmountIn = amount * Math.pow(10, token.decimals);
-    const quoteResponse = yield axios_1.default.get(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${formattedAmountIn}&swapMode=${swapMode}&slippageBps=20&onlyDirectRoutes=true&platformFeeBps=60`);
+    const quoteResponse = yield axios_1.default.get(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${inToken}&outputMint=${outToken}&amount=${formattedAmountIn}&slippageBps=20&onlyDirectRoutes=true&platformFeeBps=60`);
     const { data: quoteData } = quoteResponse;
     const swapResponse = yield axios_1.default.post('https://lite-api.jup.ag/swap/v1/swap-instructions', {
         quoteResponse: quoteData,
@@ -42,6 +42,12 @@ const swap = ({ connection, wallet, inToken, outToken, amount, swapMode = 'Exact
     };
 });
 exports.swap = swap;
+const getPrice = (token) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const response = yield axios_1.default.get(`https://lite-api.jup.ag/price/v3?ids=${token}`);
+    return (_b = (_a = response.data[token]) === null || _a === void 0 ? void 0 : _a.usdPrice) !== null && _b !== void 0 ? _b : 0;
+});
+exports.getPrice = getPrice;
 const deserializeInstruction = (instruction) => {
     return new web3_js_1.TransactionInstruction({
         programId: new web3_js_1.PublicKey(instruction.programId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "2.8.3-beta",
+  "version": "2.8.4-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",