@zebec-network/solana-payroll-sdk 2.3.1 → 2.5.0

package/dist/instructions.d.ts

@@ -136,6 +136,10 @@ export declare function createCompleteUnlockInstruction(program: Program<ZebecPa
     centralVaultTokenAta: PublicKey;
     companyTokenAta: PublicKey;
     depositMint: PublicKey;
+    centralVault: PublicKey;
+    centralVaultUsxAta: PublicKey;
+    usxMint: PublicKey;
+    companyUsxAta: PublicKey;
 }, data: {
     companyId: number[];
     nonce: BN;
@@ -143,10 +147,12 @@ export declare function createCompleteUnlockInstruction(program: Program<ZebecPa
 export declare function createDistributeRewardsInstruction(program: Program<ZebecPayrollIdl>, accounts: {
     admin: PublicKey;
     yieldConfig: PublicKey;
+    checkAccount: PublicKey;
 }, data: {
     distributions: {
         companyId: number[];
         nonce: BN;
         amount: BN;
     }[];
+    checkId: number[];
 }, remainingAccounts: AccountMeta[]): Promise<TransactionInstruction>;

package/dist/instructions.js

@@ -177,15 +177,20 @@ export async function createCompleteUnlockInstruction(program, accounts, data) {
         centralVaultTokenAta: accounts.centralVaultTokenAta,
         companyTokenAta: accounts.companyTokenAta,
         depositMint: accounts.depositMint,
+        centralVault: accounts.centralVault,
+        centralVaultUsxAta: accounts.centralVaultUsxAta,
+        usxMint: accounts.usxMint,
+        companyUsxAta: accounts.companyUsxAta,
     })
         .instruction();
 }
 export async function createDistributeRewardsInstruction(program, accounts, data, remainingAccounts) {
     return program.methods
-        .distributeRewards(data.distributions)
+        .distributeRewards(data.checkId, data.distributions)
         .accountsPartial({
         admin: accounts.admin,
         yieldConfig: accounts.yieldConfig,
+        checkAccount: accounts.checkAccount,
     })
         .remainingAccounts(remainingAccounts)
         .instruction();

package/dist/pda.d.ts

@@ -5,3 +5,4 @@ export declare function derivePayrollVaultPda(metatadata: Address, payrollProgra
 export declare function deriveYieldConfigPda(configProgramId: Address): [PublicKey, number];
 export declare function deriveCompanyDepositPda(companyId: Buffer, nonce: bigint, payrollProgramId: Address): [PublicKey, number];
 export declare function deriveCompanyNoncePda(companyId: Buffer, payrollProgramId: Address): [PublicKey, number];
+export declare function deriveCheckAccountPda(checkId: Buffer | Uint8Array, payrollProgramId: Address): [PublicKey, number];

package/dist/pda.js

@@ -30,3 +30,6 @@ export function deriveCompanyDepositPda(companyId, nonce, payrollProgramId) {
 export function deriveCompanyNoncePda(companyId, payrollProgramId) {
     return PublicKey.findProgramAddressSync([companyId], translateAddress(payrollProgramId));
 }
+export function deriveCheckAccountPda(checkId, payrollProgramId) {
+    return PublicKey.findProgramAddressSync([checkId], translateAddress(payrollProgramId));
+}

package/dist/services.js

@@ -9,7 +9,7 @@ import { BigNumber } from "bignumber.js";
 import { BN } from "bn.js";
 import { PAYROLL_NAME_BUFFER_SIZE, USX_DECIMALS } from "./constants.js";
 import { createCancelPayrollInstruction, createCancelUnlockInstruction, createChangeRecipientInstruction, createCompleteUnlockInstruction, createCreatePayrollInstruction, createDistributeRewardsInstruction, createPauseResumePayrollInstruction, createRequestUnlockInstruction, createSetTopupDelegateInstruction, createTopupPayrollInstruction, createTransferFeesInstruction, createWithdrawPayrollInstruction, createYieldDepositInstruction, } from "./instructions.js";
-import { deriveCompanyDepositPda, deriveCompanyNoncePda, derivePayrollConfigPda, derivePayrollVaultPda, deriveYieldConfigPda, } from "./pda.js";
+import { deriveCheckAccountPda, deriveCompanyDepositPda, deriveCompanyNoncePda, derivePayrollConfigPda, derivePayrollVaultPda, deriveYieldConfigPda, } from "./pda.js";
 import { getFeeInfoForPayroll } from "./utils.js";
 export async function getPayrollConfig(configProgram, configName) {
     const [payrollConfigPda] = derivePayrollConfigPda(configName, configProgram.programId);
@@ -751,16 +751,15 @@ export async function requestUnlock(payrollProgram, configsProgram, params) {
 }
 export async function cancelUnlock(payrollProgram, params) {
     const company = translateAddress(params.company);
-    const feePayer = translateAddress(params.feePayer);
     const [companyDeposit] = deriveCompanyDepositPda(Buffer.from(params.companyId), params.nonce, payrollProgram.programId);
     const ix = await createCancelUnlockInstruction(payrollProgram, {
         company,
         companyDeposit,
     }, {
         companyId: Array.from(params.companyId),
-        nonce: new BN(params.nonce.toString()),
+        nonce: new BN(params.nonce),
     });
-    return createTransactionPayload(payrollProgram, feePayer, [ix]);
+    return createTransactionPayload(payrollProgram, company, [ix]);
 }
 export async function completeUnlock(payrollProgram, configsProgram, params, commitment) {
     commitment = commitment ?? payrollProgram.provider.connection.commitment;
@@ -771,35 +770,51 @@ export async function completeUnlock(payrollProgram, configsProgram, params, com
     if (!configData) {
         throw new Error("YieldConfigNotFound: Yield config is not initialized in Zebec Configs Program");
     }
-    // central vault is also the admin
-    const admin = configData.centralVault;
+    const admin = configData.admin;
+    const centralVault = configData.centralVault;
+    const usxMint = configData.usxMint;
+    if (params.companyVaultKeypair &&
+        !centralVault.equals(params.companyVaultKeypair.publicKey)) {
+        throw new Error("Given keypair is not of companyVault");
+    }
     const [companyDeposit] = deriveCompanyDepositPda(Buffer.from(params.companyId), params.nonce, payrollProgram.programId);
     const companyDepositData = await payrollProgram.account.companyDeposit.fetchNullable(companyDeposit, commitment);
     if (!companyDepositData) {
         throw new Error(`CompanyDepositNotFound: Company Deposit does not exists for nonce: ${params.nonce.toString()}n and companyId: [${Array.from(params.companyId).toString()}]`);
     }
     const depositMint = companyDepositData.depositMint;
-    const centralVaultTokenAta = getAssociatedTokenAddressSync(depositMint, admin, true);
+    const centralVaultTokenAta = getAssociatedTokenAddressSync(depositMint, centralVault, true);
+    const centralVaultUsxAta = getAssociatedTokenAddressSync(usxMint, centralVault, true);
     const companyTokenAta = getAssociatedTokenAddressSync(depositMint, company, true);
+    const companyUsxAta = getAssociatedTokenAddressSync(usxMint, company, true);
     const ix = await createCompleteUnlockInstruction(payrollProgram, {
         admin,
         feePayer,
         company,
         companyDeposit,
         yieldConfig,
+        centralVault,
         centralVaultTokenAta,
+        centralVaultUsxAta,
         companyTokenAta,
+        companyUsxAta,
         depositMint,
+        usxMint,
     }, {
         companyId: Array.from(params.companyId),
         nonce: new BN(params.nonce.toString()),
     });
-    return createTransactionPayload(payrollProgram, feePayer, [ix]);
+    const partialSigners = [];
+    if (params.companyVaultKeypair) {
+        partialSigners.push(params.companyVaultKeypair);
+    }
+    return createTransactionPayload(payrollProgram, feePayer, [ix], partialSigners);
 }
 export async function distributeRewards(payrollProgram, configsProgram, params) {
     const admin = translateAddress(params.admin);
     const feePayer = translateAddress(params.feePayer);
     const [yieldConfig] = deriveYieldConfigPda(configsProgram.programId);
+    const [checkAccount] = deriveCheckAccountPda(params.checkId, payrollProgram.programId);
     const distributions = params.distributions.map((d) => ({
         companyId: Array.from(d.companyId),
         nonce: new BN(d.nonce.toString()),
@@ -815,7 +830,11 @@ export async function distributeRewards(payrollProgram, configsProgram, params)
     const ix = await createDistributeRewardsInstruction(payrollProgram, {
         admin,
         yieldConfig,
-    }, { distributions }, remainingAccounts);
+        checkAccount,
+    }, {
+        distributions,
+        checkId: Array.from(params.checkId),
+    }, remainingAccounts);
     return createTransactionPayload(payrollProgram, feePayer, [ix]);
 }
 export async function getCompanyDeposit(payrollProgram, company) {

package/dist/types.d.ts

@@ -212,7 +212,6 @@ export type RequestUnlockParams = {
     nonce: bigint;
 };
 export type CancelUnlockParams = {
-    feePayer: Address;
     company: Address;
     companyId: Buffer | Uint8Array;
     nonce: bigint;
@@ -222,10 +221,13 @@ export type CompleteUnlockParams = {
     company: Address;
     companyId: Buffer | Uint8Array;
     nonce: bigint;
+    companyVaultKeypair?: Keypair;
 };
 export type DistributeRewardsParams = {
     admin: Address;
     feePayer: Address;
+    /** Check id used to derive the check account that prevents duplicate distributions. */
+    checkId: Buffer | Uint8Array;
     distributions: {
         companyId: Buffer | Uint8Array;
         nonce: bigint;

package/package.json

@@ -1,47 +1,47 @@
-{
-	"author": "Zebec Network",
-	"dependencies": {
-		"@coral-xyz/anchor": "^0.31.1",
-		"@metaplex-foundation/mpl-token-metadata": "^3.4.0",
-		"@metaplex-foundation/umi": "^1.5.1",
-		"@metaplex-foundation/umi-bundle-defaults": "^1.5.1",
-		"@metaplex-foundation/umi-web3js-adapters": "^1.5.1",
-		"@solana/spl-token": "^0.4.14",
-		"@solana/web3.js": "^1.98.2",
-		"@zebec-network/core-utils": "^1.3.0",
-		"@zebec-network/solana-common": "^2.6.0",
-		"@zebec-network/zebec_configs": "^1.2.2",
-		"@zebec-network/zebec_payroll": "^1.4.5",
-		"bignumber.js": "^11.1.1"
-	},
-	"devDependencies": {
-		"@types/bn.js": "^5.2.0",
-		"@types/mocha": "^10.0.10",
-		"@types/node": "^25.6.0",
-		"dotenv": "^17.4.2",
-		"mocha": "^11.7.5",
-		"rimraf": "^6.1.3",
-		"ts-mocha": "^11.1.0",
-		"ts-node": "^10.9.2",
-		"typescript": "^6.0.3"
-	},
-	"files": [
-		"dist"
-	],
-	"license": "MIT",
-	"main": "dist/index.js",
-	"name": "@zebec-network/solana-payroll-sdk",
-	"private": false,
-	"scripts": {
-		"build": "npm run clean && tsc",
-		"clean": "rimraf ./dist",
-		"format": "npx @biomejs/biome format --write",
-		"prepare": "npm run build",
-		"run:example": "node --loader ts-node/esm -- example/buildTransactionAndSendForSigning.ts",
-		"test": "ts-mocha -p ./tsconfig.json -t 1000000000 test/**/*.test.ts",
-		"test:single": "ts-mocha -p ./tsconfig.json -t 1000000000 --"
-	},
-	"type": "module",
-	"types": "dist/index.d.ts",
-	"version": "2.3.1"
-}
+{
+	"author": "Zebec Network",
+	"dependencies": {
+		"@coral-xyz/anchor": "^0.31.1",
+		"@metaplex-foundation/mpl-token-metadata": "^3.4.0",
+		"@metaplex-foundation/umi": "^1.5.1",
+		"@metaplex-foundation/umi-bundle-defaults": "^1.5.1",
+		"@metaplex-foundation/umi-web3js-adapters": "^1.5.1",
+		"@solana/spl-token": "^0.4.14",
+		"@solana/web3.js": "^1.98.2",
+		"@zebec-network/core-utils": "^1.3.1",
+		"@zebec-network/solana-common": "^2.6.0",
+		"@zebec-network/zebec_configs": "^1.2.3",
+		"@zebec-network/zebec_payroll": "^1.5.0",
+		"bignumber.js": "^11.1.1"
+	},
+	"devDependencies": {
+		"@types/bn.js": "^5.2.0",
+		"@types/mocha": "^10.0.10",
+		"@types/node": "^25.6.0",
+		"dotenv": "^17.4.2",
+		"mocha": "^11.7.5",
+		"rimraf": "^6.1.3",
+		"ts-mocha": "^11.1.0",
+		"ts-node": "^10.9.2",
+		"typescript": "^6.0.3"
+	},
+	"files": [
+		"dist"
+	],
+	"license": "MIT",
+	"main": "dist/index.js",
+	"name": "@zebec-network/solana-payroll-sdk",
+	"private": false,
+	"scripts": {
+		"build": "npm run clean && tsc",
+		"clean": "rimraf ./dist",
+		"format": "npx @biomejs/biome format --write",
+		"prepare": "npm run format && npm run build",
+		"run:example": "node --loader ts-node/esm -- example/buildTransactionAndSendForSigning.ts",
+		"test": "ts-mocha -p ./tsconfig.json -t 1000000000 test/**/*.test.ts",
+		"test:single": "ts-mocha -p ./tsconfig.json -t 1000000000 --"
+	},
+	"type": "module",
+	"types": "dist/index.d.ts",
+	"version": "2.5.0"
+}