wasabi-solana-ts 1.2.5 → 1.2.7-regular-interest

package/dist/error-handling/transactionErrorHandling.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFailingSwapProgram = exports.matchError = exports.parseErrorLogs = exports.parseSimulationError = exports.parseError = exports.parseSendTransactionError = exports.SimulationError = void 0;
 const jupiter_1 = require("./jupiter");
+const titan_1 = require("./titan");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const idl = __importStar(require("../idl/wasabi_solana.json"));
@@ -52,6 +53,10 @@ const jupiterProgramId = 'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4';
 const jupiterExpectedErrors = [
     6001 // SlippageToleranceExceeded
 ];
+const titanProgramId = 'T1TANpTeScyeqVzzgNViGDNrkQ6qHz9KrSBS4aNXvGT';
+const titanExpectedErrors = [
+    6008 // LessThanMinimumAmountOut
+];
 //@ts-ignore
 const raydiumErrors = [
     6028, // Invalid first tick array
@@ -81,6 +86,18 @@ const jupiterErrorIndex = jupiter_1.IDL.errors.reduce((acc, error) => {
 const findJupiterError = (code) => {
     return jupiterErrorIndex[code];
 };
+const titanErrorIndex = titan_1.IDL.errors.reduce((acc, error) => {
+    const expected = titanExpectedErrors.includes(error.code);
+    acc[error.code] = {
+        ...error,
+        expected,
+        program: 'Titan'
+    };
+    return acc;
+}, {});
+const findTitanError = (code) => {
+    return titanErrorIndex[code];
+};
 const parseSendTransactionError = (error, transaction) => {
     const message = error.transactionError.message;
     // Parse error messages like: "Transaction simulation failed: Error processing Instruction 3: custom program error: 0x1771"
@@ -108,6 +125,9 @@ const parseError = (instructionNumber, errorCode, transaction) => {
     else if (programId === jupiterProgramId) {
         return findJupiterError(errorCode);
     }
+    else if (programId === titanProgramId) {
+        return findTitanError(errorCode);
+    }
     return undefined;
 };
 exports.parseError = parseError;
@@ -153,14 +173,19 @@ const parseErrorLogs = (logs) => {
         }
         const match = log.match(/^Program ([a-zA-Z0-9]+) failed: (?:.*?): (0x[0-9a-fA-F]+)$/);
         if (match) {
-            if (match[1].localeCompare(jupiterProgramId) === 0) {
-                return findJupiterError(parseInt(match[2]));
+            const [_, failingProgramId, errorHex] = match;
+            const errorCode = parseInt(errorHex);
+            if (failingProgramId.localeCompare(jupiterProgramId) === 0) {
+                return findJupiterError(errorCode);
+            }
+            else if (failingProgramId.localeCompare(titanProgramId) === 0) {
+                return findTitanError(errorCode);
             }
-            else if (match[1].localeCompare(wasabiProgramId) === 0) {
-                return findWasabiError(parseInt(match[2]));
+            else if (failingProgramId.localeCompare(wasabiProgramId) === 0) {
+                return findWasabiError(errorCode);
             }
-            else if (match[1].localeCompare(web3_js_1.SystemProgram.programId.toBase58())) {
-                return parseSystemError(parseInt(match[2]), web3_js_1.SystemProgram.programId.toBase58());
+            else if (failingProgramId.localeCompare(web3_js_1.SystemProgram.programId.toBase58())) {
+                return parseSystemError(errorCode, web3_js_1.SystemProgram.programId.toBase58());
             }
         }
     }

package/dist/idl/wasabi_solana.d.ts

@@ -7699,16 +7699,16 @@ export type WasabiSolana = {
             ];
         },
         {
-            "name": "recordInterestForLongPosition";
+            "name": "recordLongInterest";
             "discriminator": [
-                46,
-                3,
-                12,
-                151,
-                56,
-                105,
-                134,
-                60
+                101,
+                57,
+                251,
+                97,
+                19,
+                118,
+                203,
+                222
             ];
             "accounts": [
                 {
@@ -7722,25 +7722,16 @@ export type WasabiSolana = {
                     "name": "permission";
                 },
                 {
-                    "name": "lpVault";
-                    "writable": true;
-                    "relations": [
-                        "position"
-                    ];
-                },
-                {
-                    "name": "vault";
+                    "name": "pool";
                     "writable": true;
-                    "relations": [
-                        "lpVault"
-                    ];
                 },
                 {
                     "name": "position";
                     "writable": true;
                 },
                 {
-                    "name": "currency";
+                    "name": "lpVault";
+                    "writable": true;
                     "relations": [
                         "position"
                     ];
@@ -7798,9 +7789,6 @@ export type WasabiSolana = {
                             }
                         ];
                     };
-                },
-                {
-                    "name": "tokenProgram";
                 }
             ];
             "args": [
@@ -7811,16 +7799,16 @@ export type WasabiSolana = {
             ];
         },
         {
-            "name": "recordInterestForShortPosition";
+            "name": "recordShortInterest";
             "discriminator": [
-                0,
-                204,
-                6,
-                181,
+                54,
+                196,
+                121,
+                111,
                 120,
-                76,
-                118,
-                43
+                233,
+                41,
+                104
             ];
             "accounts": [
                 {
@@ -7834,26 +7822,19 @@ export type WasabiSolana = {
                     "name": "permission";
                 },
                 {
-                    "name": "lpVault";
+                    "name": "pool";
                     "writable": true;
-                    "relations": [
-                        "position"
-                    ];
-                },
-                {
-                    "name": "vault";
-                    "writable": true;
-                    "relations": [
-                        "lpVault"
-                    ];
                 },
                 {
                     "name": "position";
                     "writable": true;
                 },
                 {
-                    "name": "pool";
+                    "name": "lpVault";
                     "writable": true;
+                    "relations": [
+                        "position"
+                    ];
                 },
                 {
                     "name": "currencyVault";
@@ -7866,20 +7847,22 @@ export type WasabiSolana = {
                     "name": "collateralVault";
                     "writable": true;
                     "relations": [
-                        "pool"
+                        "pool",
+                        "position"
                     ];
                 },
                 {
-                    "name": "currency";
+                    "name": "vault";
+                    "writable": true;
                     "relations": [
-                        "position"
+                        "lpVault"
                     ];
                 },
+                {
+                    "name": "currency";
+                },
                 {
                     "name": "collateral";
-                    "relations": [
-                        "position"
-                    ];
                 },
                 {
                     "name": "debtController";
@@ -12183,11 +12166,6 @@ export type WasabiSolana = {
         },
         {
             "code": 6041;
-            "name": "invalidInterestAmount";
-            "msg": "Invalid interest amount";
-        },
-        {
-            "code": 6042;
             "name": "maxInterestExceeded";
             "msg": "Interest payment exceeds maximum interest";
         }
@@ -12607,6 +12585,10 @@ export type WasabiSolana = {
                         "name": "id";
                         "type": "pubkey";
                     },
+                    {
+                        "name": "trader";
+                        "type": "pubkey";
+                    },
                     {
                         "name": "interestPaid";
                         "type": "u64";
@@ -12622,6 +12604,10 @@ export type WasabiSolana = {
                     {
                         "name": "downPaymentReduced";
                         "type": "u64";
+                    },
+                    {
+                        "name": "isLong";
+                        "type": "bool";
                     }
                 ];
             };

package/dist/idl/wasabi_solana.json

@@ -7693,16 +7693,16 @@
             ]
         },
         {
-            "name": "record_interest_for_long_position",
+            "name": "record_long_interest",
             "discriminator": [
-                46,
-                3,
-                12,
-                151,
-                56,
-                105,
-                134,
-                60
+                101,
+                57,
+                251,
+                97,
+                19,
+                118,
+                203,
+                222
             ],
             "accounts": [
                 {
@@ -7716,25 +7716,16 @@
                     "name": "permission"
                 },
                 {
-                    "name": "lp_vault",
-                    "writable": true,
-                    "relations": [
-                        "position"
-                    ]
-                },
-                {
-                    "name": "vault",
-                    "writable": true,
-                    "relations": [
-                        "lp_vault"
-                    ]
+                    "name": "pool",
+                    "writable": true
                 },
                 {
                     "name": "position",
                     "writable": true
                 },
                 {
-                    "name": "currency",
+                    "name": "lp_vault",
+                    "writable": true,
                     "relations": [
                         "position"
                     ]
@@ -7792,9 +7783,6 @@
                             }
                         ]
                     }
-                },
-                {
-                    "name": "token_program"
                 }
             ],
             "args": [
@@ -7805,16 +7793,16 @@
             ]
         },
         {
-            "name": "record_interest_for_short_position",
+            "name": "record_short_interest",
             "discriminator": [
-                0,
-                204,
-                6,
-                181,
+                54,
+                196,
+                121,
+                111,
                 120,
-                76,
-                118,
-                43
+                233,
+                41,
+                104
             ],
             "accounts": [
                 {
@@ -7828,26 +7816,19 @@
                     "name": "permission"
                 },
                 {
-                    "name": "lp_vault",
-                    "writable": true,
-                    "relations": [
-                        "position"
-                    ]
-                },
-                {
-                    "name": "vault",
-                    "writable": true,
-                    "relations": [
-                        "lp_vault"
-                    ]
+                    "name": "pool",
+                    "writable": true
                 },
                 {
                     "name": "position",
                     "writable": true
                 },
                 {
-                    "name": "pool",
-                    "writable": true
+                    "name": "lp_vault",
+                    "writable": true,
+                    "relations": [
+                        "position"
+                    ]
                 },
                 {
                     "name": "currency_vault",
@@ -7860,20 +7841,22 @@
                     "name": "collateral_vault",
                     "writable": true,
                     "relations": [
-                        "pool"
+                        "pool",
+                        "position"
                     ]
                 },
                 {
-                    "name": "currency",
+                    "name": "vault",
+                    "writable": true,
                     "relations": [
-                        "position"
+                        "lp_vault"
                     ]
                 },
                 {
-                    "name": "collateral",
-                    "relations": [
-                        "position"
-                    ]
+                    "name": "currency"
+                },
+                {
+                    "name": "collateral"
                 },
                 {
                     "name": "debt_controller",
@@ -12177,11 +12160,6 @@
         },
         {
             "code": 6041,
-            "name": "InvalidInterestAmount",
-            "msg": "Invalid interest amount"
-        },
-        {
-            "code": 6042,
             "name": "MaxInterestExceeded",
             "msg": "Interest payment exceeds maximum interest"
         }
@@ -12601,6 +12579,10 @@
                         "name": "id",
                         "type": "pubkey"
                     },
+                    {
+                        "name": "trader",
+                        "type": "pubkey"
+                    },
                     {
                         "name": "interest_paid",
                         "type": "u64"
@@ -12616,6 +12598,10 @@
                     {
                         "name": "down_payment_reduced",
                         "type": "u64"
+                    },
+                    {
+                        "name": "is_long",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/utils/utils.d.ts

@@ -26,7 +26,6 @@ export declare function getPermission(program: Program<WasabiSolana>, admin: Pub
 export declare function uiAmountToAmount(uiAmount: number, decimals: number): BN;
 export declare function amountToUiAmount(amount: BN, decimals: number): number;
 export declare function getTokenProgram(connection: Connection, mint: PublicKey, mintCache?: TokenMintCache): Promise<PublicKey | null>;
-export declare function getTokenProgramAndDecimals(connection: Connection, mint: PublicKey): Promise<[PublicKey, number] | null>;
 export declare const PDA: {
     getLongPool(collateral: PublicKey, currency: PublicKey): PublicKey;
     getShortPool(collateral: PublicKey, currency: PublicKey): PublicKey;

package/dist/utils/utils.js

@@ -1,11 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PDA = exports.SEED_PREFIX = exports.METADATA_PROGRAM_ID = exports.WASABI_PROGRAM_ID = exports.SOL_MINT = void 0;
 exports.getPermission = getPermission;
 exports.uiAmountToAmount = uiAmountToAmount;
 exports.amountToUiAmount = amountToUiAmount;
 exports.getTokenProgram = getTokenProgram;
-exports.getTokenProgramAndDecimals = getTokenProgramAndDecimals;
 exports.getMintInfo = getMintInfo;
 exports.getMetaplexMetadata = getMetaplexMetadata;
 exports.getMaxWithdraw = getMaxWithdraw;
@@ -37,6 +39,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const js_1 = require("@metaplex-foundation/js");
 const TokenMintCache_1 = require("../cache/TokenMintCache");
+const node_cache_1 = __importDefault(require("node-cache"));
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111111');
 exports.WASABI_PROGRAM_ID = new web3_js_1.PublicKey('spicyTHtbmarmUxwFSHYpA8G4uP2nRNq38RReMpoZ9c');
 exports.METADATA_PROGRAM_ID = new web3_js_1.PublicKey('metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
@@ -61,6 +64,18 @@ function findProgramAddress(seeds, programId) {
     const [publicKey] = web3_js_1.PublicKey.findProgramAddressSync(seeds, programId);
     return publicKey;
 }
+const tokenAccountCache = new node_cache_1.default({ stdTTL: 5 * 60 }); // 5 minutes TTL
+const getTokenAccountCached = async (connection, address) => {
+    const cached = tokenAccountCache.get(address.toString());
+    if (cached) {
+        return cached;
+    }
+    const accountInfo = await connection.getAccountInfo(address);
+    if (accountInfo) {
+        tokenAccountCache.set(address.toString(), accountInfo);
+    }
+    return accountInfo;
+};
 async function getPermission(program, admin) {
     let permission;
     const superAdmin = exports.PDA.getSuperAdmin();
@@ -86,19 +101,6 @@ async function getTokenProgram(connection, mint, mintCache) {
     const mintInfo = await mintCache.getAccount(mint);
     return mintInfo.program;
 }
-async function getTokenProgramAndDecimals(connection, mint) {
-    const mintInfo = await connection.getAccountInfo(mint);
-    if (!mintInfo) {
-        return null;
-    }
-    if (mintInfo.owner.equals(spl_token_1.TOKEN_PROGRAM_ID) || mintInfo.owner.equals(spl_token_1.TOKEN_2022_PROGRAM_ID)) {
-        const mintDecimals = spl_token_1.MintLayout.decode(mintInfo.data).decimals;
-        return [mintInfo.owner, mintDecimals];
-    }
-    else {
-        return null;
-    }
-}
 exports.PDA = {
     getLongPool(collateral, currency) {
         return findProgramAddress([
@@ -326,7 +328,7 @@ function isNativeMint(mint) {
 async function createAtaIfNeeded(connection, owner, mint, ata, tokenProgram, payer) {
     if (isNativeMint(mint))
         return null;
-    const account = await connection.getAccountInfo(ata);
+    const account = await getTokenAccountCached(connection, ata);
     if (!account) {
         return (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payer ? payer : owner, ata, owner, mint, tokenProgram);
     }
@@ -339,7 +341,7 @@ async function createWrapSolInstruction(connection, owner, amount, includeCleanu
         ? [spl_token_1.NATIVE_MINT_2022, spl_token_1.TOKEN_2022_PROGRAM_ID]
         : [spl_token_1.NATIVE_MINT, spl_token_1.TOKEN_PROGRAM_ID];
     const ownerWrappedSolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(nativeMint, owner, false, tokenProgram);
-    const ownerWrappedSolAccount = await connection.getAccountInfo(ownerWrappedSolAta);
+    const ownerWrappedSolAccount = await getTokenAccountCached(connection, ownerWrappedSolAta);
     if (!ownerWrappedSolAccount) {
         setupIx.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, ownerWrappedSolAta, owner, nativeMint, tokenProgram));
         if (includeCleanupIx) {
@@ -364,7 +366,7 @@ async function createUnwrapSolInstructionWithPayer(connection, payer, owner, use
         ? [spl_token_1.NATIVE_MINT_2022, spl_token_1.TOKEN_2022_PROGRAM_ID]
         : [spl_token_1.NATIVE_MINT, spl_token_1.TOKEN_PROGRAM_ID];
     const ownerWrappedSolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(nativeMint, owner, false, tokenProgram);
-    const ownerWrappedSolAccount = await connection.getAccountInfo(ownerWrappedSolAta);
+    const ownerWrappedSolAccount = await getTokenAccountCached(connection, ownerWrappedSolAta);
     if (!ownerWrappedSolAccount) {
         setupIx.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payer, ownerWrappedSolAta, owner, nativeMint, tokenProgram));
     }
@@ -401,7 +403,7 @@ async function handleMint(connection, mint, options) {
     }
     if (options.owner) {
         const userAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.owner, true, tokenProgram);
-        const userTokenAccount = await connection.getAccountInfo(userAta);
+        const userTokenAccount = await getTokenAccountCached(connection, userAta);
         if (!userTokenAccount) {
             instructions.setupIx.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.owner, userAta, options.owner, mint, tokenProgram));
         }
@@ -501,7 +503,7 @@ async function handleOpenTokenAccounts({ program, owner, downPayment, fee, mintC
         setupIx.push((0, spl_token_1.createSyncNativeInstruction)(ownerPaymentAta, paymentTokenProgram));
         cleanupIx.push((0, spl_token_1.createCloseAccountInstruction)(ownerPaymentAta, owner, owner, [], paymentTokenProgram));
     }
-    const ownerPaymentAtaInfo = await program.provider.connection.getAccountInfo(ownerPaymentAta);
+    const ownerPaymentAtaInfo = await getTokenAccountCached(program.provider.connection, ownerPaymentAta);
     if (!ownerPaymentAtaInfo) {
         setupIx = [
             (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, ownerPaymentAta, owner, paymentMint, paymentTokenProgram),
@@ -529,7 +531,7 @@ async function handleCloseTokenAccounts(config, poolAccount) {
     const payoutTokenProgram = poolAccount.isLongPool ? currencyTokenProgram : collateralTokenProgram;
     const payoutIsSol = payoutMint.equals(spl_token_1.NATIVE_MINT);
     const ownerPayoutAta = (0, spl_token_1.getAssociatedTokenAddressSync)(payoutMint, config.owner, false, payoutTokenProgram);
-    const ownerPayoutAtaInfo = await config.program.provider.connection.getAccountInfo(ownerPayoutAta);
+    const ownerPayoutAtaInfo = await getTokenAccountCached(config.program.provider.connection, ownerPayoutAta);
     const setupIx = [];
     const cleanupIx = [];
     if (!ownerPayoutAtaInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasabi-solana-ts",
-  "version": "1.2.5",
+  "version": "1.2.7-regular-interest",
   "description": "Typescript library for the Wasabi program",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",