@zebec-network/solana-payroll-sdk 1.0.0-dev.1 → 1.0.1

package/dist/services.js

@@ -2,32 +2,32 @@ import { AnchorProvider, translateAddress, utils, } from "@coral-xyz/anchor";
 import { fetchMetadata, MPL_TOKEN_METADATA_PROGRAM_ID, } from "@metaplex-foundation/mpl-token-metadata";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { fromWeb3JsPublicKey, toWeb3JsPublicKey, } from "@metaplex-foundation/umi-web3js-adapters";
-import { createTransferInstruction } from "@solana/spl-token";
 import { Keypair, PublicKey, } from "@solana/web3.js";
 import { bpsToPercent, percentToBps } from "@zebec-network/core-utils";
-import { createAssociatedTokenAccountInstruction, getAssociatedTokenAddressSync, getMintDecimals, TEN_BIGNUM, TransactionPayload, UNITS_PER_USDC, USDC_DECIMALS, } from "@zebec-network/solana-common";
-import BigNumber from "bignumber.js";
+import { createAssociatedTokenAccountInstruction, getAssociatedTokenAddressSync, getMintDecimals, TEN_BIGNUM, TransactionPayload, UNITS_PER_USDC, } from "@zebec-network/solana-common";
+import { BigNumber } from "bignumber.js";
 import { BN } from "bn.js";
 import { PAYROLL_NAME_BUFFER_SIZE } from "./constants.js";
-import { createCancelStreamInstruction, createChangeRecipientInstruction, createCreateStreamInstruction, createInitializeConfigInstruction, createPauseResumeStreamInstruction, createSetTopupDelegateInstruction, createTopupStreamInstruction, createUpdateConfigInstruction, createWhitelistTokensInstruction, createWithdrawStreamInstruction, } from "./instructions.js";
-import { deriveStreamConfigPda, deriveStreamVaultPda } from "./pda.js";
-import { getFeeInfoForStream, getNetworkFromConnection } from "./utils.js";
-export async function getPayrollConfig(program, configName) {
-    const [streamConfigPda] = deriveStreamConfigPda(configName, program.programId);
-    const streamConfig = await program.account.streamConfig.fetchNullable(streamConfigPda);
-    if (!streamConfig) {
-        throw new Error(`Stream config not found for name: ${configName}`);
+import { createCancelPayrollInstruction, createChangeRecipientInstruction, createCreatePayrollInstruction, createPauseResumePayrollInstruction, createSetTopupDelegateInstruction, createTopupPayrollInstruction, createTransferFeesInstruction, createWithdrawPayrollInstruction, } from "./instructions.js";
+import { derivePayrollConfigPda, derivePayrollVaultPda } from "./pda.js";
+import { getFeeInfoForPayroll } from "./utils.js";
+export async function getPayrollConfig(configProgram, configName) {
+    const [payrollConfigPda] = derivePayrollConfigPda(configName, configProgram.programId);
+    const payrollConfig = await configProgram.account.payrollConfig.fetchNullable(payrollConfigPda);
+    if (!payrollConfig) {
+        throw new Error(`Payroll config not found for name: ${configName}`);
     }
     return {
         configName,
-        address: streamConfigPda,
-        admin: streamConfig.admin,
-        withdrawerAccount: streamConfig.withdrawAccount,
-        whitelistedTokens: streamConfig.whitelistedTokens,
-        platformFee: Number(bpsToPercent(streamConfig.platformFee.toNumber())),
-        baseFee: Number(bpsToPercent(streamConfig.baseFee.toNumber())),
-        frequencies: streamConfig.frequencies.map((f) => f.toNumber()),
-        feeTiers: streamConfig.feeTiers.tiers.map((t) => ({
+        address: payrollConfigPda,
+        admin: payrollConfig.admin,
+        feeToken: payrollConfig.feeToken,
+        withdrawerAccount: payrollConfig.withdrawAccount,
+        whitelistedTokens: payrollConfig.whitelistedTokens,
+        platformFee: Number(bpsToPercent(payrollConfig.platformFee.toNumber())),
+        baseFee: Number(bpsToPercent(payrollConfig.baseFee.toNumber())),
+        frequencies: payrollConfig.frequencies.map((f) => f.toNumber()),
+        feeTiers: payrollConfig.feeTiers.tiers.map((t) => ({
             minThreshold: BigNumber(t.minAmount.toString())
                 .div(UNITS_PER_USDC)
                 .toFixed(),
@@ -36,18 +36,21 @@ export async function getPayrollConfig(program, configName) {
                 .toFixed(),
             feeRateInPercent: Number(bpsToPercent(t.fee.toNumber())),
         })),
-        feeVault: streamConfig.feeVault,
+        feeVault: payrollConfig.feeVault,
     };
 }
-export async function getWhitelistedTokens(program, configName, commitment) {
-    const [config] = deriveStreamConfigPda(configName, program.programId);
-    const configInfo = await program.account.streamConfig.fetch(config, commitment ?? program.provider.connection.commitment);
-    const whitelistedTokens = configInfo.whitelistedTokens;
-    const umi = createUmi(program.provider.connection.rpcEndpoint, commitment);
+export async function getWhitelistedTokens(configProgram, configName, commitment) {
+    const [config] = derivePayrollConfigPda(configName, configProgram.programId);
+    const configAccount = await configProgram.account.payrollConfig.fetchNullable(config, commitment ?? configProgram.provider.connection.commitment);
+    if (!configAccount) {
+        throw new Error(`Payroll config not found for name: ${configName}`);
+    }
+    const whitelistedTokens = configAccount.whitelistedTokens;
+    const umi = createUmi(configProgram.provider.connection.rpcEndpoint, commitment);
     return Promise.all(whitelistedTokens.map(async (mint) => {
         const mplProgramId = toWeb3JsPublicKey(MPL_TOKEN_METADATA_PROGRAM_ID);
         const [metadata] = PublicKey.findProgramAddressSync([Buffer.from("metadata"), mplProgramId.toBytes(), mint.toBytes()], mplProgramId);
-        const mintInfo = await program.provider.connection.getParsedAccountInfo(mint, commitment);
+        const mintInfo = await configProgram.provider.connection.getParsedAccountInfo(mint, commitment);
         if (!mintInfo.value) {
             throw new Error(`Failed to fetch mint account: ${mint.toString()}`);
         }
@@ -104,29 +107,38 @@ export async function getWhitelistedTokens(program, configName, commitment) {
         }
     }));
 }
-export async function getStreamMetadataInfo(program, streamMetadata, commitment) {
-    const metadataInfo = await program.account.paymentStream.fetch(translateAddress(streamMetadata), commitment ?? program.provider.connection.commitment);
-    const streamToken = metadataInfo.financials.streamToken;
-    const streamTokenDecimals = await getMintDecimals(program.provider.connection, streamToken);
-    const unitsPerStreamToken = TEN_BIGNUM.pow(streamTokenDecimals);
+export async function getPayrollMetadataInfo(program, payrollMetadata, commitment) {
+    const metadataInfo = await program.account.paymentStream.fetch(translateAddress(payrollMetadata), commitment ?? program.provider.connection.commitment);
+    const payrollToken = metadataInfo.financials.streamToken;
+    const payrollTokenDecimals = await getMintDecimals(program.provider.connection, payrollToken);
+    const unitsPerPayrollToken = BigNumber(10).pow(payrollTokenDecimals);
     const depositedAmount = BigNumber(metadataInfo.financials.depositedAmount.toString())
-        .div(unitsPerStreamToken)
+        .div(unitsPerPayrollToken)
         .toFixed();
     const withdrawnAmount = BigNumber(metadataInfo.financials.withdrawnAmount.toString())
-        .div(unitsPerStreamToken)
+        .div(unitsPerPayrollToken)
+        .toFixed();
+    const initialBufferAmount = BigNumber(metadataInfo.topupState.initialBufferAmount.toString())
+        .div(unitsPerPayrollToken)
         .toFixed();
     const cliffPercentage = Number(bpsToPercent(metadataInfo.financials.cliffPercentage.toNumber()));
+    const fullAmount = BigNumber(metadataInfo.financials.fullAmount.toString())
+        .div(unitsPerPayrollToken)
+        .toFixed();
     return {
-        address: translateAddress(streamMetadata),
+        address: translateAddress(payrollMetadata),
         parties: {
             sender: metadataInfo.parties.sender,
+            senderId: Buffer.from(metadataInfo.senderId),
             receiver: metadataInfo.parties.receiver,
+            receiverId: Buffer.from(metadataInfo.receiverId),
         },
         financials: {
-            streamToken,
+            payrollToken,
             cliffPercentage,
             depositedAmount,
             withdrawnAmount,
+            fullAmount,
         },
         schedule: {
             startTime: metadataInfo.schedule.startTime.toNumber(),
@@ -140,7 +152,7 @@ export async function getStreamMetadataInfo(program, streamMetadata, commitment)
         },
         topupState: {
             coveredUntill: metadataInfo.topupState.coveredUntil.toNumber(),
-            initialBufferDuration: metadataInfo.topupState.initialBufferDuration.toNumber(),
+            initialBufferAmount,
             topupCount: metadataInfo.topupState.topupCount.toNumber(),
         },
         permissions: {
@@ -153,7 +165,7 @@ export async function getStreamMetadataInfo(program, streamMetadata, commitment)
             isPausable: Boolean(metadataInfo.permissions.isPausable),
             rateUpdatable: Boolean(metadataInfo.permissions.rateUpdatable),
         },
-        streamName: utils.bytes.utf8.decode(Uint8Array.from(metadataInfo.streamName).filter((byte) => byte !== 0)), // Remove padding zeros
+        payrollName: utils.bytes.utf8.decode(Uint8Array.from(metadataInfo.streamName).filter((byte) => byte !== 0)), // Remove padding zeros
     };
 }
 async function createPayload(program, payerKey, instructions, signers, addressLookupTableAccounts) {
@@ -173,144 +185,78 @@ async function createPayload(program, payerKey, instructions, signers, addressLo
         addressLookupTableAccounts: addressLookupTableAccounts ?? [],
     }, signTransaction);
 }
-export async function initializePayrollConfig(program, params) {
-    const admin = params.admin
-        ? translateAddress(params.admin)
-        : program.provider.publicKey;
-    if (!admin) {
-        throw new Error("Either provide admin or create provider with public key");
-    }
-    const [streamConfig] = deriveStreamConfigPda(params.config.streamConfigName, program.programId);
-    const baseFee = new BN(percentToBps(params.config.baseFeePercent));
-    const frequencies = params.config.frequencies.map((frequency) => new BN(frequency));
-    const platformFee = new BN(percentToBps(params.config.platformFeePercent));
-    const withdrawAccount = translateAddress(params.config.withdrawAccount);
-    const feeVault = translateAddress(params.config.feeVault);
-    const feeTiers = params.config.feeTiers.map((tier) => {
-        return {
-            minAmount: new BN(BigNumber(tier.minThreshold)
-                .times(TEN_BIGNUM.pow(USDC_DECIMALS))
-                .toFixed(0)),
-            maxAmount: new BN(BigNumber(tier.maxThreshold)
-                .times(TEN_BIGNUM.pow(USDC_DECIMALS))
-                .toFixed(0)),
-            fee: new BN(percentToBps(tier.feeRateInPercent)),
-        };
-    });
-    const ix = await createInitializeConfigInstruction(program, { admin, streamConfig }, {
-        baseFee,
-        frequencies,
-        platformFee,
-        withdrawAccount,
-        feeTiers,
-        configName: params.config.streamConfigName,
-        feeVault,
-    });
-    return createPayload(program, admin, [ix]);
-}
-export async function updatePayrollConfig(program, params) {
-    const admin = params.admin
-        ? translateAddress(params.admin)
-        : program.provider.publicKey;
-    if (!admin) {
-        throw new Error("Either provide admin or create provider with public key");
-    }
-    const [streamConfig] = deriveStreamConfigPda(params.config.streamConfigName, program.programId);
-    const baseFee = new BN(percentToBps(params.config.baseFeePercent));
-    const frequencies = params.config.frequencies.map((frequency) => new BN(frequency));
-    const platformFee = new BN(percentToBps(params.config.platformFeePercent));
-    const withdrawAccount = translateAddress(params.config.withdrawAccount);
-    const feeVault = translateAddress(params.config.feeVault);
-    const feeTiers = params.config.feeTiers.map((tier) => {
-        return {
-            minAmount: new BN(BigNumber(tier.minThreshold)
-                .times(TEN_BIGNUM.pow(USDC_DECIMALS))
-                .toFixed(0)),
-            maxAmount: new BN(BigNumber(tier.maxThreshold)
-                .times(TEN_BIGNUM.pow(USDC_DECIMALS))
-                .toFixed(0)),
-            fee: new BN(percentToBps(tier.feeRateInPercent)),
-        };
-    });
-    const ix = await createUpdateConfigInstruction(program, { admin, streamConfig }, {
-        baseFee,
-        frequencies,
-        platformFee,
-        withdrawAccount,
-        feeTiers,
-        configName: params.config.streamConfigName,
-        feeVault,
-    });
-    return createPayload(program, admin, [ix]);
-}
-export async function whiteListTokens(program, params) {
-    const admin = translateAddress(params.admin);
-    const [streamConfig] = deriveStreamConfigPda(params.streamConfigName, program.programId);
-    const tokens = params.tokens.map((token) => translateAddress(token));
-    const ix = await createWhitelistTokensInstruction(program, {
-        admin,
-        streamConfig,
-    }, { tokens });
-    return createPayload(program, admin, [ix]);
-}
-export async function createStream(program, params) {
+export async function createPayroll(payrollProgram, configProgram, params, payrollFeeBaseUrl) {
     const receiver = translateAddress(params.receiver);
     const sender = translateAddress(params.sender);
     const feePayer = params.feePayer ? translateAddress(params.feePayer) : sender;
-    const streamToken = translateAddress(params.streamToken);
-    const [streamConfig] = deriveStreamConfigPda(params.streamConfigName, program.programId);
-    const streamConfigAccount = await program.account.streamConfig.fetch(streamConfig);
-    const withdrawer = streamConfigAccount.withdrawAccount;
-    const autoWithdrawFrequencies = new Set(Array.from(streamConfigAccount.frequencies.map((f) => f.toNumber())));
+    const payrollToken = translateAddress(params.payrollToken);
+    const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const payrollConfigAccount = await configProgram.account.payrollConfig.fetchNullable(payrollConfig);
+    if (!payrollConfigAccount) {
+        throw new Error(`Payroll config not found for name: ${params.payrollConfigName}`);
+    }
+    const withdrawer = payrollConfigAccount.withdrawAccount;
+    const autoWithdrawFrequencies = new Set(Array.from(payrollConfigAccount.frequencies.map((f) => f.toNumber())));
     if (params.automaticWithdrawal &&
         !autoWithdrawFrequencies.has(params.autoWithdrawFrequency)) {
-        throw new Error("Invalid stream frequency");
+        throw new Error("Invalid payroll frequency");
     }
-    const senderAta = getAssociatedTokenAddressSync(streamToken, sender, true);
-    const receiverAta = getAssociatedTokenAddressSync(streamToken, receiver, true);
-    const streamMetadataKeypair = params.streamMetadataKeypair ?? Keypair.generate();
-    const [streamVault] = deriveStreamVaultPda(streamMetadataKeypair.publicKey, program.programId);
-    const streamVaultAta = getAssociatedTokenAddressSync(streamToken, streamVault, true);
-    const streamTokenDecimals = await getMintDecimals(program.provider.connection, streamToken);
+    const senderAta = getAssociatedTokenAddressSync(payrollToken, sender, true);
+    const receiverAta = getAssociatedTokenAddressSync(payrollToken, receiver, true);
+    const payrollMetadataKeypair = params.payrollMetadataKeypair ?? Keypair.generate();
+    const [payrollVault] = derivePayrollVaultPda(payrollMetadataKeypair.publicKey, payrollProgram.programId);
+    const payrollVaultAta = getAssociatedTokenAddressSync(payrollToken, payrollVault, true);
+    const payrollTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollToken);
     const amount = BigNumber(params.amount)
-        .times(TEN_BIGNUM.pow(streamTokenDecimals))
+        .times(TEN_BIGNUM.pow(payrollTokenDecimals))
+        .toFixed(0);
+    const initialBufferAmount = BigNumber(params.initialBufferAmount)
+        .times(TEN_BIGNUM.pow(payrollTokenDecimals))
         .toFixed(0);
     const cliffPercentage = new BN(percentToBps(params.cliffPercentage));
-    const streamName = new Uint8Array(PAYROLL_NAME_BUFFER_SIZE);
-    streamName.set(utils.bytes.utf8.encode(params.streamName));
-    const configAccount = await program.account.streamConfig.fetch(streamConfig);
-    const network = getNetworkFromConnection(program.provider.connection);
-    const feeInfo = await getFeeInfoForStream(streamToken, amount, streamTokenDecimals, network);
-    const feeToken = translateAddress(feeInfo.feeToken.mintAddress);
+    const payrollName = new Uint8Array(PAYROLL_NAME_BUFFER_SIZE);
+    payrollName.set(utils.bytes.utf8.encode(params.payrollName));
+    const feeInfo = await getFeeInfoForPayroll(payrollFeeBaseUrl, payrollToken, amount);
+    const feeTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollConfigAccount.feeToken);
     const parsedFeeAmount = feeInfo.feeAmountRaw;
-    const feeVault = configAccount.feeVault;
-    const feeVaultAta = getAssociatedTokenAddressSync(feeToken, feeVault, true);
-    const senderFeeTokenAta = getAssociatedTokenAddressSync(feeToken, sender, true);
-    const feeVaultAtaInfo = await program.provider.connection.getAccountInfo(feeVaultAta);
+    const feeVault = payrollConfigAccount.feeVault;
+    const feeVaultAta = getAssociatedTokenAddressSync(payrollConfigAccount.feeToken, feeVault, true);
+    const senderFeeTokenAta = getAssociatedTokenAddressSync(payrollConfigAccount.feeToken, sender, true);
+    const feeVaultAtaInfo = await payrollProgram.provider.connection.getAccountInfo(feeVaultAta);
     const ixs = [];
     // add instruction to create fee vault ATA if it does not exist
     if (!feeVaultAtaInfo) {
-        const createFeeVaultAtaIx = createAssociatedTokenAccountInstruction(feePayer, feeVaultAta, feeVault, feeToken);
+        const createFeeVaultAtaIx = createAssociatedTokenAccountInstruction(feePayer, feeVaultAta, feeVault, payrollConfigAccount.feeToken);
         ixs.push(createFeeVaultAtaIx);
     }
     // add instruction to transfer fee to fee vault
-    const transferFeeToVaultIx = createTransferInstruction(senderFeeTokenAta, feeVaultAta, sender, BigInt(parsedFeeAmount));
-    ixs.push(transferFeeToVaultIx);
-    const createStreamIx = await createCreateStreamInstruction(program, {
-        streamConfig,
+    const transferFeeIx = await createTransferFeesInstruction(payrollProgram, {
+        feeVault,
+        feeVaultTokenAccount: feeVaultAta,
+        payrollConfig,
+        sender,
+        senderTokenAccount: senderFeeTokenAta,
+        tokenMint: payrollConfigAccount.feeToken,
+    }, {
+        decimals: feeTokenDecimals,
+        feeAmount: new BN(parsedFeeAmount),
+    });
+    ixs.push(transferFeeIx);
+    const createpayrollIx = await createCreatePayrollInstruction(payrollProgram, {
+        payrollConfig,
         feePayer,
         receiver,
         senderAta,
-        streamToken,
+        payrollToken,
         sender,
         receiverAta,
-        streamMetadata: streamMetadataKeypair.publicKey,
-        streamVault,
-        streamVaultAta,
+        payrollMetadata: payrollMetadataKeypair.publicKey,
+        payrollVault,
+        payrollVaultAta,
         withdrawAccount: withdrawer,
     }, {
         autoTopupDelegate: Number(params.delegateAutoTopup),
-        initialBufferDuration: new BN(params.initialBufferDuration),
+        initialBufferAmount: new BN(initialBufferAmount),
         amount: new BN(amount),
         automaticWithdrawal: Number(params.automaticWithdrawal),
         cancelableByRecipient: Number(params.cancelableByRecipient),
@@ -323,62 +269,62 @@ export async function createStream(program, params) {
         startNow: Number(params.startNow),
         startTime: new BN(params.startTime),
         autoWithdrawFrequency: new BN(params.autoWithdrawFrequency),
-        streamName: Array.from(streamName),
+        payrollName: Array.from(payrollName),
         transferableByRecipient: Number(params.transferableByRecipient),
         transferableBySender: Number(params.transferableBySender),
         receiverId: Array.from(params.receiverId),
         senderId: Array.from(params.senderId),
     });
-    ixs.push(createStreamIx);
-    return createPayload(program, feePayer, ixs, [streamMetadataKeypair]);
+    ixs.push(createpayrollIx);
+    return createPayload(payrollProgram, feePayer, ixs, [payrollMetadataKeypair]);
 }
-export async function cancelStream(program, params) {
+export async function cancelPayroll(program, params) {
     const user = translateAddress(params.user);
-    const streamMetadata = translateAddress(params.streamMetadata);
-    const streamMetadataAccount = await program.account.paymentStream.fetch(streamMetadata);
-    const streamToken = streamMetadataAccount.financials.streamToken;
-    const streamer = streamMetadataAccount.parties.sender;
-    const receiver = streamMetadataAccount.parties.receiver;
+    const payrollMetadata = translateAddress(params.payrollMetadata);
+    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(streamer)) {
+    if (user.equals(payroller)) {
         otherParty = receiver;
     }
     else if (user.equals(receiver)) {
-        otherParty = streamer;
+        otherParty = payroller;
     }
     else {
-        throw new Error("User must be either streamer or receiver");
+        throw new Error("User must be either payroller or receiver");
     }
     const feePayer = params.feePayer ? translateAddress(params.feePayer) : user;
-    const userAta = getAssociatedTokenAddressSync(streamToken, user, true);
-    const otherPartyAta = getAssociatedTokenAddressSync(streamToken, otherParty, true);
-    const [streamVault] = deriveStreamVaultPda(streamMetadata, program.programId);
-    const streamVaultAta = getAssociatedTokenAddressSync(streamToken, streamVault, true);
-    const ix = await createCancelStreamInstruction(program, {
+    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,
-        streamMetadata,
-        streamToken,
-        streamVault,
-        streamVaultAta,
+        payrollMetadata,
+        payrollToken,
+        payrollVault,
+        payrollVaultAta,
     });
     return createPayload(program, feePayer, [ix]);
 }
-export async function pauseResumeStream(program, params) {
-    const streamMetadata = translateAddress(params.streamMetadata);
-    const streamMetadataAccount = await program.account.paymentStream.fetch(streamMetadata);
-    const user = streamMetadataAccount.parties.sender;
-    const ix = await createPauseResumeStreamInstruction(program, {
-        streamMetadata,
+export async function pauseResumePayroll(program, params) {
+    const payrollMetadata = translateAddress(params.payrollMetadata);
+    const payrollMetadataAccount = await program.account.paymentStream.fetch(payrollMetadata);
+    const user = payrollMetadataAccount.parties.sender;
+    const ix = await createPauseResumePayrollInstruction(program, {
+        payrollMetadata,
         user,
     });
     return createPayload(program, user, [ix]);
 }
-export async function withdrawStream(program, params) {
-    const [streamConfig] = deriveStreamConfigPda(params.streamConfigName, program.programId);
+export async function withdrawPayroll(payrollProgram, configProgram, params) {
+    const [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
     const receiver = translateAddress(params.receiver);
     const withdrawer = params.withdrawer
         ? translateAddress(params.withdrawer)
@@ -388,85 +334,85 @@ export async function withdrawStream(program, params) {
         : params.withdrawer
             ? withdrawer
             : receiver;
-    const streamMetadata = translateAddress(params.streamMetadata);
-    const streamMetadataAccount = await program.account.paymentStream.fetch(streamMetadata);
-    const streamToken = streamMetadataAccount.financials.streamToken;
-    const receiverAta = getAssociatedTokenAddressSync(streamToken, receiver, true);
-    const [streamVault] = deriveStreamVaultPda(streamMetadata, program.programId);
-    const streamVaultAta = getAssociatedTokenAddressSync(streamToken, streamVault, true);
-    const ix = await createWithdrawStreamInstruction(program, {
+    const payrollMetadata = translateAddress(params.payrollMetadata);
+    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,
-        streamConfig,
-        streamMetadata,
-        streamToken,
-        streamVault,
-        streamVaultAta,
+        payrollConfig,
+        payrollMetadata,
+        payrollToken,
+        payrollVault,
+        payrollVaultAta,
         withdrawer,
         feePayer,
     });
-    return createPayload(program, withdrawer, [ix]);
+    return createPayload(payrollProgram, withdrawer, [ix]);
 }
-export async function changeStreamReceiver(program, params) {
-    const streamMetadata = translateAddress(params.streamMetadata);
+export async function changePayrollReceiver(program, params) {
+    const payrollMetadata = translateAddress(params.payrollMetadata);
     const newRecipient = translateAddress(params.newRecipient);
     const signer = translateAddress(params.signer);
     const ix = await createChangeRecipientInstruction(program, {
-        stream: streamMetadata,
+        payrollMetadata: payrollMetadata,
         newRecipient,
         signer,
     });
     return createPayload(program, signer, [ix]);
 }
-export async function setTopupDelegate(program, params) {
+export async function setTopupDelegate(payrollProgram, configProgram, params) {
     const sender = translateAddress(params.sender);
-    const streamMetadata = translateAddress(params.streamMetadata);
-    const streamMetadataAccount = await program.account.paymentStream.fetch(streamMetadata);
-    const streamToken = streamMetadataAccount.financials.streamToken;
-    const senderAta = getAssociatedTokenAddressSync(streamToken, sender, true);
-    const [streamVault] = deriveStreamVaultPda(streamMetadata, program.programId);
-    const [streamConfig] = deriveStreamConfigPda(params.streamConfigName, program.programId);
-    const streamTokenDecimals = await getMintDecimals(program.provider.connection, streamToken);
+    const payrollMetadata = translateAddress(params.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 [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const payrollTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollToken);
     const amount = new BN(BigNumber(params.amount)
-        .multipliedBy(BigNumber(10).pow(streamTokenDecimals))
+        .multipliedBy(BigNumber(10).pow(payrollTokenDecimals))
         .toFixed(0));
-    const ix = await createSetTopupDelegateInstruction(program, {
+    const ix = await createSetTopupDelegateInstruction(payrollProgram, {
         sender,
         senderAta,
-        streamConfig,
-        streamMetadata,
-        streamToken,
-        streamVault,
+        payrollConfig,
+        payrollMetadata,
+        payrollToken,
+        payrollVault,
     }, {
         amount,
     });
-    return createPayload(program, sender, [ix]);
+    return createPayload(payrollProgram, sender, [ix]);
 }
-export async function topupStream(program, params) {
+export async function topupPayroll(payrollProgram, configProgram, params) {
     const sender = translateAddress(params.sender);
-    const streamMetadata = translateAddress(params.streamMetadata);
+    const payrollMetadata = translateAddress(params.payrollMetadata);
     const caller = params.caller ? translateAddress(params.caller) : sender;
-    const streamMetadataAccount = await program.account.paymentStream.fetch(streamMetadata);
-    const streamToken = streamMetadataAccount.financials.streamToken;
-    const senderAta = getAssociatedTokenAddressSync(streamToken, sender, true);
-    const [streamVault] = deriveStreamVaultPda(streamMetadata, program.programId);
-    const [streamConfig] = deriveStreamConfigPda(params.streamConfigName, program.programId);
-    const streamTokenDecimals = await getMintDecimals(program.provider.connection, streamToken);
+    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 [payrollConfig] = derivePayrollConfigPda(params.payrollConfigName, configProgram.programId);
+    const payrollTokenDecimals = await getMintDecimals(payrollProgram.provider.connection, payrollToken);
     const amount = new BN(BigNumber(params.extra)
-        .multipliedBy(BigNumber(10).pow(streamTokenDecimals))
+        .multipliedBy(BigNumber(10).pow(payrollTokenDecimals))
         .toFixed(0));
-    const streamVaultAta = getAssociatedTokenAddressSync(streamToken, streamVault, true);
-    const ix = await createTopupStreamInstruction(program, {
+    const payrollVaultAta = getAssociatedTokenAddressSync(payrollToken, payrollVault, true);
+    const ix = await createTopupPayrollInstruction(payrollProgram, {
         caller,
         sender,
         senderAta,
-        streamConfig,
-        streamMetadata,
-        streamToken,
-        streamVault,
-        streamVaultAta,
+        payrollConfig,
+        payrollMetadata: payrollMetadata,
+        payrollToken,
+        payrollVault,
+        payrollVaultAta,
     }, {
         extra: amount,
     });
-    return createPayload(program, caller, [ix]);
+    return createPayload(payrollProgram, caller, [ix]);
 }