@zebec-network/zebec-stake-sdk 1.0.9 → 1.0.11

package/dist/service.d.ts

@@ -1,5 +1,5 @@
 import { Address, AnchorProvider, BN, Program, Provider } from "@coral-xyz/anchor";
-import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { TransactionPayload } from "@zebec-network/solana-common";
 import { ZebecStakeIdlV1 } from "./artifacts";
 import { ReadonlyProvider } from "./providers";
@@ -78,6 +78,8 @@ export declare class StakeService {
     getAllStakesCount(lockupAddress: Address): Promise<number>;
     getStakeSignatureForStake(stakeInfo: StakeInfo): Promise<string | null>;
     getAllStakesInfo(lockupAddress: Address): Promise<StakeInfo[]>;
+    get programId(): PublicKey;
+    get connection(): Connection;
 }
 export type InitLockupInstructionData = {
     rewardSchemes: ParsedRewardScheme[];

package/dist/service.js

@@ -126,7 +126,7 @@ class StakeService {
                 return provider.wallet.signTransaction(tx);
             };
         }
-        return new solana_common_1.TransactionPayload(this.provider.connection, errorMap, instructions, payerKey, signers, addressLookupTableAccounts, signTransaction);
+        return new solana_common_1.TransactionPayload(this.connection, errorMap, instructions, payerKey, signers, addressLookupTableAccounts, signTransaction);
     }
     async getInitLockupInstruction(creator, lockup, stakeToken, rewardToken, rewardVault, stakeVault, data) {
         return this.program.methods
@@ -177,7 +177,7 @@ class StakeService {
         const stakeToken = (0, anchor_1.translateAddress)(params.stakeToken);
         const rewardToken = (0, anchor_1.translateAddress)(params.rewardToken);
         const feeVault = (0, anchor_1.translateAddress)(params.feeVault);
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeToken);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeToken);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         const rewardSchemes = params.rewardSchemes.map((value) => {
             return {
@@ -185,9 +185,9 @@ class StakeService {
                 reward: new anchor_1.BN((0, core_utils_1.percentToBps)(value.rewardRate)),
             };
         });
-        const lockup = (0, pda_1.deriveLockupAddress)(params.name, this.program.programId);
-        const rewardVault = (0, pda_1.deriveRewardVaultAddress)(lockup, this.program.programId);
-        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.program.programId);
+        const lockup = (0, pda_1.deriveLockupAddress)(params.name, this.programId);
+        const rewardVault = (0, pda_1.deriveRewardVaultAddress)(lockup, this.programId);
+        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.programId);
         const fee = new anchor_1.BN((0, bignumber_js_1.BigNumber)(params.fee).times(UNITS_PER_STAKE_TOKEN).toFixed(0));
         const minimumStake = new anchor_1.BN((0, bignumber_js_1.BigNumber)(params.minimumStake).times(UNITS_PER_STAKE_TOKEN).toFixed(0));
         const instruction = await this.getInitLockupInstruction(creator, lockup, stakeToken, rewardToken, rewardVault, stakeVault, {
@@ -204,8 +204,8 @@ class StakeService {
         if (!staker) {
             throw new Error("MissingArgument: Please provide either staker address or publicKey in provider");
         }
-        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.program.programId);
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockup, this.provider.connection.commitment);
+        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.programId);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockup, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockup);
         }
@@ -214,16 +214,16 @@ class StakeService {
             throw new Error("Invalid lockperiod. Available options are: " + lockPeriods.map((l) => l.toString()).concat(", "));
         }
         const stakeToken = lockupAccount.stakedToken.tokenAddress;
-        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.program.programId);
-        const userNonce = (0, pda_1.deriveUserNonceAddress)(staker, lockup, this.program.programId);
-        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonce, this.provider.connection.commitment);
+        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.programId);
+        const userNonce = (0, pda_1.deriveUserNonceAddress)(staker, lockup, this.programId);
+        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonce, this.connection.commitment);
         let nonce = BigInt(0);
         if (userNonceAccount) {
             nonce = BigInt(userNonceAccount.nonce.toString());
         }
-        const stakePda = (0, pda_1.deriveStakeAddress)(staker, lockup, nonce, this.program.programId);
+        const stakePda = (0, pda_1.deriveStakeAddress)(staker, lockup, nonce, this.programId);
         const stakeVaultTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, stakeVault, true);
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeToken);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeToken);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         const instruction = await this.getStakeInstruction(lockup, stakeToken, stakeVault, staker, userNonce, stakePda, stakeVaultTokenAccount, {
             amount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(params.amount).times(UNITS_PER_STAKE_TOKEN).toFixed(0)),
@@ -237,28 +237,28 @@ class StakeService {
         if (!staker) {
             throw new Error("MissingArgument: Please provide either staker address or publicKey in provider");
         }
-        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.program.programId);
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockup, this.provider.connection.commitment);
+        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.programId);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockup, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockup);
         }
         const stakeToken = lockupAccount.stakedToken.tokenAddress;
         const rewardToken = lockupAccount.rewardToken.tokenAddress;
         const feeVault = lockupAccount.feeInfo.feeVault;
-        const stakePda = (0, pda_1.deriveStakeAddress)(staker, lockup, params.nonce, this.program.programId);
-        const rewardVault = (0, pda_1.deriveRewardVaultAddress)(lockup, this.program.programId);
-        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.program.programId);
+        const stakePda = (0, pda_1.deriveStakeAddress)(staker, lockup, params.nonce, this.programId);
+        const rewardVault = (0, pda_1.deriveRewardVaultAddress)(lockup, this.programId);
+        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.programId);
         const stakerTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, staker, true);
         const instruction = await this.getUnstakeInstruction(feeVault, lockup, stakePda, rewardToken, rewardVault, stakeToken, stakeVault, staker, stakerTokenAccount, new anchor_1.BN(params.nonce.toString()));
         return this._createPayload(staker, [instruction]);
     }
     async getLockupInfo(lockupAddress) {
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.provider.connection.commitment);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.connection.commitment);
         if (!lockupAccount) {
             return null;
         }
         const stakeTokenAddress = lockupAccount.stakedToken.tokenAddress;
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeTokenAddress);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeTokenAddress);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         return {
             address: lockupAddress.toString(),
@@ -285,17 +285,17 @@ class StakeService {
         };
     }
     async getStakeInfo(stakeAddress, lockupAddress) {
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.provider.connection.commitment);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockupAddress);
         }
         const stakeTokenAddress = lockupAccount.stakedToken.tokenAddress;
         const rewardTokenAddress = lockupAccount.rewardToken.tokenAddress;
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeTokenAddress);
-        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, rewardTokenAddress);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeTokenAddress);
+        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, rewardTokenAddress);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         const UNITS_PER_REWARD_TOKEN = constants_1.TEN_BIGNUM.pow(rewardTokenDecimals);
-        const stakeAccount = await this.program.account.userStakeData.fetchNullable(stakeAddress, this.provider.connection.commitment);
+        const stakeAccount = await this.program.account.userStakeData.fetchNullable(stakeAddress, this.connection.commitment);
         if (!stakeAccount) {
             return null;
         }
@@ -312,7 +312,7 @@ class StakeService {
         };
     }
     async getUserNonceInfo(userNonceAddress) {
-        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonceAddress, this.provider.connection.commitment);
+        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonceAddress, this.connection.commitment);
         if (!userNonceAccount) {
             return null;
         }
@@ -322,26 +322,26 @@ class StakeService {
         };
     }
     async getAllStakesInfoOfUser(userAdress, lockupAddress, options = {}) {
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.provider.connection.commitment);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockupAddress);
         }
         const stakeTokenAddress = lockupAccount.stakedToken.tokenAddress;
         const rewardTokenAddress = lockupAccount.rewardToken.tokenAddress;
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeTokenAddress);
-        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, rewardTokenAddress);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeTokenAddress);
+        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, rewardTokenAddress);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         const UNITS_PER_REWARD_TOKEN = constants_1.TEN_BIGNUM.pow(rewardTokenDecimals);
-        const userNonceAddress = (0, pda_1.deriveUserNonceAddress)(userAdress, lockupAddress, this.program.programId);
-        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonceAddress, this.provider.connection.commitment);
+        const userNonceAddress = (0, pda_1.deriveUserNonceAddress)(userAdress, lockupAddress, this.programId);
+        const userNonceAccount = await this.program.account.userNonce.fetchNullable(userNonceAddress, this.connection.commitment);
         if (!userNonceAccount) {
             return [];
         }
         const currentNonce = userNonceAccount.nonce.toNumber();
         const nonces = Array.from({ length: currentNonce }, (_, i) => BigInt(i));
-        const stakeAddresses = nonces.map((nonce) => (0, pda_1.deriveStakeAddress)(userAdress, lockupAddress, nonce, this.program.programId));
-        const accountInfos = await this.provider.connection.getMultipleAccountsInfo(stakeAddresses, {
-            commitment: "finalized",
+        const stakeAddresses = nonces.map((nonce) => (0, pda_1.deriveStakeAddress)(userAdress, lockupAddress, nonce, this.programId));
+        const accountInfos = await this.connection.getMultipleAccountsInfo(stakeAddresses, {
+            commitment: this.connection.commitment,
         });
         const stakeAccountsInfo = accountInfos.map((value, i) => {
             (0, assert_1.default)(value, "Account does not exists for stake address: " + stakeAddresses[i] + " at nonce: " + nonces[i]);
@@ -374,8 +374,8 @@ class StakeService {
     }
     async getAllStakesCount(lockupAddress) {
         const dataSize = this.program.account.userStakeData.size;
-        const accountInfos = await this.provider.connection.getProgramAccounts(this.program.programId, {
-            commitment: "finalized",
+        const accountInfos = await this.connection.getProgramAccounts(this.programId, {
+            commitment: this.connection.commitment,
             dataSlice: {
                 length: 0,
                 offset: 0,
@@ -395,7 +395,8 @@ class StakeService {
         return accountInfos.length;
     }
     async getStakeSignatureForStake(stakeInfo) {
-        const signatures = await (0, utils_1.callWithEnhancedBackoff)(async () => this.provider.connection.getSignaturesForAddress((0, anchor_1.translateAddress)(stakeInfo.address), {}, "finalized"));
+        const commitment = this.connection.commitment === "finalized" ? "finalized" : "confirmed";
+        const signatures = await (0, utils_1.callWithEnhancedBackoff)(async () => this.connection.getSignaturesForAddress((0, anchor_1.translateAddress)(stakeInfo.address), {}, commitment));
         const stakeSignatures = signatures.filter((s) => {
             return !s.err && (s.blockTime ?? 0) === stakeInfo.createdTime;
         });
@@ -403,18 +404,18 @@ class StakeService {
         return signatureInfo ? signatureInfo.signature : null;
     }
     async getAllStakesInfo(lockupAddress) {
-        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.provider.connection.commitment);
+        const lockupAccount = await this.program.account.lockup.fetchNullable(lockupAddress, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockupAddress);
         }
         const stakeTokenAddress = lockupAccount.stakedToken.tokenAddress;
         const rewardTokenAddress = lockupAccount.rewardToken.tokenAddress;
-        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, stakeTokenAddress);
-        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, rewardTokenAddress);
+        const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeTokenAddress);
+        const rewardTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, rewardTokenAddress);
         const UNITS_PER_STAKE_TOKEN = constants_1.TEN_BIGNUM.pow(stakeTokenDecimals);
         const UNITS_PER_REWARD_TOKEN = constants_1.TEN_BIGNUM.pow(rewardTokenDecimals);
         const dataSize = this.program.account.userStakeData.size;
-        const accountInfos = await this.provider.connection.getProgramAccounts(this.program.programId, {
+        const accountInfos = await this.connection.getProgramAccounts(this.programId, {
             commitment: "finalized",
             filters: [
                 {
@@ -444,5 +445,11 @@ class StakeService {
             return info;
         });
     }
+    get programId() {
+        return this.program.programId;
+    }
+    get connection() {
+        return this.provider.connection;
+    }
 }
 exports.StakeService = StakeService;

package/package.json

@@ -1,46 +1,47 @@
-{
-  "name": "@zebec-network/zebec-stake-sdk",
-  "version": "1.0.9",
-  "description": "An SDK for zebec network stake solana program",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "author": "Ashish Sapkota",
-  "license": "MIT",
-  "files": [
-    "dist"
-  ],
-  "keywords": [
-    "solana",
-    "zebec",
-    "zebec network",
-    "stake",
-    "staking"
-  ],
-  "scripts": {
-    "build": "npm run clean && tsc",
-    "clean": "rimraf ./dist",
-    "format": "prettier --write .",
-    "start": "ts-node src/index.ts",
-    "test": "ts-mocha -p ./tsconfig.json -t 1000000000"
-  },
-  "dependencies": {
-    "@coral-xyz/anchor": "^0.31.1",
-    "@solana/web3.js": "1.98.2",
-    "@types/bn.js": "^5.1.6",
-    "@zebec-network/core-utils": "^1.0.4",
-    "@zebec-network/solana-common": "^1.2.6",
-    "bignumber.js": "^9.3.0",
-    "buffer": "^6.0.3",
-    "dotenv": "^16.5.0"
-  },
-  "devDependencies": {
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.14.1",
-    "mocha": "^11.1.0",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "ts-mocha": "^11.1.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
-  }
+{
+  "name": "@zebec-network/zebec-stake-sdk",
+  "version": "1.0.11",
+  "description": "An SDK for zebec network stake solana program",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "author": "Ashish Sapkota",
+  "license": "MIT",
+  "files": [
+    "dist"
+  ],
+  "keywords": [
+    "solana",
+    "zebec",
+    "zebec network",
+    "stake",
+    "staking"
+  ],
+  "scripts": {
+    "build": "npm run clean && tsc",
+    "clean": "rimraf ./dist",
+    "format": "prettier --write .",
+    "start": "ts-node src/index.ts",
+    "test": "ts-mocha -p ./tsconfig.json -t 1000000000 test/**/*.test.ts",
+    "test:single": "ts-mocha -p ./tsconfig.json -t 1000000000"
+  },
+  "dependencies": {
+    "@coral-xyz/anchor": "^0.31.1",
+    "@solana/web3.js": "1.98.2",
+    "@zebec-network/core-utils": "^1.0.4",
+    "@zebec-network/solana-common": "^1.5.0",
+    "bignumber.js": "^9.3.0",
+    "buffer": "^6.0.3",
+    "dotenv": "^16.5.0"
+  },
+  "devDependencies": {
+    "@types/bn.js": "^5.1.6",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.14.1",
+    "mocha": "^11.1.0",
+    "prettier": "^3.5.3",
+    "rimraf": "^6.0.1",
+    "ts-mocha": "^11.1.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3"
+  }
 }