Merge branch 'main' into fixes

degenfrends · Jun 18, 2024 · 89368c4 · 89368c4
2 parents 408d0ed + ea9a5ea
commit 89368c4
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 111 deletions.
diff --git a/.changeset/fixedexports.md b/.changeset/fixedexports.md
@@ -0,0 +1,5 @@
+---
+'@degenfrends/solana-rugchecker': patch
+---
+
+## @degenfrends/solana-rugchecker: Initial version
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,14 +8,14 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: pnpm/action-setup@v2
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v4
               with:
                   version: 9
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
                   cache: 'pnpm'
+                  node-version: '20.x'
 
             - run: pnpm install --frozen-lockfile
             - run: pnpm run lint && pnpm run build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,17 +16,14 @@ jobs:
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-              with:
-                  node-version: 20.x
-            - uses: pnpm/action-setup@v2
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v4
               with:
                   version: 9
-                  node-version: 20.x
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
                   cache: 'pnpm'
+                  node-version: '20.x'
 
             - run: pnpm install --frozen-lockfile
             - name: Create Release Pull Request or Publish

diff --git a/dist/index.cjs b/dist/index.cjs
@@ -167,6 +167,7 @@ var PumpFunTrader = class {
       }
       txBuilder.add(instruction);
       const walletPrivateKey = await getKeyPairFromPrivateKey(privateKey);
+
       const transaction = await createTransaction(this.connection, txBuilder.instructions, walletPrivateKey.publicKey, priorityFee);
       if (isSimulation == false) {
         const signature = await sendTransaction(this.connection, transaction, [
@@ -389,6 +390,7 @@ var PumpFunTrader = class {
     });
     return instruction;
   }
+
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

diff --git a/dist/index.d.cts b/dist/index.d.cts
@@ -1,3 +1,4 @@
+
 import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
 
 declare const GLOBAL: PublicKey;
@@ -17,6 +18,7 @@ declare class PumpFunTrader {
     buy(privateKey: string, tokenAddress: string, amount: number, priorityFee?: number, slippage?: number, isSimulation?: boolean): Promise<void>;
     sell(privateKey: string, tokenAddress: string, tokenBalance: number, priorityFee?: number, slippage?: number, isSimulation?: boolean): Promise<void>;
     getBuyInstruction(privateKey: string, tokenAddress: string, amount: number, slippage: number | undefined, txBuilder: Transaction): Promise<TransactionInstruction | undefined>;
+
 }
 
 export { ASSOC_TOKEN_ACC_PROG, FEE_RECIPIENT, GLOBAL, PUMP_FUN_ACCOUNT, PUMP_FUN_PROGRAM, RENT, SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID, PumpFunTrader as default };
diff --git a/dist/index.d.mts b/dist/index.d.mts
@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
 
 declare const GLOBAL: PublicKey;
 declare const FEE_RECIPIENT: PublicKey;
@@ -16,6 +16,7 @@ declare class PumpFunTrader {
     setLogger(logger: any): this;
     buy(privateKey: string, tokenAddress: string, amount: number, priorityFee?: number, slippage?: number, isSimulation?: boolean): Promise<void>;
     sell(privateKey: string, tokenAddress: string, tokenBalance: number, priorityFee?: number, slippage?: number, isSimulation?: boolean): Promise<void>;
+    getBuyInstruction(privateKey: string, tokenAddress: string, amount: number, slippage: number | undefined, txBuilder: Transaction): Promise<TransactionInstruction | undefined>;
 }
 
 export { ASSOC_TOKEN_ACC_PROG, FEE_RECIPIENT, GLOBAL, PUMP_FUN_ACCOUNT, PUMP_FUN_PROGRAM, RENT, SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID, PumpFunTrader as default };
diff --git a/dist/index.js b/dist/index.js
@@ -119,6 +119,7 @@ var PumpFunTrader = class {
   }
   async buy(privateKey, tokenAddress, amount, priorityFee = 0, slippage = 0.25, isSimulation = true) {
     try {
+
       const txBuilder = new Transaction2();
       const instruction = await this.getBuyInstruction(privateKey, tokenAddress, amount, slippage, txBuilder);
       if (!instruction) {
@@ -267,14 +268,14 @@ var PumpFunTrader = class {
     } else {
       tokenAccount = tokenAccountAddress;
     }
+
     const solInLamports = amount * LAMPORTS_PER_SOL;
     const tokenOut = Math.floor(solInLamports * coinData["virtual_token_reserves"] / coinData["virtual_sol_reserves"]);
     const amountWithSlippage = amount * (1 + slippage);
     const maxSolCost = Math.floor(amountWithSlippage * LAMPORTS_PER_SOL);
     const ASSOCIATED_USER = tokenAccount;
     const USER = owner;
     const BONDING_CURVE = new PublicKey(coinData["bonding_curve"]);
-    const ASSOCIATED_BONDING_CURVE = new PublicKey(coinData["associated_bonding_curve"]);
     const keys = [
       {
         pubkey: GLOBAL,
@@ -343,6 +344,7 @@ var PumpFunTrader = class {
       bufferFromUInt64(maxSolCost)
     ]);
     const instruction = new TransactionInstruction({
+
       keys,
       programId: PUMP_FUN_PROGRAM,
       data

diff --git a/dist/index.mjs b/dist/index.mjs
@@ -61,7 +61,7 @@ __name(bufferFromUInt64, "bufferFromUInt64");
 import axios from "axios";
 async function getCoinData(mintStr) {
   try {
-    const url = `https://client-api-2-74b1891ee9f9.herokuapp.com/coins/${mintStr}`;
+    const url = `https://frontend-api.pump.fun/coins/${mintStr}`;
     const response = await axios.get(url, {
       headers: {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:125.0) Gecko/20100101 Firefox/125.0",
@@ -119,105 +119,14 @@ var PumpFunTrader = class {
   }
   async buy(privateKey, tokenAddress, amount, priorityFee = 0, slippage = 0.25, isSimulation = true) {
     try {
-      const coinData = await getCoinData(tokenAddress);
-      if (!coinData) {
-        this.logger.error("Failed to retrieve coin data...");
-        return;
-      }
-      const walletPrivateKey = await getKeyPairFromPrivateKey(privateKey);
-      const owner = walletPrivateKey.publicKey;
-      const token = new PublicKey(tokenAddress);
       const txBuilder = new Transaction2();
-      const tokenAccountAddress = await getAssociatedTokenAddress(token, owner, false);
-      const tokenAccountInfo = await this.connection.getAccountInfo(tokenAccountAddress);
-      let tokenAccount;
-      if (!tokenAccountInfo) {
-        txBuilder.add(createAssociatedTokenAccountInstruction(walletPrivateKey.publicKey, tokenAccountAddress, walletPrivateKey.publicKey, token));
-        tokenAccount = tokenAccountAddress;
-      } else {
-        tokenAccount = tokenAccountAddress;
+      const instruction = await this.getBuyInstruction(privateKey, tokenAddress, amount, slippage, txBuilder);
+      if (!instruction) {
+        this.logger.error("Failed to retrieve buy instruction...");
+        return;
       }
-      const solInLamports = amount * LAMPORTS_PER_SOL;
-      const tokenOut = Math.floor(solInLamports * coinData["virtual_token_reserves"] / coinData["virtual_sol_reserves"]);
-      const amountWithSlippage = amount * (1 + slippage);
-      const maxSolCost = Math.floor(amountWithSlippage * LAMPORTS_PER_SOL);
-      const ASSOCIATED_USER = tokenAccount;
-      const USER = owner;
-      const BONDING_CURVE = new PublicKey(coinData["bonding_curve"]);
-      const ASSOCIATED_BONDING_CURVE = new PublicKey(coinData["associated_bonding_curve"]);
-      const keys = [
-        {
-          pubkey: GLOBAL,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: FEE_RECIPIENT,
-          isSigner: false,
-          isWritable: true
-        },
-        {
-          pubkey: token,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: BONDING_CURVE,
-          isSigner: false,
-          isWritable: true
-        },
-        {
-          pubkey: ASSOCIATED_BONDING_CURVE,
-          isSigner: false,
-          isWritable: true
-        },
-        {
-          pubkey: ASSOCIATED_USER,
-          isSigner: false,
-          isWritable: true
-        },
-        {
-          pubkey: USER,
-          isSigner: false,
-          isWritable: true
-        },
-        {
-          pubkey: SYSTEM_PROGRAM_ID,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: TOKEN_PROGRAM_ID,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: RENT,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: PUMP_FUN_ACCOUNT,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: PUMP_FUN_PROGRAM,
-          isSigner: false,
-          isWritable: false
-        }
-      ];
-      const data = Buffer.concat([
-        bufferFromUInt64("16927863322537952870"),
-        bufferFromUInt64(tokenOut),
-        bufferFromUInt64(maxSolCost)
-      ]);
-      const instruction = new TransactionInstruction({
-        keys,
-        programId: PUMP_FUN_PROGRAM,
-        data
-      });
       txBuilder.add(instruction);
+      const walletPrivateKey = await getKeyPairFromPrivateKey(privateKey);
       const transaction = await createTransaction(this.connection, txBuilder.instructions, walletPrivateKey.publicKey, priorityFee);
       if (isSimulation == false) {
         const signature = await sendTransaction(this.connection, transaction, [
@@ -340,6 +249,106 @@ var PumpFunTrader = class {
       this.logger.log(error);
     }
   }
+  async getBuyInstruction(privateKey, tokenAddress, amount, slippage = 0.25, txBuilder) {
+    const coinData = await getCoinData(tokenAddress);
+    if (!coinData) {
+      this.logger.error("Failed to retrieve coin data...");
+      return;
+    }
+    const walletPrivateKey = await getKeyPairFromPrivateKey(privateKey);
+    const owner = walletPrivateKey.publicKey;
+    const token = new PublicKey(tokenAddress);
+    const tokenAccountAddress = await getAssociatedTokenAddress(token, owner, false);
+    const tokenAccountInfo = await this.connection.getAccountInfo(tokenAccountAddress);
+    let tokenAccount;
+    if (!tokenAccountInfo) {
+      txBuilder.add(createAssociatedTokenAccountInstruction(walletPrivateKey.publicKey, tokenAccountAddress, walletPrivateKey.publicKey, token));
+      tokenAccount = tokenAccountAddress;
+    } else {
+      tokenAccount = tokenAccountAddress;
+    }
+    const solInLamports = amount * LAMPORTS_PER_SOL;
+    const tokenOut = Math.floor(solInLamports * coinData["virtual_token_reserves"] / coinData["virtual_sol_reserves"]);
+    const amountWithSlippage = amount * (1 + slippage);
+    const maxSolCost = Math.floor(amountWithSlippage * LAMPORTS_PER_SOL);
+    const ASSOCIATED_USER = tokenAccount;
+    const USER = owner;
+    const BONDING_CURVE = new PublicKey(coinData["bonding_curve"]);
+    const ASSOCIATED_BONDING_CURVE = new PublicKey(coinData["associated_bonding_curve"]);
+    const keys = [
+      {
+        pubkey: GLOBAL,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: FEE_RECIPIENT,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: token,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: BONDING_CURVE,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: ASSOCIATED_BONDING_CURVE,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: ASSOCIATED_USER,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: USER,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: SYSTEM_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: RENT,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: PUMP_FUN_ACCOUNT,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: PUMP_FUN_PROGRAM,
+        isSigner: false,
+        isWritable: false
+      }
+    ];
+    const data = Buffer.concat([
+      bufferFromUInt64("16927863322537952870"),
+      bufferFromUInt64(tokenOut),
+      bufferFromUInt64(maxSolCost)
+    ]);
+    const instruction = new TransactionInstruction({
+      keys,
+      programId: PUMP_FUN_PROGRAM,
+      data
+    });
+    return instruction;
+  }
 };
 export {
   ASSOC_TOKEN_ACC_PROG,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,6 @@
     "version": "0.0.5",
     "description": "Functions to buy and sell SPL tokens on pump.fun",
     "main": "src/index.ts",
-    "type": "module",
     "scripts": {
         "build": "tsup src/index.ts --format cjs,esm --dts",
         "test": "jest --config jest.config.ts --detectOpenHandles --coverage --maxWorkers=1",