@pump-fun/pump-sdk 1.8.0 → 1.9.0-devnet.1

package/src/idl/pump.json

@@ -2715,6 +2715,134 @@
         }
       ]
     },
+    {
+      "name": "sync_user_volume_accumulator",
+      "discriminator": [
+        86,
+        31,
+        192,
+        87,
+        163,
+        87,
+        79,
+        238
+      ],
+      "accounts": [
+        {
+          "name": "user"
+        },
+        {
+          "name": "global_volume_accumulator",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  103,
+                  108,
+                  111,
+                  98,
+                  97,
+                  108,
+                  95,
+                  118,
+                  111,
+                  108,
+                  117,
+                  109,
+                  101,
+                  95,
+                  97,
+                  99,
+                  99,
+                  117,
+                  109,
+                  117,
+                  108,
+                  97,
+                  116,
+                  111,
+                  114
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "user_volume_accumulator",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  117,
+                  115,
+                  101,
+                  114,
+                  95,
+                  118,
+                  111,
+                  108,
+                  117,
+                  109,
+                  101,
+                  95,
+                  97,
+                  99,
+                  99,
+                  117,
+                  109,
+                  117,
+                  108,
+                  97,
+                  116,
+                  111,
+                  114
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "user"
+              }
+            ]
+          }
+        },
+        {
+          "name": "event_authority",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  95,
+                  95,
+                  101,
+                  118,
+                  101,
+                  110,
+                  116,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "program"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "update_global_authority",
       "discriminator": [
@@ -2991,6 +3119,19 @@
         131
       ]
     },
+    {
+      "name": "SyncUserVolumeAccumulatorEvent",
+      "discriminator": [
+        197,
+        122,
+        167,
+        124,
+        116,
+        81,
+        91,
+        255
+      ]
+    },
     {
       "name": "TradeEvent",
       "discriminator": [
@@ -3734,6 +3875,26 @@
         ]
       }
     },
+    {
+      "name": "SyncUserVolumeAccumulatorEvent",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "user",
+            "type": "pubkey"
+          },
+          {
+            "name": "total_claimed_tokens_before",
+            "type": "u64"
+          },
+          {
+            "name": "total_claimed_tokens_after",
+            "type": "u64"
+          }
+        ]
+      }
+    },
     {
       "name": "TradeEvent",
       "type": {
@@ -3858,6 +4019,10 @@
           {
             "name": "last_update_timestamp",
             "type": "i64"
+          },
+          {
+            "name": "has_total_claimed_tokens",
+            "type": "bool"
           }
         ]
       }

package/src/idl/pump.ts

@@ -2721,6 +2721,134 @@ export type Pump = {
         }
       ]
     },
+    {
+      "name": "syncUserVolumeAccumulator",
+      "discriminator": [
+        86,
+        31,
+        192,
+        87,
+        163,
+        87,
+        79,
+        238
+      ],
+      "accounts": [
+        {
+          "name": "user"
+        },
+        {
+          "name": "globalVolumeAccumulator",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  103,
+                  108,
+                  111,
+                  98,
+                  97,
+                  108,
+                  95,
+                  118,
+                  111,
+                  108,
+                  117,
+                  109,
+                  101,
+                  95,
+                  97,
+                  99,
+                  99,
+                  117,
+                  109,
+                  117,
+                  108,
+                  97,
+                  116,
+                  111,
+                  114
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "userVolumeAccumulator",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  117,
+                  115,
+                  101,
+                  114,
+                  95,
+                  118,
+                  111,
+                  108,
+                  117,
+                  109,
+                  101,
+                  95,
+                  97,
+                  99,
+                  99,
+                  117,
+                  109,
+                  117,
+                  108,
+                  97,
+                  116,
+                  111,
+                  114
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "user"
+              }
+            ]
+          }
+        },
+        {
+          "name": "eventAuthority",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  95,
+                  95,
+                  101,
+                  118,
+                  101,
+                  110,
+                  116,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "program"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "updateGlobalAuthority",
       "discriminator": [
@@ -2997,6 +3125,19 @@ export type Pump = {
         131
       ]
     },
+    {
+      "name": "syncUserVolumeAccumulatorEvent",
+      "discriminator": [
+        197,
+        122,
+        167,
+        124,
+        116,
+        81,
+        91,
+        255
+      ]
+    },
     {
       "name": "tradeEvent",
       "discriminator": [
@@ -3740,6 +3881,26 @@ export type Pump = {
         ]
       }
     },
+    {
+      "name": "syncUserVolumeAccumulatorEvent",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "user",
+            "type": "pubkey"
+          },
+          {
+            "name": "totalClaimedTokensBefore",
+            "type": "u64"
+          },
+          {
+            "name": "totalClaimedTokensAfter",
+            "type": "u64"
+          }
+        ]
+      }
+    },
     {
       "name": "tradeEvent",
       "type": {
@@ -3864,6 +4025,10 @@ export type Pump = {
           {
             "name": "lastUpdateTimestamp",
             "type": "i64"
+          },
+          {
+            "name": "hasTotalClaimedTokens",
+            "type": "bool"
           }
         ]
       }

package/src/sdk.ts

@@ -52,6 +52,7 @@ export function getPumpProgram(
 export const PUMP_PROGRAM_ID = new PublicKey(
   "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P",
 );
+
 export const PUMP_AMM_PROGRAM_ID = new PublicKey(
   "pAMMBay6oceH9fJKBRHGP5D4bD4sWpmSwMn52FMfXEA",
 );
@@ -564,28 +565,48 @@ export class PumpSdk {
     endTime: BN,
     dayNumber: BN,
     tokenSupplyPerDay: BN,
-    secondsInADay: BN = new BN(86400),
+    secondsInADay: BN = new BN(86_400),
     mint: PublicKey = PUMP_TOKEN_MINT,
     tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
-  ): Promise<TransactionInstruction[]> {
+  ): Promise<TransactionInstruction> {
     const { authority } = await this.fetchGlobal();
 
+    return await this.offlinePumpProgram.methods
+      .adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        secondsInADay,
+        dayNumber,
+        tokenSupplyPerDay,
+      )
+      .accountsPartial({
+        global: this.globalPda(),
+        authority,
+        mint,
+        tokenProgram,
+      })
+      .instruction();
+  }
+
+  async adminUpdateTokenIncentivesBothPrograms(
+    startTime: BN,
+    endTime: BN,
+    dayNumber: BN,
+    tokenSupplyPerDay: BN,
+    secondsInADay: BN = new BN(86_400),
+    mint: PublicKey = PUMP_TOKEN_MINT,
+    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
+  ): Promise<TransactionInstruction[]> {
     return [
-      await this.offlinePumpProgram.methods
-        .adminUpdateTokenIncentives(
-          startTime,
-          endTime,
-          secondsInADay,
-          dayNumber,
-          tokenSupplyPerDay,
-        )
-        .accountsPartial({
-          global: this.globalPda(),
-          authority,
-          mint,
-          tokenProgram,
-        })
-        .instruction(),
+      await this.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        dayNumber,
+        tokenSupplyPerDay,
+        secondsInADay,
+        mint,
+        tokenProgram,
+      ),
       await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
         startTime,
         endTime,
@@ -603,23 +624,32 @@ export class PumpSdk {
     payer: PublicKey,
     mint: PublicKey = PUMP_TOKEN_MINT,
     tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
+  ): Promise<TransactionInstruction> {
+    return await this.offlinePumpProgram.methods
+      .claimTokenIncentives()
+      .accountsPartial({
+        user,
+        payer,
+        mint,
+        tokenProgram,
+      })
+      .instruction();
+  }
+
+  async claimTokenIncentivesBothPrograms(
+    user: PublicKey,
+    payer: PublicKey,
+    mint: PublicKey = PUMP_TOKEN_MINT,
+    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
   ): Promise<TransactionInstruction[]> {
     return [
-      await this.offlinePumpProgram.methods
-        .claimTokenIncentives()
-        .accountsPartial({
-          user,
-          payer,
-          mint,
-          tokenProgram,
-        })
-        .instruction(),
-      ...(await this.pumpAmmSdk.claimTokenIncentives(
+      await this.claimTokenIncentives(user, payer, mint, tokenProgram),
+      await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
         tokenProgram,
-      )),
+      ),
     ];
   }
 
@@ -646,10 +676,13 @@ export class PumpSdk {
       userVolumeAccumulatorAccountInfo,
     );
 
-    return totalUnclaimedTokens(
-      globalVolumeAccumulator,
-      userVolumeAccumulator,
-    ).add(await this.pumpAmmSdk.getCurrentDayTokens(user));
+    return totalUnclaimedTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+
+  async getTotalUnclaimedTokensBothPrograms(user: PublicKey): Promise<BN> {
+    return (await this.getTotalUnclaimedTokens(user)).add(
+      await this.pumpAmmSdk.getTotalUnclaimedTokens(user),
+    );
   }
 
   async getCurrentDayTokens(user: PublicKey): Promise<BN> {
@@ -675,10 +708,32 @@ export class PumpSdk {
       userVolumeAccumulatorAccountInfo,
     );
 
-    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator);
+  }
+
+  async getCurrentDayTokensBothPrograms(user: PublicKey): Promise<BN> {
+    return (await this.getCurrentDayTokens(user)).add(
       await this.pumpAmmSdk.getCurrentDayTokens(user),
     );
   }
+
+  async syncUserVolumeAccumulator(
+    user: PublicKey
+  ): Promise<TransactionInstruction> {
+    return await this.offlinePumpProgram.methods
+      .syncUserVolumeAccumulator()
+      .accountsPartial({ user })
+      .instruction();
+  }
+
+  async syncUserVolumeAccumulatorBothPrograms(
+    user: PublicKey,    
+  ): Promise<TransactionInstruction[]> {
+    return [
+      await this.syncUserVolumeAccumulator(user),
+      await this.pumpAmmSdk.syncUserVolumeAccumulator(user),
+    ];
+  }
 }
 
 function getFeeRecipient(global: Global): PublicKey {