@zebec-network/solana-payroll-sdk 2.1.1 → 2.2.0

package/dist/services.d.ts

@@ -3,20 +3,23 @@ import { type Commitment, PublicKey } from "@solana/web3.js";
 import { MultiTransactionPayload, TransactionPayload } from "@zebec-network/solana-common";
 import type { ZebecConfigs as ZebecConfigsIdl } from "@zebec-network/zebec_configs";
 import type { ZebecPayroll as ZebecPayrollIdl } from "@zebec-network/zebec_payroll";
-import type { CancelPayrollParams, ChangePayrollReceiverParams, CreateMultiplePayrollParams, CreatePayrollParams, InitYieldConfigParams, PayrollConfigInfo, PayrollMetadataInfo, SetTopupDelegateParams, TokenMetadata, TopupPayrollParams, UnlockNowParams, WithdrawPayrollParams, YieldDepositParams } from "./types.js";
+import type { CancelMultiplePayrollParams, CancelPayrollParams, ChangePayrollReceiverParams, CreateMultiplePayrollParams, CreatePayrollParams, InitYieldConfigParams, PauseResumeMultiplePayrollParams, PauseResumePayrollParams, PayrollConfigInfo, PayrollMetadataInfo, SetMultipleTopupDelegateParams, SetTopupDelegateParams, TokenMetadata, TopupMultiplePayrollParams, TopupPayrollParams, UnlockNowParams, WithdrawMultiplePayrollParams, WithdrawPayrollParams, YieldDepositParams } from "./types.js";
 export declare function getPayrollConfig(configProgram: Program<ZebecConfigsIdl>, configName: string): Promise<PayrollConfigInfo>;
 export declare function getWhitelistedTokens(configProgram: Program<ZebecConfigsIdl>, configName: string, commitment?: "processed" | "confirmed" | "finalized"): Promise<TokenMetadata[]>;
 export declare function getPayrollMetadataInfo(program: Program<ZebecPayrollIdl>, payrollMetadata: Address, commitment?: Commitment): Promise<PayrollMetadataInfo>;
 export declare function createPayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: CreatePayrollParams, payrollFeeBaseUrl: string): Promise<TransactionPayload>;
 export declare function createMultiplePayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: CreateMultiplePayrollParams, payrollFeeBaseUrl: string): Promise<MultiTransactionPayload>;
 export declare function cancelPayroll(program: Program<ZebecPayrollIdl>, params: CancelPayrollParams): Promise<TransactionPayload>;
-export declare function pauseResumePayroll(program: Program<ZebecPayrollIdl>, params: {
-    payrollMetadata: Address;
-}): Promise<TransactionPayload>;
+export declare function cancelMultiplePayroll(program: Program<ZebecPayrollIdl>, params: CancelMultiplePayrollParams): Promise<MultiTransactionPayload>;
+export declare function pauseResumePayroll(program: Program<ZebecPayrollIdl>, params: PauseResumePayrollParams): Promise<TransactionPayload>;
+export declare function pauseResumeMultiplePayroll(program: Program<ZebecPayrollIdl>, params: PauseResumeMultiplePayrollParams): Promise<MultiTransactionPayload>;
 export declare function withdrawPayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: WithdrawPayrollParams): Promise<TransactionPayload>;
+export declare function withdrawMultiplePayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: WithdrawMultiplePayrollParams): Promise<MultiTransactionPayload>;
 export declare function changePayrollReceiver(program: Program<ZebecPayrollIdl>, params: ChangePayrollReceiverParams): Promise<TransactionPayload>;
 export declare function setTopupDelegate(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: SetTopupDelegateParams): Promise<TransactionPayload>;
+export declare function setMultipleTopupDelegate(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: SetMultipleTopupDelegateParams): Promise<MultiTransactionPayload>;
 export declare function topupPayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: TopupPayrollParams): Promise<TransactionPayload>;
+export declare function topupMultiplePayroll(payrollProgram: Program<ZebecPayrollIdl>, configProgram: Program<ZebecConfigsIdl>, params: TopupMultiplePayrollParams): Promise<MultiTransactionPayload>;
 export declare function initYieldConfig(payrollProgram: Program<ZebecPayrollIdl>, params: InitYieldConfigParams): Promise<TransactionPayload>;
 export declare function yieldDeposit(payrollProgram: Program<ZebecPayrollIdl>, params: YieldDepositParams): Promise<TransactionPayload>;
 export declare function unlockNow(payrollProgram: Program<ZebecPayrollIdl>, params: UnlockNowParams): Promise<TransactionPayload>;

package/dist/services.js

@@ -168,14 +168,15 @@ export async function getPayrollMetadataInfo(program, payrollMetadata, commitmen
         payrollRunId: utils.bytes.utf8.decode(Uint8Array.from(metadataInfo.payrollRunId).filter((byte) => byte !== 0)), // Remove padding zeros
     };
 }
-async function createPayload(program, payerKey, instructions, signers, addressLookupTableAccounts) {
+function createTransactionPayload(program, payerKey, instructions, signers, addressLookupTableAccounts) {
     const errorMap = new Map();
     program.idl.errors.map((error) => errorMap.set(error.code, error.msg));
     const provider = program.provider;
     let signTransaction;
     if (provider instanceof AnchorProvider) {
         signTransaction = async (tx) => {
-            return provider.wallet.signTransaction(tx);
+            const signed = await provider.wallet.signTransaction(tx);
+            return signed;
         };
     }
     return new TransactionPayload(program.provider.connection, errorMap, {
@@ -185,6 +186,22 @@ async function createPayload(program, payerKey, instructions, signers, addressLo
         addressLookupTableAccounts: addressLookupTableAccounts ?? [],
     }, signTransaction);
 }
+function createMultiTransactionPayload(program, feePayer, transactionData) {
+    const errorMap = new Map();
+    program.idl.errors.map((error) => errorMap.set(error.code, error.msg));
+    const provider = program.provider;
+    let signAllTransactions;
+    if (provider instanceof AnchorProvider) {
+        signAllTransactions = async (txs) => {
+            const signed = provider.wallet.signAllTransactions(txs);
+            return signed;
+        };
+    }
+    return MultiTransactionPayload.create(program.provider.connection, errorMap, transactionData.map((data) => ({
+        ...data,
+        feePayer,
+    })), signAllTransactions);
+}
 export async function createPayroll(payrollProgram, configProgram, params, payrollFeeBaseUrl) {
     const receiver = translateAddress(params.receiver);
     const sender = translateAddress(params.sender);
@@ -276,7 +293,9 @@ export async function createPayroll(payrollProgram, configProgram, params, payro
         senderId: Array.from(params.senderId),
     });
     ixs.push(createpayrollIx);
-    return createPayload(payrollProgram, feePayer, ixs, [payrollMetadataKeypair]);
+    return createTransactionPayload(payrollProgram, feePayer, ixs, [
+        payrollMetadataKeypair,
+    ]);
 }
 export async function createMultiplePayroll(payrollProgram, configProgram, params, payrollFeeBaseUrl) {
     const sender = translateAddress(params.sender);
@@ -372,21 +391,11 @@ export async function createMultiplePayroll(payrollProgram, configProgram, param
         });
         instructions.push(createpayrollIx);
         return {
-            feePayer,
             instructions,
             signers: [payrollMetadataKeypair],
         };
     }));
-    const errorMap = new Map();
-    payrollProgram.idl.errors.map((error) => errorMap.set(error.code, error.msg));
-    const provider = payrollProgram.provider;
-    let signAllTransactions;
-    if (provider instanceof AnchorProvider) {
-        signAllTransactions = async (txns) => {
-            return provider.wallet.signAllTransactions(txns);
-        };
-    }
-    return MultiTransactionPayload.create(payrollProgram.provider.connection, errorMap, transactionData, signAllTransactions);
+    return createMultiTransactionPayload(payrollProgram, feePayer, transactionData);
 }
 export async function cancelPayroll(program, params) {
     const user = translateAddress(params.user);
@@ -421,7 +430,47 @@ export async function cancelPayroll(program, params) {
         payrollVault,
         payrollVaultAta,
     });
-    return createPayload(program, feePayer, [ix]);
+    return createTransactionPayload(program, feePayer, [ix]);
+}
+export async function cancelMultiplePayroll(program, params) {
+    const user = translateAddress(params.user);
+    const feePayer = params.feePayer ? translateAddress(params.feePayer) : user;
+    const transactionData = await Promise.all(params.payrollMetadataList.map(async (address) => {
+        const payrollMetadata = translateAddress(address);
+        const payrollMetadataAccount = await program.account.paymentStream.fetch(payrollMetadata);
+        const payrollToken = payrollMetadataAccount.financials.streamToken;
+        const payroller = payrollMetadataAccount.parties.sender;
+        const receiver = payrollMetadataAccount.parties.receiver;
+        let otherParty;
+        if (user.equals(payroller)) {
+            otherParty = receiver;
+        }
+        else if (user.equals(receiver)) {
+            otherParty = payroller;
+        }
+        else {
+            throw new Error("User must be either payroller or receiver");
+        }
+        const userAta = getAssociatedTokenAddressSync(payrollToken, user, true);
+        const otherPartyAta = getAssociatedTokenAddressSync(payrollToken, otherParty, true);
+        const [payrollVault] = derivePayrollVaultPda(payrollMetadata, program.programId);
+        const payrollVaultAta = getAssociatedTokenAddressSync(payrollToken, payrollVault, true);
+        const ix = await createCancelPayrollInstruction(program, {
+            feePayer,
+            otherParty,
+            otherPartyAta,
+            signer: user,
+            signerAta: userAta,
+            payrollMetadata,
+            payrollToken,
+            payrollVault,
+            payrollVaultAta,
+        });
+        return {
+            instructions: [ix],
+        };
+    }));
+    return createMultiTransactionPayload(program, feePayer, transactionData);
 }
 export async function pauseResumePayroll(program, params) {
     const payrollMetadata = translateAddress(params.payrollMetadata);
@@ -431,7 +480,28 @@ export async function pauseResumePayroll(program, params) {
         payrollMetadata,
         user,
     });
-    return createPayload(program, user, [ix]);
+    return createTransactionPayload(program, user, [ix]);
+}
+export async function pauseResumeMultiplePayroll(program, params) {
+    const transactionData = await Promise.all(params.payrollMetadataList.map(async (address) => {
+        const payrollMetadata = translateAddress(address);
+        const payrollMetadataAccount = await program.account.paymentStream.fetch(payrollMetadata);
+        const user = payrollMetadataAccount.parties.sender;
+        const ix = await createPauseResumePayrollInstruction(program, {
+            payrollMetadata,
+            user,
+        });
+        return {
+            user,
+            instructions: [ix],
+        };
+    }));
+    if (transactionData.length === 0) {
+        throw new Error("There should be at least one item in transaction data.");
+    }
+    // biome-ignore lint/style/noNonNullAssertion: there is at least one item in the list so 0 index will not be empty
+    const feePayer = transactionData[0].user;
+    return createMultiTransactionPayload(program, feePayer, transactionData);
 }
 export async function withdrawPayroll(payrollProgram, configProgram, params) {
     const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
@@ -461,7 +531,43 @@ export async function withdrawPayroll(payrollProgram, configProgram, params) {
         withdrawer,
         feePayer,
     });
-    return createPayload(payrollProgram, withdrawer, [ix]);
+    return createTransactionPayload(payrollProgram, withdrawer, [ix]);
+}
+export async function withdrawMultiplePayroll(payrollProgram, configProgram, params) {
+    const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const receiver = translateAddress(params.receiver);
+    const withdrawer = params.withdrawer
+        ? translateAddress(params.withdrawer)
+        : receiver;
+    const feePayer = params.feePayer
+        ? translateAddress(params.feePayer)
+        : params.withdrawer
+            ? withdrawer
+            : receiver;
+    const transactionData = await Promise.all(params.payrollMetadataList.map(async (address) => {
+        const payrollMetadata = translateAddress(address);
+        const payrollMetadataAccount = await payrollProgram.account.paymentStream.fetch(payrollMetadata);
+        const payrollToken = payrollMetadataAccount.financials.streamToken;
+        const receiverAta = getAssociatedTokenAddressSync(payrollToken, receiver, true);
+        const [payrollVault] = derivePayrollVaultPda(payrollMetadata, payrollProgram.programId);
+        const payrollVaultAta = getAssociatedTokenAddressSync(payrollToken, payrollVault, true);
+        const ix = await createWithdrawPayrollInstruction(payrollProgram, {
+            receiver,
+            receiverAta,
+            payrollConfig,
+            payrollMetadata,
+            payrollToken,
+            payrollVault,
+            payrollVaultAta,
+            withdrawer,
+            feePayer,
+        });
+        return {
+            feePayer: withdrawer,
+            instructions: [ix],
+        };
+    }));
+    return createMultiTransactionPayload(payrollProgram, withdrawer, transactionData);
 }
 export async function changePayrollReceiver(program, params) {
     const payrollMetadata = translateAddress(params.payrollMetadata);
@@ -472,7 +578,7 @@ export async function changePayrollReceiver(program, params) {
         newRecipient,
         signer,
     });
-    return createPayload(program, signer, [ix]);
+    return createTransactionPayload(program, signer, [ix]);
 }
 export async function setTopupDelegate(payrollProgram, configProgram, params) {
     const sender = translateAddress(params.sender);
@@ -496,12 +602,39 @@ export async function setTopupDelegate(payrollProgram, configProgram, params) {
     }, {
         amount,
     });
-    return createPayload(payrollProgram, sender, [ix]);
+    return createTransactionPayload(payrollProgram, sender, [ix]);
+}
+export async function setMultipleTopupDelegate(payrollProgram, configProgram, params) {
+    const sender = translateAddress(params.sender);
+    const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const transactionData = await Promise.all(params.delegateInfoList.map(async (delegateInfo) => {
+        const payrollMetadata = translateAddress(delegateInfo.payrollMetadata);
+        const payrollMetadataAccount = await payrollProgram.account.paymentStream.fetch(payrollMetadata);
+        const payrollToken = payrollMetadataAccount.financials.streamToken;
+        const senderAta = getAssociatedTokenAddressSync(payrollToken, sender, true);
+        const [payrollVault] = derivePayrollVaultPda(payrollMetadata, payrollProgram.programId);
+        const payrollTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollToken);
+        const amount = new BN(BigNumber(delegateInfo.amount)
+            .multipliedBy(BigNumber(10).pow(payrollTokenDecimals))
+            .toFixed(0));
+        const ix = await createSetTopupDelegateInstruction(payrollProgram, {
+            sender,
+            senderAta,
+            payrollConfig,
+            payrollMetadata,
+            payrollToken,
+            payrollVault,
+        }, { amount });
+        return {
+            instructions: [ix],
+        };
+    }));
+    return createMultiTransactionPayload(payrollProgram, sender, transactionData);
 }
 export async function topupPayroll(payrollProgram, configProgram, params) {
     const sender = translateAddress(params.sender);
     const payrollMetadata = translateAddress(params.payrollMetadata);
-    const caller = params.caller ? translateAddress(params.caller) : sender;
+    const caller = translateAddress(params.caller);
     const payrollMetadataAccount = await payrollProgram.account.paymentStream.fetch(payrollMetadata);
     const payrollToken = payrollMetadataAccount.financials.streamToken;
     const senderAta = getAssociatedTokenAddressSync(payrollToken, sender, true);
@@ -524,7 +657,38 @@ export async function topupPayroll(payrollProgram, configProgram, params) {
     }, {
         extra: amount,
     });
-    return createPayload(payrollProgram, caller, [ix]);
+    return createTransactionPayload(payrollProgram, caller, [ix]);
+}
+export async function topupMultiplePayroll(payrollProgram, configProgram, params) {
+    const caller = translateAddress(params.caller);
+    const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const transactionData = await Promise.all(params.topupInfoList.map(async (topupInfo) => {
+        const sender = translateAddress(topupInfo.sender);
+        const payrollMetadata = translateAddress(topupInfo.payrollMetadata);
+        const payrollMetadataAccount = await payrollProgram.account.paymentStream.fetch(payrollMetadata);
+        const payrollToken = payrollMetadataAccount.financials.streamToken;
+        const senderAta = getAssociatedTokenAddressSync(payrollToken, sender, true);
+        const [payrollVault] = derivePayrollVaultPda(payrollMetadata, payrollProgram.programId);
+        const payrollVaultAta = getAssociatedTokenAddressSync(payrollToken, payrollVault, true);
+        const payrollTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollToken);
+        const amount = new BN(BigNumber(topupInfo.extra)
+            .multipliedBy(BigNumber(10).pow(payrollTokenDecimals))
+            .toFixed(0));
+        const ix = await createTopupPayrollInstruction(payrollProgram, {
+            caller,
+            sender,
+            senderAta,
+            payrollConfig,
+            payrollMetadata,
+            payrollToken,
+            payrollVault,
+            payrollVaultAta,
+        }, { extra: amount });
+        return {
+            instructions: [ix],
+        };
+    }));
+    return createMultiTransactionPayload(payrollProgram, caller, transactionData);
 }
 export async function initYieldConfig(payrollProgram, params) {
     const admin = translateAddress(params.admin);
@@ -548,7 +712,7 @@ export async function initYieldConfig(payrollProgram, params) {
         minUnlockAmount,
         unlockCooldown: new BN(params.unlockCooldown),
     });
-    return createPayload(payrollProgram, admin, [ix]);
+    return createTransactionPayload(payrollProgram, admin, [ix]);
 }
 export async function yieldDeposit(payrollProgram, params) {
     const company = translateAddress(params.company);
@@ -569,12 +733,14 @@ export async function yieldDeposit(payrollProgram, params) {
         companyUsdtAta,
         usdtMint,
     }, { amount });
-    return createPayload(payrollProgram, company, [ix]);
+    return createTransactionPayload(payrollProgram, company, [ix]);
 }
 export async function unlockNow(payrollProgram, params) {
     const company = translateAddress(params.company);
     const usdtMint = translateAddress(params.usdtMint);
-    const feePayer = params.feePayer ? translateAddress(params.feePayer) : company;
+    const feePayer = params.feePayer
+        ? translateAddress(params.feePayer)
+        : company;
     const [companyDeposit] = deriveCompanyDepositPda(company, payrollProgram.programId);
     const [yieldConfig] = deriveYieldConfigPda(payrollProgram.programId);
     const [vault] = deriveYieldVaultPda(payrollProgram.programId);
@@ -590,7 +756,7 @@ export async function unlockNow(payrollProgram, params) {
         companyUsdtAta,
         usdtMint,
     });
-    return createPayload(payrollProgram, feePayer, [ix]);
+    return createTransactionPayload(payrollProgram, feePayer, [ix]);
 }
 export async function getCompanyDeposit(payrollProgram, company) {
     const account = await payrollProgram.account.companyDeposit.fetch(translateAddress(company));

package/dist/types.d.ts

@@ -138,9 +138,17 @@ export type CancelPayrollParams = {
     payrollMetadata: Address;
     user: Address;
 };
+export type CancelMultiplePayrollParams = {
+    feePayer?: Address;
+    user: Address;
+    payrollMetadataList: Address[];
+};
 export type PauseResumePayrollParams = {
     payrollMetadata: Address;
 };
+export type PauseResumeMultiplePayrollParams = {
+    payrollMetadataList: Address[];
+};
 export type WithdrawPayrollParams = {
     payrollConfigName: string;
     payrollMetadata: Address;
@@ -148,6 +156,13 @@ export type WithdrawPayrollParams = {
     feePayer?: Address;
     receiver: Address;
 };
+export type WithdrawMultiplePayrollParams = {
+    payrollConfigName: string;
+    payrollMetadataList: Address[];
+    withdrawer?: Address;
+    feePayer?: Address;
+    receiver: Address;
+};
 export type ChangePayrollReceiverParams = {
     payrollMetadata: Address;
     newRecipient: Address;
@@ -155,17 +170,34 @@ export type ChangePayrollReceiverParams = {
 };
 export type TopupPayrollParams = {
     payrollConfigName: string;
-    caller?: Address;
+    caller: Address;
     sender: Address;
     payrollMetadata: Address;
     extra: Numeric;
 };
+export type TopupMultiplePayrollParams = {
+    payrollConfigName: string;
+    caller: Address;
+    topupInfoList: {
+        sender: Address;
+        payrollMetadata: Address;
+        extra: Numeric;
+    }[];
+};
 export type SetTopupDelegateParams = {
     payrollConfigName: string;
     sender: Address;
     payrollMetadata: Address;
     amount: Numeric;
 };
+export type SetMultipleTopupDelegateParams = {
+    payrollConfigName: string;
+    sender: Address;
+    delegateInfoList: {
+        payrollMetadata: Address;
+        amount: Numeric;
+    }[];
+};
 export type InitYieldConfigParams = {
     admin: Address;
     usdtMint: Address;

package/package.json

@@ -43,5 +43,5 @@
 	},
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "2.1.1"
-}
+	"version": "2.2.0"
+}