@zebec-network/zebec-vault-sdk 5.1.3 → 5.2.0

package/dist/errors.js

@@ -7,7 +7,12 @@ class AmountOutOfRangeError extends Error {
     value;
     name = "AmountOutOfRangeError";
     constructor(minRange, maxRange, value) {
-        super("Amount out of range: " + value + "; Must be within " + minRange + "-" + maxRange);
+        super("Amount out of range: " +
+            value +
+            "; Must be within " +
+            minRange +
+            "-" +
+            maxRange);
         this.minRange = minRange;
         this.maxRange = maxRange;
         this.value = value;
@@ -19,7 +24,10 @@ class DailyCardLimitReachedError extends Error {
     requestedAmount;
     name = "DailyCardLimitReachedError";
     constructor(dailyCardLimit, requestedAmount) {
-        super("Daily card limit reached. Limit: " + dailyCardLimit + " Requested: " + requestedAmount);
+        super("Daily card limit reached. Limit: " +
+            dailyCardLimit +
+            " Requested: " +
+            requestedAmount);
         this.dailyCardLimit = dailyCardLimit;
         this.requestedAmount = requestedAmount;
     }

package/dist/pda.d.ts

@@ -1,15 +1,4 @@
-import { Address } from "@coral-xyz/anchor";
+import { type Address } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 export declare function deriveVaultSigner(vault: Address, programId: Address): [PublicKey, number];
 export declare function deriveUserVault(user: Address, programId: Address): [PublicKey, number];
-export declare function deriveCardConfigPda(programId: Address): [PublicKey, number];
-export declare function deriveTokenFeeMapPda(programId: Address): [PublicKey, number];
-export declare function deriveCardPurchasePda(buyer: Address, buyerCounter: bigint, programId: Address): [PublicKey, number];
-export declare function deriveUserPurchaseRecordPda(user: Address, programId: Address): [PublicKey, number];
-export declare function deriveStreamConfigPda(programId: Address): [PublicKey, number];
-export declare function deriveStreamVaultPda(metatadata: Address, programId: Address): [PublicKey, number];
-export declare function deriveStakeAddress(staker: Address, lockup: Address, nonce: bigint, programId: Address): PublicKey;
-export declare function deriveLockupAddress(name: string, programId: Address): PublicKey;
-export declare function deriveUserNonceAddress(user: Address, lockup: Address, programId: Address): PublicKey;
-export declare function deriveStakeVaultAddress(lockup: Address, programId: Address): PublicKey;
-export declare function deriveRewardVaultAddress(lockup: Address, programId: Address): PublicKey;

package/dist/pda.js

@@ -2,88 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deriveVaultSigner = deriveVaultSigner;
 exports.deriveUserVault = deriveUserVault;
-exports.deriveCardConfigPda = deriveCardConfigPda;
-exports.deriveTokenFeeMapPda = deriveTokenFeeMapPda;
-exports.deriveCardPurchasePda = deriveCardPurchasePda;
-exports.deriveUserPurchaseRecordPda = deriveUserPurchaseRecordPda;
-exports.deriveStreamConfigPda = deriveStreamConfigPda;
-exports.deriveStreamVaultPda = deriveStreamVaultPda;
-exports.deriveStakeAddress = deriveStakeAddress;
-exports.deriveLockupAddress = deriveLockupAddress;
-exports.deriveUserNonceAddress = deriveUserNonceAddress;
-exports.deriveStakeVaultAddress = deriveStakeVaultAddress;
-exports.deriveRewardVaultAddress = deriveRewardVaultAddress;
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const VAULT_PROGRAM_V1_SEEDS = {
-    USER_VAULT: [122, 101, 98, 101, 99, 95, 117, 115, 101, 114, 95, 118, 97, 117, 108, 116],
-    VAULT_SIGNER: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114],
+    USER_VAULT: [
+        122, 101, 98, 101, 99, 95, 117, 115, 101, 114, 95, 118, 97, 117, 108, 116,
+    ],
+    VAULT_SIGNER: [
+        122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110,
+        101, 114,
+    ],
 };
 function deriveVaultSigner(vault, programId) {
-    const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(VAULT_PROGRAM_V1_SEEDS.VAULT_SIGNER), (0, anchor_1.translateAddress)(vault).toBuffer()], (0, anchor_1.translateAddress)(programId));
+    const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(VAULT_PROGRAM_V1_SEEDS.VAULT_SIGNER),
+        (0, anchor_1.translateAddress)(vault).toBuffer(),
+    ], (0, anchor_1.translateAddress)(programId));
     return addressAndBump;
 }
 function deriveUserVault(user, programId) {
-    const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(VAULT_PROGRAM_V1_SEEDS.USER_VAULT), (0, anchor_1.translateAddress)(user).toBuffer()], (0, anchor_1.translateAddress)(programId));
-    return addressAndBump;
-}
-const CARD_PROGRAM_V2_SEEDS = {
-    CARD_CONFIG: anchor_1.utils.bytes.utf8.encode("card_config"),
-    TOKEN_FEE_MAP: anchor_1.utils.bytes.utf8.encode("token_fee_map"),
-    USER_CARD_PURCHASE: anchor_1.utils.bytes.utf8.encode("user_card_purchase"),
-    USER_PURCHASE_RECORD: anchor_1.utils.bytes.utf8.encode("user_purchase_record"),
-};
-function deriveCardConfigPda(programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(CARD_PROGRAM_V2_SEEDS.CARD_CONFIG)], (0, anchor_1.translateAddress)(programId));
-}
-function deriveTokenFeeMapPda(programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(CARD_PROGRAM_V2_SEEDS.TOKEN_FEE_MAP)], (0, anchor_1.translateAddress)(programId));
-}
-function deriveCardPurchasePda(buyer, buyerCounter, programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from(CARD_PROGRAM_V2_SEEDS.USER_CARD_PURCHASE),
-        (0, anchor_1.translateAddress)(buyer).toBuffer(),
-        new anchor_1.BN(buyerCounter.toString()).toArrayLike(Buffer, "le", 8),
-    ], (0, anchor_1.translateAddress)(programId));
-}
-function deriveUserPurchaseRecordPda(user, programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(CARD_PROGRAM_V2_SEEDS.USER_PURCHASE_RECORD), (0, anchor_1.translateAddress)(user).toBuffer()], (0, anchor_1.translateAddress)(programId));
-}
-const STREAM_PROGRAM_SEEDS = {
-    STREAM_CONFIG: anchor_1.utils.bytes.utf8.encode("config"),
-};
-function deriveStreamConfigPda(programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(STREAM_PROGRAM_SEEDS.STREAM_CONFIG)], (0, anchor_1.translateAddress)(programId));
-}
-function deriveStreamVaultPda(metatadata, programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([(0, anchor_1.translateAddress)(metatadata).toBuffer()], (0, anchor_1.translateAddress)(programId));
-}
-const STAKE_PROGRAM_SEEDS = {
-    LOCKUP: anchor_1.utils.bytes.utf8.encode("zebec_lockup"),
-    STAKE_VAULT: anchor_1.utils.bytes.utf8.encode("stake_vault"),
-    REWARD_VAULT: anchor_1.utils.bytes.utf8.encode("reward_vault"),
-};
-function deriveStakeAddress(staker, lockup, nonce, programId) {
-    const [stakeAddress] = web3_js_1.PublicKey.findProgramAddressSync([
-        (0, anchor_1.translateAddress)(staker).toBuffer(),
-        (0, anchor_1.translateAddress)(lockup).toBuffer(),
-        new anchor_1.BN(nonce.toString()).toArrayLike(Buffer, "le", 8),
+    const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(VAULT_PROGRAM_V1_SEEDS.USER_VAULT),
+        (0, anchor_1.translateAddress)(user).toBuffer(),
     ], (0, anchor_1.translateAddress)(programId));
-    return stakeAddress;
-}
-function deriveLockupAddress(name, programId) {
-    const [lockupAddress] = web3_js_1.PublicKey.findProgramAddressSync([STAKE_PROGRAM_SEEDS.LOCKUP, anchor_1.utils.bytes.utf8.encode(name)], (0, anchor_1.translateAddress)(programId));
-    return lockupAddress;
-}
-function deriveUserNonceAddress(user, lockup, programId) {
-    const [userNonceAddress] = web3_js_1.PublicKey.findProgramAddressSync([(0, anchor_1.translateAddress)(user).toBuffer(), (0, anchor_1.translateAddress)(lockup).toBuffer()], (0, anchor_1.translateAddress)(programId));
-    return userNonceAddress;
-}
-function deriveStakeVaultAddress(lockup, programId) {
-    const [stakeVault] = web3_js_1.PublicKey.findProgramAddressSync([STAKE_PROGRAM_SEEDS.STAKE_VAULT, (0, anchor_1.translateAddress)(lockup).toBuffer()], (0, anchor_1.translateAddress)(programId));
-    return stakeVault;
-}
-function deriveRewardVaultAddress(lockup, programId) {
-    const [rewardVault] = web3_js_1.PublicKey.findProgramAddressSync([STAKE_PROGRAM_SEEDS.REWARD_VAULT, (0, anchor_1.translateAddress)(lockup).toBuffer()], (0, anchor_1.translateAddress)(programId));
-    return rewardVault;
+    return addressAndBump;
 }

package/dist/providers.js

@@ -9,7 +9,9 @@ class ReadonlyProvider {
     walletAddress;
     constructor(connection, walletAddress) {
         this.connection = connection;
-        this.walletAddress = walletAddress ? (0, anchor_1.translateAddress)(walletAddress) : undefined;
+        this.walletAddress = walletAddress
+            ? (0, anchor_1.translateAddress)(walletAddress)
+            : undefined;
     }
 }
 exports.ReadonlyProvider = ReadonlyProvider;

package/dist/service.d.ts

@@ -1,12 +1,12 @@
-import { Address, BN, Program, Provider } from "@coral-xyz/anchor";
-import { AccountMeta, Commitment, Connection, Keypair, PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
+import { type Address, BN, Program, type Provider } from "@coral-xyz/anchor";
+import { type AccountMeta, type Commitment, Keypair, type PublicKey, type Signer, type TransactionInstruction } from "@solana/web3.js";
 import { MultiTransactionPayload, TransactionPayload } from "@zebec-network/solana-common";
-import { ZebecCardV2Idl } from "@zebec-network/zebec-card-v2-sdk";
-import { ZebecStakeIdlV1 } from "@zebec-network/zebec-stake-sdk";
-import { ZebecStreamIdl } from "@zebec-network/zebec-stream-sdk";
-import { ZebecVaultV1Idl } from "./artifacts";
-import { RpcNetwork } from "./constants";
-import { CancelStreamParams, ChangeStreamReceiverParams, createMultipleStreamFromVaultParams, CreateSilverCardInstructionData, CreateSilverCardParams, CreateStreamFromVaultParams, LoadCarbonCardInstructionData, LoadCarbonCardParams, Numeric, PauseResumeStreamParams, ProposalAction, ProposalInfo, StakeInstructionData, StakeUserNonceInfo, StreamMetadataInfo, SwapAndCreateSilverCardParams, SwapAndLoadCarbonCardParams, TokenFeeRecord, VaultInfo, WithdrawStreamParams } from "./types";
+import { type ZebecCardV2Idl } from "@zebec-network/zebec-card-v2-sdk";
+import { type ZebecStakeIdlV1 } from "@zebec-network/zebec-stake-sdk";
+import { type ZebecStreamIdl } from "@zebec-network/zebec-stream-sdk";
+import { type ZebecVaultV1Idl } from "./artifacts";
+import { type RpcNetwork } from "./constants";
+import type { CancelStreamParams, ChangeStreamReceiverParams, CreateSilverCardInstructionData, CreateSilverCardParams, CreateStreamFromVaultParams, createMultipleStreamFromVaultParams, LoadCarbonCardInstructionData, LoadCarbonCardParams, Numeric, PauseResumeStreamParams, ProposalAction, ProposalInfo, StakeInstructionData, StakeUserNonceInfo, StreamMetadataInfo, SwapAndCreateSilverCardParams, SwapAndLoadCarbonCardParams, TokenFeeRecord, VaultInfo, WithdrawStreamParams } from "./types";
 export declare class ZebecVaultService {
     readonly provider: Provider;
     readonly vaultV1Program: Program<ZebecVaultV1Idl>;
@@ -102,6 +102,10 @@ export declare class ZebecVaultService {
     swapAndCreateSilverCard(params: SwapAndCreateSilverCardParams): Promise<TransactionPayload>;
     swapAndLoadCarbonCard(params: SwapAndLoadCarbonCardParams): Promise<TransactionPayload>;
     getCardCustomTokenFees(): Promise<TokenFeeRecord[]>;
+    getTransfeFeesForStreamInstruction(streamConfig: PublicKey, feeVault: PublicKey, tokenMint: PublicKey, vaultOwner: PublicKey, feeVaultTokenAccount: PublicKey, vault: PublicKey, vaultSigner: PublicKey, vaultSignerTokenAccount: PublicKey, data: {
+        decimals: number;
+        feeAmount: BN;
+    }): Promise<TransactionInstruction>;
     getCreateStreamFromVaultInstruction(vaultOwner: PublicKey, vault: PublicKey, vaultSigner: PublicKey, vaultSignerAta: PublicKey, receiver: PublicKey, receiverAta: PublicKey, streamToken: PublicKey, streamMetadata: PublicKey, streamConfig: PublicKey, withdrawAccount: PublicKey, streamVault: PublicKey, streamVaultAta: PublicKey, zebecStreamProgram: PublicKey, streamData: {
         amount: BN;
         automaticWithdrawal: boolean;
@@ -124,6 +128,212 @@ export declare class ZebecVaultService {
     getCancelStreamInstruction(feePayer: PublicKey, otherParty: PublicKey, otherPartyAta: PublicKey, signer: PublicKey, signerAta: PublicKey, streamMetadata: PublicKey, streamToken: PublicKey, streamVault: PublicKey, streamVaultAta: PublicKey): Promise<TransactionInstruction>;
     getWithdrawStreamInstruction(receiver: PublicKey, receiverAta: PublicKey, streamMetadata: PublicKey, streamToken: PublicKey, streamVault: PublicKey, streamVaultAta: PublicKey, withdrawer: PublicKey, feePayer: PublicKey): Promise<TransactionInstruction>;
     getChangeStreamReceiverInstruction(streamMetadata: PublicKey, newRecipient: PublicKey, signer: PublicKey): Promise<TransactionInstruction>;
+    getTransferFeesForStreamInstruction(feeVault: PublicKey, tokenMint: PublicKey, vaultOwner: PublicKey, feeVaultTokenAccount: PublicKey, vault: PublicKey, vaultSigner: PublicKey, vaultSignerTokenAccount: PublicKey, data: {
+        decimals: number;
+        feeAmount: BN;
+    }): Promise<import("@coral-xyz/anchor/dist/cjs/program/namespace/methods").MethodsBuilder<ZebecVaultV1Idl, {
+        name: "transferFees";
+        discriminator: [103, 60, 61, 79, 56, 61, 76, 49];
+        accounts: [{
+            name: "vaultOwner";
+            writable: true;
+            signer: true;
+        }, {
+            name: "vault";
+            pda: {
+                seeds: [{
+                    kind: "const";
+                    value: [122, 101, 98, 101, 99, 95, 117, 115, 101, 114, 95, 118, 97, 117, 108, 116];
+                }, {
+                    kind: "account";
+                    path: "vaultOwner";
+                }];
+            };
+        }, {
+            name: "vaultSigner";
+            pda: {
+                seeds: [{
+                    kind: "const";
+                    value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                }, {
+                    kind: "account";
+                    path: "vault";
+                }];
+            };
+        }, {
+            name: "vaultSignerTokenAccount";
+            writable: true;
+            pda: {
+                seeds: [{
+                    kind: "account";
+                    path: "vaultSigner";
+                }, {
+                    kind: "const";
+                    value: [6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235, 121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133, 126, 255, 0, 169];
+                }, {
+                    kind: "account";
+                    path: "tokenMint";
+                }];
+                program: {
+                    kind: "const";
+                    value: [140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216, 219, 233, 248, 89];
+                };
+            };
+        }, {
+            name: "feeVault";
+            writable: true;
+        }, {
+            name: "feeVaultTokenAccount";
+            writable: true;
+            pda: {
+                seeds: [{
+                    kind: "account";
+                    path: "feeVault";
+                }, {
+                    kind: "const";
+                    value: [6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235, 121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133, 126, 255, 0, 169];
+                }, {
+                    kind: "account";
+                    path: "tokenMint";
+                }];
+                program: {
+                    kind: "const";
+                    value: [140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216, 219, 233, 248, 89];
+                };
+            };
+        }, {
+            name: "streamConfig";
+            pda: {
+                seeds: [{
+                    kind: "const";
+                    value: [99, 111, 110, 102, 105, 103];
+                }, {
+                    kind: "account";
+                    path: "stream_config.config_name";
+                    account: "streamConfig";
+                }];
+                program: {
+                    kind: "const";
+                    value: [14, 182, 227, 133, 227, 148, 128, 223, 155, 42, 111, 113, 225, 202, 68, 21, 200, 52, 224, 124, 140, 58, 250, 120, 166, 198, 146, 141, 100, 198, 30, 185];
+                };
+            };
+        }, {
+            name: "tokenMint";
+        }, {
+            name: "tokenProgram";
+            address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+        }, {
+            name: "associatedTokenProgram";
+            address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+        }, {
+            name: "systemProgram";
+            address: "11111111111111111111111111111111";
+        }];
+        args: [{
+            name: "params";
+            type: {
+                defined: {
+                    name: "transferFeesParams";
+                };
+            };
+        }];
+    } & {
+        name: "transferFees";
+    }, {
+        name: "vaultOwner";
+        writable: true;
+        signer: true;
+    } | {
+        name: "vault";
+        pda: {
+            seeds: [{
+                kind: "const";
+                value: [122, 101, 98, 101, 99, 95, 117, 115, 101, 114, 95, 118, 97, 117, 108, 116];
+            }, {
+                kind: "account";
+                path: "vaultOwner";
+            }];
+        };
+    } | {
+        name: "vaultSigner";
+        pda: {
+            seeds: [{
+                kind: "const";
+                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+            }, {
+                kind: "account";
+                path: "vault";
+            }];
+        };
+    } | {
+        name: "vaultSignerTokenAccount";
+        writable: true;
+        pda: {
+            seeds: [{
+                kind: "account";
+                path: "vaultSigner";
+            }, {
+                kind: "const";
+                value: [6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235, 121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133, 126, 255, 0, 169];
+            }, {
+                kind: "account";
+                path: "tokenMint";
+            }];
+            program: {
+                kind: "const";
+                value: [140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216, 219, 233, 248, 89];
+            };
+        };
+    } | {
+        name: "feeVault";
+        writable: true;
+    } | {
+        name: "feeVaultTokenAccount";
+        writable: true;
+        pda: {
+            seeds: [{
+                kind: "account";
+                path: "feeVault";
+            }, {
+                kind: "const";
+                value: [6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235, 121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133, 126, 255, 0, 169];
+            }, {
+                kind: "account";
+                path: "tokenMint";
+            }];
+            program: {
+                kind: "const";
+                value: [140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216, 219, 233, 248, 89];
+            };
+        };
+    } | {
+        name: "streamConfig";
+        pda: {
+            seeds: [{
+                kind: "const";
+                value: [99, 111, 110, 102, 105, 103];
+            }, {
+                kind: "account";
+                path: "stream_config.config_name";
+                account: "streamConfig";
+            }];
+            program: {
+                kind: "const";
+                value: [14, 182, 227, 133, 227, 148, 128, 223, 155, 42, 111, 113, 225, 202, 68, 21, 200, 52, 224, 124, 140, 58, 250, 120, 166, 198, 146, 141, 100, 198, 30, 185];
+            };
+        };
+    } | {
+        name: "tokenMint";
+    } | {
+        name: "tokenProgram";
+        address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+    } | {
+        name: "associatedTokenProgram";
+        address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+    } | {
+        name: "systemProgram";
+        address: "11111111111111111111111111111111";
+    }>>;
     createStreamFromVault(params: CreateStreamFromVaultParams): Promise<TransactionPayload>;
     createMultipleStreamFromVault(params: createMultipleStreamFromVaultParams): Promise<MultiTransactionPayload>;
     cancelStream(params: CancelStreamParams): Promise<TransactionPayload>;
@@ -152,5 +362,5 @@ export declare class ZebecVaultService {
     get cardV2ProgramId(): PublicKey;
     get streamProgramId(): PublicKey;
     get stakeProgramId(): PublicKey;
-    get connection(): Connection;
+    get connection(): import("@solana/web3.js").Connection;
 }