refactor: redundant code in solana tokens integration

hoodieshq · May 6, 2024 · fc18e3b · fc18e3b
1 parent 521bac4
commit fc18e3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 32 deletions.
diff --git a/libs/coin-modules/coin-solana/src/api/chain/program/constants.ts b/libs/coin-modules/coin-solana/src/api/chain/program/constants.ts
@@ -6,6 +6,5 @@ export const PARSED_PROGRAMS = {
   STAKE: "stake",
   SYSTEM: "system",
   SPL_TOKEN: "spl-token",
-  COMPUTE_BUDGET: "compute-budget",
   VOTE: "vote",
 } as const;
diff --git a/libs/coin-modules/coin-solana/src/api/chain/program/parser.ts b/libs/coin-modules/coin-solana/src/api/chain/program/parser.ts
@@ -1,8 +1,4 @@
-import {
-  ParsedInstruction,
-  PartiallyDecodedInstruction,
-  ComputeBudgetProgram,
-} from "@solana/web3.js";
+import { ParsedInstruction, PartiallyDecodedInstruction } from "@solana/web3.js";
 import { parseSplTokenInstruction, TokenInstructionDescriptor } from "../instruction/token";
 import { PARSED_PROGRAMS } from "./constants";
 import {
@@ -39,11 +35,6 @@ type ParsedProgram =
       title: string;
       instruction: TokenInstructionDescriptor;
     }
-  | {
-      program: "compute-budget";
-      title: string;
-      instruction: undefined;
-    }
   | {
       program: "unknown";
       title: "Unknown";
@@ -105,13 +96,6 @@ export const parse = (ix: ParsedInstruction | PartiallyDecodedInstruction): Pars
     }
   }
 
-  if (ComputeBudgetProgram.programId.equals(ix.programId)) {
-    return {
-      program: PARSED_PROGRAMS["COMPUTE_BUDGET"],
-      title: "Compute Budget",
-      instruction: undefined, // system instruction, doesn't make sense to parse in LL
-    };
-  }
   return unknown();
 };
 

diff --git a/libs/coin-modules/coin-solana/src/js-synchronization.ts b/libs/coin-modules/coin-solana/src/js-synchronization.ts
@@ -667,18 +667,6 @@ function getTokenAccOperationType({
   const parsedIxs = parseTxInstructions(tx);
   const [mainIx, ...otherIxs] = parsedIxs;
 
-  if (parsedIxs.length === 3) {
-    const [first, second, third] = parsedIxs;
-    if (
-      first.program === "compute-budget" &&
-      second.program === "compute-budget" &&
-      third.program === "spl-token" &&
-      third.instruction.type === "burn"
-    ) {
-      return "BURN";
-    }
-  }
-
   if (mainIx !== undefined && otherIxs.length === 0) {
     switch (mainIx.program) {
       case "spl-associated-token-account":
@@ -693,6 +681,8 @@ function getTokenAccOperationType({
             return "FREEZE";
           case "thawAccount":
             return "UNFREEZE";
+          case "burn":
+            return "BURN";
         }
     }
   }
@@ -704,7 +694,7 @@ function getTokenAccOperationType({
 function parseTxInstructions(tx: ParsedTransaction) {
   return tx.message.instructions
     .map(ix => parseQuiet(ix))
-    .filter(({ program }) => program !== "spl-memo");
+    .filter(({ program }) => program !== "spl-memo" && program !== "unknown");
 }
 
 function dropMemoLengthPrefixIfAny(memo: string) {

diff --git a/libs/ledgerjs/packages/cryptoassets/src/tokens.ts b/libs/ledgerjs/packages/cryptoassets/src/tokens.ts
@@ -424,7 +424,6 @@ function convertElrondESDTTokens([
   };
 }
 
-/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 function convertSplTokens([
   chainId,
   name,
-Original file line number
+Diff line change
@@ Expand Up / @@ -424,7 +424,6 @@ function convertElrondESDTTokens([ @@
       };
     }
-    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
     function convertSplTokens([
       chainId,
       name,
@@ Expand Down @@