@pump-fun/pump-sdk 1.6.1 → 1.7.0-devnet.1

package/dist/esm/index.js

@@ -3955,7 +3955,28 @@ import {
 import {
   PublicKey as PublicKey2
 } from "@solana/web3.js";
+import BN3 from "bn.js";
+
+// src/tokenIncentives.ts
 import BN2 from "bn.js";
+function currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
+  const { startTime, endTime } = globalVolumeAccumulator;
+  let currentTimestampBn = new BN2(currentTimestamp);
+  if (currentTimestampBn.lt(startTime) || currentTimestampBn.gt(endTime)) {
+    return new BN2(0);
+  }
+  const { secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  let currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  let currentDaySolVolume = solVolumes[currentDayIndex];
+  if (currentDaySolVolume.eqn(0)) {
+    return new BN2(0);
+  }
+  const { currentSolVolume } = userVolumeAccumulator;
+  return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
+}
+
+// src/sdk.ts
 function getPumpProgram(connection, programId) {
   const pumpIdlAddressOverride = { ...pump_default };
   pumpIdlAddressOverride.address = programId.toString();
@@ -4196,7 +4217,7 @@ var PumpSdk = class {
     return await this.offlinePumpProgram.methods.buy(
       amount,
       solAmount.add(
-        solAmount.mul(new BN2(Math.floor(slippage * 10))).div(new BN2(1e3))
+        solAmount.mul(new BN3(Math.floor(slippage * 10))).div(new BN3(1e3))
       )
     ).accountsPartial({
       feeRecipient: getFeeRecipient(global),
@@ -4229,7 +4250,7 @@ var PumpSdk = class {
       await this.offlinePumpProgram.methods.sell(
         amount,
         solAmount.sub(
-          solAmount.mul(new BN2(Math.floor(slippage * 10))).div(new BN2(1e3))
+          solAmount.mul(new BN3(Math.floor(slippage * 10))).div(new BN3(1e3))
         )
       ).accountsPartial({
         feeRecipient: getFeeRecipient(global),
@@ -4311,54 +4332,79 @@ var PumpSdk = class {
     const creatorVault = this.creatorVaultPda(creator);
     const accountInfo = await this.connection.getAccountInfo(creatorVault);
     if (accountInfo === null) {
-      return new BN2(0);
+      return new BN3(0);
     }
     const rentExemptionLamports = await this.connection.getMinimumBalanceForRentExemption(
       accountInfo.data.length
     );
     if (accountInfo.lamports < rentExemptionLamports) {
-      return new BN2(0);
+      return new BN3(0);
     }
-    return new BN2(accountInfo.lamports - rentExemptionLamports);
+    return new BN3(accountInfo.lamports - rentExemptionLamports);
   }
-  async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new BN2(86400), mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
-    const global = await this.fetchGlobal();
-    return await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
-      startTime,
-      endTime,
-      secondsInADay,
-      dayNumber,
-      tokenSupplyPerDay
-    ).accountsPartial({
-      global: this.globalPda(),
-      authority: global.authority,
-      mint,
-      tokenProgram
-    }).instruction();
+  async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new BN3(86400), mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
+    const { authority } = await this.fetchGlobal();
+    return [
+      await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        secondsInADay,
+        dayNumber,
+        tokenSupplyPerDay
+      ).accountsPartial({
+        global: this.globalPda(),
+        authority,
+        mint,
+        tokenProgram
+      }).instruction(),
+      await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        dayNumber,
+        tokenSupplyPerDay,
+        secondsInADay,
+        mint,
+        tokenProgram
+      )
+    ];
   }
   async claimTokenIncentives(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = TOKEN_2022_PROGRAM_ID) {
-    const userPumpAta = getAssociatedTokenAddressSync(
-      mint,
-      user,
-      true,
-      tokenProgram
-    );
     return [
-      createAssociatedTokenAccountIdempotentInstruction(
-        payer,
-        userPumpAta,
+      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
         user,
+        payer,
         mint,
         tokenProgram
-      ),
-      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
+      }).instruction(),
+      ...await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
         tokenProgram
-      }).instruction()
+      )
     ];
   }
+  async getCurrentDayTokens(user) {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!globalVolumeAccumulatorAccountInfo || !userVolumeAccumulatorAccountInfo) {
+      return new BN3(0);
+    }
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo
+    );
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+      await this.pumpAmmSdk.getCurrentDayTokens(user)
+    );
+  }
 };
 function getFeeRecipient(global) {
   const feeRecipients = [global.feeRecipient, ...global.feeRecipients];

package/dist/index.d.mts

@@ -7902,8 +7902,9 @@ declare class PumpSdk {
     collectCoinCreatorFeeInstructions(coinCreator: PublicKey): Promise<TransactionInstruction[]>;
     adminSetCoinCreatorInstructions(newCoinCreator: PublicKey, mint: PublicKey): Promise<TransactionInstruction[]>;
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
-    adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
+    adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
     claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    getCurrentDayTokens(user: PublicKey): Promise<BN>;
 }
 
 export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, userVolumeAccumulatorPda };

package/dist/index.d.ts

@@ -7902,8 +7902,9 @@ declare class PumpSdk {
     collectCoinCreatorFeeInstructions(coinCreator: PublicKey): Promise<TransactionInstruction[]>;
     adminSetCoinCreatorInstructions(newCoinCreator: PublicKey, mint: PublicKey): Promise<TransactionInstruction[]>;
     getCreatorVaultBalance(creator: PublicKey): Promise<BN>;
-    adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction>;
+    adminUpdateTokenIncentives(startTime: BN, endTime: BN, dayNumber: BN, tokenSupplyPerDay: BN, secondsInADay?: BN, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
     claimTokenIncentives(user: PublicKey, payer: PublicKey, mint?: PublicKey, tokenProgram?: PublicKey): Promise<TransactionInstruction[]>;
+    getCurrentDayTokens(user: PublicKey): Promise<BN>;
 }
 
 export { BONDING_CURVE_NEW_SIZE, type BondingCurve, CANONICAL_POOL_INDEX, type Global, PUMP_AMM_PROGRAM_ID, PUMP_PROGRAM_ID, type Pump, PumpSdk, bondingCurvePda, canonicalPumpPoolPda, creatorVaultPda, getBuySolAmountFromTokenAmount, getBuyTokenAmountFromSolAmount, getPumpProgram, getSellSolAmountFromTokenAmount, globalPda, globalVolumeAccumulatorPda, newBondingCurve, pump as pumpIdl, pumpPoolAuthorityPda, userVolumeAccumulatorPda };

package/dist/index.js

@@ -4000,7 +4000,28 @@ var import_anchor = require("@coral-xyz/anchor");
 var import_pump_swap_sdk = require("@pump-fun/pump-swap-sdk");
 var import_spl_token = require("@solana/spl-token");
 var import_web32 = require("@solana/web3.js");
+var import_bn3 = __toESM(require("bn.js"));
+
+// src/tokenIncentives.ts
 var import_bn2 = __toESM(require("bn.js"));
+function currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator, currentTimestamp = Date.now() / 1e3) {
+  const { startTime, endTime } = globalVolumeAccumulator;
+  let currentTimestampBn = new import_bn2.default(currentTimestamp);
+  if (currentTimestampBn.lt(startTime) || currentTimestampBn.gt(endTime)) {
+    return new import_bn2.default(0);
+  }
+  const { secondsInADay, totalTokenSupply, solVolumes } = globalVolumeAccumulator;
+  let currentDayIndex = currentTimestampBn.sub(startTime).div(secondsInADay).toNumber();
+  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  let currentDaySolVolume = solVolumes[currentDayIndex];
+  if (currentDaySolVolume.eqn(0)) {
+    return new import_bn2.default(0);
+  }
+  const { currentSolVolume } = userVolumeAccumulator;
+  return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
+}
+
+// src/sdk.ts
 function getPumpProgram(connection, programId) {
   const pumpIdlAddressOverride = { ...pump_default };
   pumpIdlAddressOverride.address = programId.toString();
@@ -4241,7 +4262,7 @@ var PumpSdk = class {
     return await this.offlinePumpProgram.methods.buy(
       amount,
       solAmount.add(
-        solAmount.mul(new import_bn2.default(Math.floor(slippage * 10))).div(new import_bn2.default(1e3))
+        solAmount.mul(new import_bn3.default(Math.floor(slippage * 10))).div(new import_bn3.default(1e3))
       )
     ).accountsPartial({
       feeRecipient: getFeeRecipient(global),
@@ -4274,7 +4295,7 @@ var PumpSdk = class {
       await this.offlinePumpProgram.methods.sell(
         amount,
         solAmount.sub(
-          solAmount.mul(new import_bn2.default(Math.floor(slippage * 10))).div(new import_bn2.default(1e3))
+          solAmount.mul(new import_bn3.default(Math.floor(slippage * 10))).div(new import_bn3.default(1e3))
         )
       ).accountsPartial({
         feeRecipient: getFeeRecipient(global),
@@ -4356,54 +4377,79 @@ var PumpSdk = class {
     const creatorVault = this.creatorVaultPda(creator);
     const accountInfo = await this.connection.getAccountInfo(creatorVault);
     if (accountInfo === null) {
-      return new import_bn2.default(0);
+      return new import_bn3.default(0);
     }
     const rentExemptionLamports = await this.connection.getMinimumBalanceForRentExemption(
       accountInfo.data.length
     );
     if (accountInfo.lamports < rentExemptionLamports) {
-      return new import_bn2.default(0);
+      return new import_bn3.default(0);
     }
-    return new import_bn2.default(accountInfo.lamports - rentExemptionLamports);
+    return new import_bn3.default(accountInfo.lamports - rentExemptionLamports);
   }
-  async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new import_bn2.default(86400), mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
-    const global = await this.fetchGlobal();
-    return await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
-      startTime,
-      endTime,
-      secondsInADay,
-      dayNumber,
-      tokenSupplyPerDay
-    ).accountsPartial({
-      global: this.globalPda(),
-      authority: global.authority,
-      mint,
-      tokenProgram
-    }).instruction();
+  async adminUpdateTokenIncentives(startTime, endTime, dayNumber, tokenSupplyPerDay, secondsInADay = new import_bn3.default(86400), mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
+    const { authority } = await this.fetchGlobal();
+    return [
+      await this.offlinePumpProgram.methods.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        secondsInADay,
+        dayNumber,
+        tokenSupplyPerDay
+      ).accountsPartial({
+        global: this.globalPda(),
+        authority,
+        mint,
+        tokenProgram
+      }).instruction(),
+      await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
+        startTime,
+        endTime,
+        dayNumber,
+        tokenSupplyPerDay,
+        secondsInADay,
+        mint,
+        tokenProgram
+      )
+    ];
   }
   async claimTokenIncentives(user, payer, mint = PUMP_TOKEN_MINT, tokenProgram = import_spl_token.TOKEN_2022_PROGRAM_ID) {
-    const userPumpAta = (0, import_spl_token.getAssociatedTokenAddressSync)(
-      mint,
-      user,
-      true,
-      tokenProgram
-    );
     return [
-      (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
-        payer,
-        userPumpAta,
+      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
         user,
+        payer,
         mint,
         tokenProgram
-      ),
-      await this.offlinePumpProgram.methods.claimTokenIncentives().accountsPartial({
+      }).instruction(),
+      ...await this.pumpAmmSdk.claimTokenIncentives(
         user,
         payer,
         mint,
         tokenProgram
-      }).instruction()
+      )
     ];
   }
+  async getCurrentDayTokens(user) {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0]
+    ]);
+    if (!globalVolumeAccumulatorAccountInfo || !userVolumeAccumulatorAccountInfo) {
+      return new import_bn3.default(0);
+    }
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo
+    );
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+      await this.pumpAmmSdk.getCurrentDayTokens(user)
+    );
+  }
 };
 function getFeeRecipient(global) {
   const feeRecipients = [global.feeRecipient, ...global.feeRecipients];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pump-fun/pump-sdk",
-  "version": "1.6.1",
+  "version": "1.7.0-devnet.1",
   "description": "Pump Bonding Curve SDK",
   "keywords": [],
   "homepage": "https://github.com/pump-fun/pump-sdk#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@pump-fun/pump-swap-sdk": "^0.0.1-beta.60",
+    "@pump-fun/pump-swap-sdk": "^0.0.1-beta.82",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",

package/src/sdk.ts

@@ -27,7 +27,13 @@ import {
   globalVolumeAccumulatorPda,
   userVolumeAccumulatorPda,
 } from "./pda";
-import { BondingCurve, Global, GlobalVolumeAccumulator, UserVolumeAccumulator } from "./state";
+import {
+  BondingCurve,
+  Global,
+  GlobalVolumeAccumulator,
+  UserVolumeAccumulator,
+} from "./state";
+import { currentDayTokens } from "./tokenIncentives";
 
 export function getPumpProgram(
   connection: Connection,
@@ -133,14 +139,18 @@ export class PumpSdk {
     );
   }
 
-  decodeGlobalVolumeAccumulator(accountInfo: AccountInfo<Buffer>): GlobalVolumeAccumulator {
+  decodeGlobalVolumeAccumulator(
+    accountInfo: AccountInfo<Buffer>,
+  ): GlobalVolumeAccumulator {
     return this.offlinePumpProgram.coder.accounts.decode<GlobalVolumeAccumulator>(
       "globalVolumeAccumulator",
       accountInfo.data,
     );
   }
 
-  decodeUserVolumeAccumulator(accountInfo: AccountInfo<Buffer>): UserVolumeAccumulator {
+  decodeUserVolumeAccumulator(
+    accountInfo: AccountInfo<Buffer>,
+  ): UserVolumeAccumulator {
     return this.offlinePumpProgram.coder.accounts.decode<UserVolumeAccumulator>(
       "userVolumeAccumulator",
       accountInfo.data,
@@ -202,7 +212,9 @@ export class PumpSdk {
     );
   }
 
-  async fetchUserVolumeAccumulator(user: PublicKey): Promise<UserVolumeAccumulator> {
+  async fetchUserVolumeAccumulator(
+    user: PublicKey,
+  ): Promise<UserVolumeAccumulator> {
     return await this.pumpProgram.account.userVolumeAccumulator.fetch(
       this.userVolumeAccumulatorPda(user)[0],
     );
@@ -547,7 +559,7 @@ export class PumpSdk {
     return new BN(accountInfo.lamports - rentExemptionLamports);
   }
 
-  async adminUpdateTokenIncentives(  
+  async adminUpdateTokenIncentives(
     startTime: BN,
     endTime: BN,
     dayNumber: BN,
@@ -555,58 +567,89 @@ export class PumpSdk {
     secondsInADay: BN = new BN(86400),
     mint: PublicKey = PUMP_TOKEN_MINT,
     tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
-  ): Promise<TransactionInstruction> {
-    const global = await this.fetchGlobal();
+  ): Promise<TransactionInstruction[]> {
+    const { authority } = await this.fetchGlobal();
 
-    return await this.offlinePumpProgram.methods
-      .adminUpdateTokenIncentives(
+    return [
+      await this.offlinePumpProgram.methods
+        .adminUpdateTokenIncentives(
+          startTime,
+          endTime,
+          secondsInADay,
+          dayNumber,
+          tokenSupplyPerDay,
+        )
+        .accountsPartial({
+          global: this.globalPda(),
+          authority,
+          mint,
+          tokenProgram,
+        })
+        .instruction(),
+      await this.pumpAmmAdminSdk.adminUpdateTokenIncentives(
         startTime,
         endTime,
-        secondsInADay,
         dayNumber,
         tokenSupplyPerDay,
-      )
-      .accountsPartial({
-        global: this.globalPda(),
-        authority: global.authority,
+        secondsInADay,
         mint,
         tokenProgram,
-      })
-      .instruction();
+      ),
+    ];
   }
 
   async claimTokenIncentives(
     user: PublicKey,
     payer: PublicKey,
     mint: PublicKey = PUMP_TOKEN_MINT,
-    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID
+    tokenProgram: PublicKey = TOKEN_2022_PROGRAM_ID,
   ): Promise<TransactionInstruction[]> {
-    const userPumpAta = getAssociatedTokenAddressSync(
-      mint,
-      user,
-      true,
-      tokenProgram,
-    );
-
     return [
-      createAssociatedTokenAccountIdempotentInstruction(
-        payer,
-        userPumpAta,
-        user,
-        mint,
-        tokenProgram,
-      ),
       await this.offlinePumpProgram.methods
         .claimTokenIncentives()
-        .accountsPartial({          
+        .accountsPartial({
           user,
           payer,
           mint,
           tokenProgram,
         })
         .instruction(),
+      ...(await this.pumpAmmSdk.claimTokenIncentives(
+        user,
+        payer,
+        mint,
+        tokenProgram,
+      )),
     ];
-  } 
+  }
+
+  async getCurrentDayTokens(user: PublicKey): Promise<BN> {
+    const [
+      globalVolumeAccumulatorAccountInfo,
+      userVolumeAccumulatorAccountInfo,
+    ] = await this.connection.getMultipleAccountsInfo([
+      globalVolumeAccumulatorPda()[0],
+      userVolumeAccumulatorPda(user)[0],
+    ]);
+
+    if (
+      !globalVolumeAccumulatorAccountInfo ||
+      !userVolumeAccumulatorAccountInfo
+    ) {
+      return new BN(0);
+    }
+
+    const globalVolumeAccumulator = this.decodeGlobalVolumeAccumulator(
+      globalVolumeAccumulatorAccountInfo,
+    );
+    const userVolumeAccumulator = this.decodeUserVolumeAccumulator(
+      userVolumeAccumulatorAccountInfo,
+    );
+
+    return currentDayTokens(globalVolumeAccumulator, userVolumeAccumulator).add(
+      await this.pumpAmmSdk.getCurrentDayTokens(user),
+    );
+  }
 }
 
 function getFeeRecipient(global: Global): PublicKey {

package/src/tokenIncentives.ts

@@ -0,0 +1,35 @@
+import BN from "bn.js";
+import { GlobalVolumeAccumulator, UserVolumeAccumulator } from "./state";
+
+export function currentDayTokens(
+  globalVolumeAccumulator: GlobalVolumeAccumulator,
+  userVolumeAccumulator: UserVolumeAccumulator,
+  currentTimestamp: number = Date.now() / 1000,
+): BN {
+  const { startTime, endTime } = globalVolumeAccumulator;
+
+  let currentTimestampBn = new BN(currentTimestamp);
+
+  if (currentTimestampBn.lt(startTime) || currentTimestampBn.gt(endTime)) {
+    return new BN(0);
+  }
+
+  const { secondsInADay, totalTokenSupply, solVolumes } =
+    globalVolumeAccumulator;
+
+  let currentDayIndex = currentTimestampBn
+    .sub(startTime)
+    .div(secondsInADay)
+    .toNumber();
+
+  let currentDayTokenSupply = totalTokenSupply[currentDayIndex];
+  let currentDaySolVolume = solVolumes[currentDayIndex];
+
+  if (currentDaySolVolume.eqn(0)) {
+    return new BN(0);
+  }
+
+  const { currentSolVolume } = userVolumeAccumulator;
+
+  return currentSolVolume.mul(currentDayTokenSupply).div(currentDaySolVolume);
+}