wasabi-solana-ts 1.2.8 → 1.2.10

package/dist/error-handling/transactionErrorHandling.d.ts

@@ -1,4 +1,4 @@
-import { SendTransactionError, VersionedTransaction, TransactionInstruction } from '@solana/web3.js';
+import { SendTransactionError, VersionedTransaction } from '@solana/web3.js';
 export declare class SimulationError extends Error {
     error: string;
     transaction: VersionedTransaction;
@@ -12,10 +12,10 @@ type ErrorObject = {
     expected: boolean;
     program: string;
 };
+export declare const NOT_ENOUGH_SOL_ERROR = "Insufficient SOL for transaction fees. Please add more SOL and try again.";
 export declare const parseSendTransactionError: (error: SendTransactionError, transaction: VersionedTransaction) => ErrorObject | undefined;
 export declare const parseError: (instructionNumber: number, errorCode: number, transaction: VersionedTransaction) => ErrorObject | undefined;
 export declare const parseSimulationError: (error: SimulationError, transaction: VersionedTransaction) => ErrorObject | undefined;
 export declare const parseErrorLogs: (logs: string[] | undefined) => ErrorObject | undefined;
 export declare const matchError: (error: Error) => ErrorObject | undefined;
-export declare const getFailingSwapProgram: (instructions: TransactionInstruction[]) => string;
 export {};

package/dist/error-handling/transactionErrorHandling.js

@@ -23,13 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFailingSwapProgram = exports.matchError = exports.parseErrorLogs = exports.parseSimulationError = exports.parseError = exports.parseSendTransactionError = exports.SimulationError = void 0;
+exports.matchError = exports.parseErrorLogs = exports.parseSimulationError = exports.parseError = exports.parseSendTransactionError = exports.NOT_ENOUGH_SOL_ERROR = exports.SimulationError = void 0;
 const jupiter_1 = require("./jupiter");
 const titan_1 = require("./titan");
+const raydium_1 = require("./raydium");
+const dflow_1 = require("./dflow");
 const web3_js_1 = require("@solana/web3.js");
-const spl_token_1 = require("@solana/spl-token");
-const idl = __importStar(require("../idl/wasabi_solana.json"));
-const WasabiIDL = idl;
+const WasabiIDL = __importStar(require("../idl/wasabi_solana.json"));
 class SimulationError extends Error {
     error;
     transaction;
@@ -42,61 +42,84 @@ class SimulationError extends Error {
     }
 }
 exports.SimulationError = SimulationError;
-const wasabiProgramId = 'spicyTHtbmarmUxwFSHYpA8G4uP2nRNq38RReMpoZ9c';
-const wasabiExpectedErrors = [
-    6004, // MinTokensNotMet
-    6015, // PrincipalTooHigh
-    6017, // PriceTargetNotReached
-    6026 // LiquidationThresholdNotReached
+exports.NOT_ENOUGH_SOL_ERROR = "Insufficient SOL for transaction fees. Please add more SOL and try again.";
+const IDLS = [
+    WasabiIDL,
+    jupiter_1.IDL,
+    titan_1.IDL,
+    raydium_1.IDL,
+    dflow_1.IDL
 ];
-const jupiterProgramId = 'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4';
-const jupiterExpectedErrors = [
-    6001 // SlippageToleranceExceeded
-];
-const titanProgramId = 'T1TANpTeScyeqVzzgNViGDNrkQ6qHz9KrSBS4aNXvGT';
-const titanExpectedErrors = [
-    6008 // LessThanMinimumAmountOut
-];
-//@ts-ignore
-const raydiumErrors = [
-    6028, // Invalid first tick array
-];
-// Index errors by code for quick lookup
-const wasabiErrorIndex = WasabiIDL.errors.reduce((acc, error) => {
-    const expected = wasabiExpectedErrors.includes(error.code);
-    acc[error.code] = {
-        ...error,
-        expected,
-        program: 'Wasabi'
-    };
-    return acc;
-}, {});
-const findWasabiError = (code) => {
-    return wasabiErrorIndex[code];
+const programToExpectedErrors = {
+    [WasabiIDL.address]: [
+        6004, // MinTokensNotMet
+        6015, // PrincipalTooHigh
+        6017, // PriceTargetNotReached
+        6026 // LiquidationThresholdNotReached
+    ],
+    [jupiter_1.IDL.address]: [
+        6001 // SlippageToleranceExceeded
+    ],
+    [titan_1.IDL.address]: [
+        6008 // LessThanMinimumAmountOut
+    ],
+    [raydium_1.IDL.address]: [
+        6022, // TooLittleOutputReceived
+        6023, // TooMuchInputPaid
+    ],
+    [dflow_1.IDL.address]: [
+        15001, // SlippageLimitExceeded
+    ]
 };
-const jupiterErrorIndex = jupiter_1.IDL.errors.reduce((acc, error) => {
-    const expected = jupiterExpectedErrors.includes(error.code);
-    acc[error.code] = {
-        ...error,
-        expected,
-        program: 'Jupiter'
-    };
-    return acc;
-}, {});
-const findJupiterError = (code) => {
-    return jupiterErrorIndex[code];
+const programErrors = {};
+const programNames = {
+    [WasabiIDL.address]: 'Wasabi',
+    [jupiter_1.IDL.address]: 'Jupiter',
+    [titan_1.IDL.address]: 'Titan',
+    [raydium_1.IDL.address]: 'Raydium',
+    [dflow_1.IDL.address]: 'DFlow',
+    [web3_js_1.SystemProgram.programId.toBase58()]: 'System'
 };
-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];
+for (const idl of IDLS) {
+    const expectedErrors = programToExpectedErrors[idl.address] ?? [];
+    programErrors[idl.address] = idl.errors.reduce((acc, error) => {
+        acc[error.code] = {
+            ...error,
+            expected: expectedErrors.includes(error.code),
+            program: programNames[idl.address] ?? 'Unknown'
+        };
+        return acc;
+    }, {});
+}
+const findProgramError = (programId, code) => {
+    if (code === 0) {
+        return {
+            code,
+            name: 'InsufficientFundsForRent',
+            msg: 'Insufficient SOL to pay for rent',
+            expected: true,
+            program: programNames[programId] ?? 'Unknown'
+        };
+    }
+    else if (code === 1) {
+        return {
+            code,
+            name: 'InsufficientFunds',
+            msg: 'Insufficient Funds',
+            expected: true,
+            program: programNames[programId] ?? 'Unknown'
+        };
+    }
+    else if (code === 4) {
+        return {
+            code,
+            name: 'OwnerDoesNotMatch',
+            msg: 'Owner does not match',
+            expected: false,
+            program: programNames[programId] ?? 'Unknown'
+        };
+    }
+    return programErrors[programId]?.[code];
 };
 const parseSendTransactionError = (error, transaction) => {
     const message = error.transactionError.message;
@@ -115,20 +138,7 @@ const parseError = (instructionNumber, errorCode, transaction) => {
     // Validate instruction against parsed addresses
     const instruction = transaction.message.compiledInstructions[instructionNumber];
     const programId = transaction.message.staticAccountKeys[instruction.programIdIndex].toBase58();
-    const systemError = parseSystemError(errorCode, programId);
-    if (systemError) {
-        return systemError;
-    }
-    if (programId === wasabiProgramId) {
-        return findWasabiError(errorCode);
-    }
-    else if (programId === jupiterProgramId) {
-        return findJupiterError(errorCode);
-    }
-    else if (programId === titanProgramId) {
-        return findTitanError(errorCode);
-    }
-    return undefined;
+    return findProgramError(programId, errorCode);
 };
 exports.parseError = parseError;
 const parseSimulationError = (error, transaction) => {
@@ -175,58 +185,12 @@ const parseErrorLogs = (logs) => {
         if (match) {
             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 (failingProgramId.localeCompare(wasabiProgramId) === 0) {
-                return findWasabiError(errorCode);
-            }
-            else if (failingProgramId.localeCompare(web3_js_1.SystemProgram.programId.toBase58()) === 0) {
-                return parseSystemError(errorCode, web3_js_1.SystemProgram.programId.toBase58());
-            }
+            return findProgramError(failingProgramId, errorCode);
         }
     }
     return undefined;
 };
 exports.parseErrorLogs = parseErrorLogs;
-const parseSystemError = (code, programId) => {
-    const program = programId === wasabiProgramId
-        ? 'Wasabi'
-        : programId === jupiterProgramId
-            ? 'Jupiter'
-            : 'System';
-    if (code === 0) {
-        return {
-            code,
-            name: 'InsufficientFundsForRent',
-            msg: 'Insufficient SOL to pay for rent',
-            expected: true,
-            program
-        };
-    }
-    else if (code === 1) {
-        return {
-            code,
-            name: 'InsufficientFunds',
-            msg: 'Insufficient Funds',
-            expected: true,
-            program
-        };
-    }
-    else if (code === 4) {
-        return {
-            code,
-            name: 'OwnerDoesNotMatch',
-            msg: 'Owner does not match',
-            expected: false,
-            program
-        };
-    }
-    return undefined;
-};
 const matchError = (error) => {
     const msg = error.message;
     const errorPatterns = {
@@ -242,26 +206,26 @@ const matchError = (error) => {
             name: 'TransactionTooLarge',
             msg: 'Routing Error: Failed to find route',
             expected: true,
-            program: ''
+            program: 'System'
         },
         '.*encoding overruns Uint8Array.*': {
             code: 0,
             name: 'EncodingOverrunsUint8Array',
             msg: 'Routing Error: Failed to find route',
             expected: true,
-            program: ''
+            program: 'System'
         },
         '.*InsufficientFundsForFee.*': {
             code: 0,
             name: 'InsufficientFundsForFee',
-            msg: 'Fee Error: Insufficient funds for fee',
+            msg: exports.NOT_ENOUGH_SOL_ERROR,
             expected: true,
             program: 'ComputeBudget'
         },
         '.*InsufficientFundsForRent.*': {
             code: 0,
             name: 'InsufficientFundsForRent',
-            msg: 'Rent Error: Insufficient funds for rent',
+            msg: exports.NOT_ENOUGH_SOL_ERROR,
             expected: true,
             program: 'System'
         },
@@ -309,26 +273,3 @@ const matchError = (error) => {
     return undefined;
 };
 exports.matchError = matchError;
-const getFailingSwapProgram = (instructions) => {
-    let failingProgramIdx = 0;
-    for (let i = 0; i < instructions.length; i++) {
-        if (instructions[i].programId.toBase58().localeCompare(wasabiProgramId) === 0) {
-            failingProgramIdx = i + 1;
-            break;
-        }
-    }
-    try {
-        const failingProgram = instructions[failingProgramIdx].programId.toBase58();
-        return failingProgram === jupiterProgramId
-            ? 'Jupiter'
-            : failingProgram === spl_token_1.TOKEN_PROGRAM_ID.toBase58()
-                ? 'Token'
-                : failingProgram === spl_token_1.TOKEN_2022_PROGRAM_ID.toBase58()
-                    ? 'Token2022'
-                    : 'Raydium';
-    }
-    catch (error) {
-        return 'Unknown';
-    }
-};
-exports.getFailingSwapProgram = getFailingSwapProgram;

package/package.json

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