test: token 2022 util

MeteoraAg · Jan 3, 2025 · 0be4b86 · 0be4b86
1 parent af5d176
commit 0be4b86
Show file tree

Hide file tree

Showing 12 changed files with 594 additions and 9 deletions.
diff --git a/Anchor.toml b/Anchor.toml
@@ -20,6 +20,10 @@ program = "./artifacts/token_2022.so"
 address = "LbVRzDTvBDEcrthxfZ4RL6yiq3uZw8bS6MwtdY6UhFQ"
 program = "./artifacts/lb_clmm.so"
 
+[[test.genesis]]
+address = "EBZDYx7599krFc4m2govwBdZcicr4GgepqC78m71nsHS"
+program = "./artifacts/transfer_hook_counter.so"
+
 [scripts]
 test = "yarn run ts-mocha --sort --type-check --bail -p ./tsconfig.json -t 1000000 tests/*.ts"
 build-local = "anchor build"

diff --git a/artifacts/token_2022.so b/artifacts/token_2022.so
diff --git a/artifacts/transfer_hook_counter.so b/artifacts/transfer_hook_counter.so
diff --git a/ts-client/package.json b/ts-client/package.json
@@ -12,7 +12,8 @@
   "scripts": {
     "build": "tsup",
     "start": "npm run build -- --watch",
-    "test": "jest 'src/test/sdk.test.ts'",
+    "test": "jest 'src/test/(sdk|token_2022).test.ts'",
+    "debug": "jest src/test/sdk_token2022.test.ts",
     "unit-test": "jest src/test/calculate_distribution.test.ts",
     "example": "dotenv -e .env npx ts-node src/example.ts",
     "start-server": "npx tsc && node dist/src/server/index.js"

diff --git a/ts-client/src/dlmm/helpers/token_2022.ts b/ts-client/src/dlmm/helpers/token_2022.ts
@@ -55,7 +55,9 @@ export async function getExtraAccountMetasForTransferHook(
   mintAccountInfo: AccountInfo<Buffer>
 ) {
   if (
-    ![TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID].includes(mintAccountInfo.owner)
+    ![TOKEN_PROGRAM_ID.toBase58(), TOKEN_2022_PROGRAM_ID.toBase58()].includes(
+      mintAccountInfo.owner.toBase58()
+    )
   ) {
     return [];
   }
@@ -143,7 +145,7 @@ function calculateInverseFee(transferFee: TransferFee, postFeeAmount: BN) {
   );
 }
 
-interface transferFeeIncludedAmount {
+interface TransferFeeIncludedAmount {
   amount: BN;
   transferFee: BN;
 }
@@ -152,7 +154,7 @@ export function calculateTransferFeeIncludedAmount(
   transferFeeExcludedAmount: BN,
   mint: Mint,
   currentEpoch: number
-): TransferFeeExcludedAmount {
+): TransferFeeIncludedAmount {
   if (transferFeeExcludedAmount.isZero()) {
     return {
       amount: new BN(0),

diff --git a/ts-client/src/test/calculate_distribution.test.ts b/ts-client/src/test/calculate_distribution.test.ts
@@ -20,13 +20,11 @@ import {
   Transaction,
 } from "@solana/web3.js";
 import babar from "babar";
-import Decimal from "decimal.js";
 import fs from "fs";
 import {
   calculateBidAskDistribution,
   calculateNormalDistribution,
   calculateSpotDistribution,
-  getPriceOfBinByBinId,
   toAmountsBothSideByStrategy,
   toAmountsOneSideByStrategy,
   toWeightDistribution,

diff --git a/ts-client/src/test/external/helper.ts b/ts-client/src/test/external/helper.ts
@@ -0,0 +1,34 @@
+import { Program, web3 } from "@coral-xyz/anchor";
+import { TransferHookCounter } from "./transfer_hook_counter";
+import { getExtraAccountMetaAddress } from "@solana/spl-token";
+
+export async function createExtraAccountMetaListAndCounter(
+  program: Program<TransferHookCounter>,
+  mint: web3.PublicKey
+) {
+  const extraAccountMetaList = getExtraAccountMetaAddress(
+    mint,
+    program.programId
+  );
+  const counterAccount = deriveCounter(mint, program.programId);
+
+  await program.methods
+    .initializeExtraAccountMetaList()
+    .accounts({
+      mint,
+      counterAccount,
+      extraAccountMetaList,
+    })
+    .rpc();
+
+  return [extraAccountMetaList, counterAccount];
+}
+
+export function deriveCounter(mint: web3.PublicKey, programId: web3.PublicKey) {
+  const [counter] = web3.PublicKey.findProgramAddressSync(
+    [Buffer.from("counter"), mint.toBuffer()],
+    programId
+  );
+
+  return counter;
+}
diff --git a/ts-client/src/test/external/program.ts b/ts-client/src/test/external/program.ts
@@ -0,0 +1,28 @@
+import { AnchorProvider, Program, Wallet, web3 } from "@coral-xyz/anchor";
+import {
+  TransferHookCounter,
+  IDL as TransferHookCounterIDL,
+} from "./transfer_hook_counter";
+import { Connection } from "@solana/web3.js";
+
+export const TRANSFER_HOOK_COUNTER_PROGRAM_ID = new web3.PublicKey(
+  "EBZDYx7599krFc4m2govwBdZcicr4GgepqC78m71nsHS"
+);
+
+export function createTransferHookCounterProgram(
+  wallet: Wallet,
+  programId: web3.PublicKey,
+  connection: Connection
+): Program<TransferHookCounter> {
+  const provider = new AnchorProvider(connection, wallet, {
+    maxRetries: 3,
+  });
+
+  const program = new Program<TransferHookCounter>(
+    TransferHookCounterIDL,
+    programId,
+    provider
+  );
+
+  return program;
+}
diff --git a/ts-client/src/test/external/transfer_hook_counter.ts b/ts-client/src/test/external/transfer_hook_counter.ts
@@ -0,0 +1,219 @@
+export type TransferHookCounter = {
+  "version": "0.1.0",
+  "name": "transfer_hook_counter",
+  "instructions": [
+    {
+      "name": "initializeExtraAccountMetaList",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "extraAccountMetaList",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "mint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "counterAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "transferHook",
+      "accounts": [
+        {
+          "name": "sourceToken",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "mint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "destinationToken",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "owner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "extraAccountMetaList",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "counterAccount",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    }
+  ],
+  "accounts": [
+    {
+      "name": "counterAccount",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "counter",
+            "type": "u32"
+          }
+        ]
+      }
+    }
+  ],
+  "errors": [
+    {
+      "code": 6000,
+      "name": "AmountTooBig",
+      "msg": "The amount is too big"
+    }
+  ]
+};
+
+export const IDL: TransferHookCounter = {
+  "version": "0.1.0",
+  "name": "transfer_hook_counter",
+  "instructions": [
+    {
+      "name": "initializeExtraAccountMetaList",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "extraAccountMetaList",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "mint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "counterAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "transferHook",
+      "accounts": [
+        {
+          "name": "sourceToken",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "mint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "destinationToken",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "owner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "extraAccountMetaList",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "counterAccount",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    }
+  ],
+  "accounts": [
+    {
+      "name": "counterAccount",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "counter",
+            "type": "u32"
+          }
+        ]
+      }
+    }
+  ],
+  "errors": [
+    {
+      "code": 6000,
+      "name": "AmountTooBig",
+      "msg": "The amount is too big"
+    }
+  ]
+};
diff --git a/ts-client/src/test/sdk.test.ts b/ts-client/src/test/sdk.test.ts
@@ -10,7 +10,6 @@ import {
   transfer,
 } from "@solana/spl-token";
 import {
-  ComputeBudgetProgram,
   Connection,
   Keypair,
   LAMPORTS_PER_SOL,
@@ -20,7 +19,6 @@ import {
 import Decimal from "decimal.js";
 import fs from "fs";
 import {
-  BASIS_POINT_MAX,
   DEFAULT_BIN_PER_POSITION,
   LBCLMM_PROGRAM_IDS,
 } from "../dlmm/constants";
@@ -35,6 +33,7 @@ import {
   findSwappableMinMaxBinId,
   getQPriceFromId,
 } from "../dlmm/helpers/math";
+import { DynamicPosition } from "../dlmm/helpers/positions";
 import { IDL } from "../dlmm/idl";
 import { DLMM } from "../dlmm/index";
 import {
@@ -43,7 +42,6 @@ import {
   ResizeSide,
   StrategyType,
 } from "../dlmm/types";
-import { DynamicPosition, wrapPosition } from "../dlmm/helpers/positions";
 
 const keypairBuffer = fs.readFileSync(
   "../keys/localnet/admin-bossj3JvwiNK7pvjr149DqdtJxf2gdygbcmEPTkb2F1.json",

diff --git a/ts-client/src/test/sdk_token2022.test.ts b/ts-client/src/test/sdk_token2022.test.ts