@zebec-network/zebec-stream-sdk 3.0.0 → 3.1.0-dev.1

package/dist/services/streamService.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZebecStreamService = void 0;
-const assert_1 = __importDefault(require("assert"));
-const bignumber_js_1 = require("bignumber.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
 const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
@@ -14,6 +12,8 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const core_utils_1 = require("@zebec-network/core-utils");
 const solana_common_1 = require("@zebec-network/solana-common");
+const assert_1 = __importDefault(require("assert"));
+const bignumber_js_1 = require("bignumber.js");
 const artifacts_1 = require("../artifacts");
 const constants_1 = require("../constants");
 const pda_1 = require("../pda");
@@ -197,7 +197,9 @@ class ZebecStreamService {
             .instruction();
     }
     async initializeStreamConfig(params) {
-        const admin = params.admin ? (0, anchor_1.translateAddress)(params.admin) : this.provider.publicKey;
+        const admin = params.admin
+            ? (0, anchor_1.translateAddress)(params.admin)
+            : this.provider.publicKey;
         if (!admin) {
             throw new Error("Either provide admin or create provider with public key");
         }
@@ -209,8 +211,12 @@ class ZebecStreamService {
         const feeVault = (0, anchor_1.translateAddress)(params.config.feeVault);
         const feeTiers = params.config.feeTiers.map((tier) => {
             return {
-                minAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.minThreshold).times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS)).toFixed(0)),
-                maxAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.maxThreshold).times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS)).toFixed(0)),
+                minAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.minThreshold)
+                    .times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS))
+                    .toFixed(0)),
+                maxAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.maxThreshold)
+                    .times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS))
+                    .toFixed(0)),
                 fee: new anchor_1.BN((0, core_utils_1.percentToBps)(tier.feeRateInPercent)),
             };
         });
@@ -226,7 +232,9 @@ class ZebecStreamService {
         return this._createPayload(admin, [ix]);
     }
     async updateStreamConfig(params) {
-        const admin = params.admin ? (0, anchor_1.translateAddress)(params.admin) : this.provider.publicKey;
+        const admin = params.admin
+            ? (0, anchor_1.translateAddress)(params.admin)
+            : this.provider.publicKey;
         if (!admin) {
             throw new Error("Either provide admin or create provider with public key");
         }
@@ -238,8 +246,12 @@ class ZebecStreamService {
         const feeVault = (0, anchor_1.translateAddress)(params.config.feeVault);
         const feeTiers = params.config.feeTiers.map((tier) => {
             return {
-                minAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.minThreshold).times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS)).toFixed(0)),
-                maxAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.maxThreshold).times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS)).toFixed(0)),
+                minAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.minThreshold)
+                    .times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS))
+                    .toFixed(0)),
+                maxAmount: new anchor_1.BN((0, bignumber_js_1.BigNumber)(tier.maxThreshold)
+                    .times(solana_common_1.TEN_BIGNUM.pow(solana_common_1.USDC_DECIMALS))
+                    .toFixed(0)),
                 fee: new anchor_1.BN((0, core_utils_1.percentToBps)(tier.feeRateInPercent)),
             };
         });
@@ -257,32 +269,31 @@ class ZebecStreamService {
     async createStream(params) {
         const receiver = (0, anchor_1.translateAddress)(params.receiver);
         const sender = (0, anchor_1.translateAddress)(params.sender);
-        const feePayer = params.feePayer ? (0, anchor_1.translateAddress)(params.feePayer) : sender;
+        const feePayer = params.feePayer
+            ? (0, anchor_1.translateAddress)(params.feePayer)
+            : sender;
         const streamToken = (0, anchor_1.translateAddress)(params.streamToken);
         const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamConfigName, this.programId);
         const streamConfigAccount = await this.program.account.streamConfig.fetch(streamConfig);
         const withdrawer = streamConfigAccount.withdrawAccount;
         const autoWithdrawFrequencies = new Set(Array.from(streamConfigAccount.frequencies.map((f) => f.toNumber())));
-        if (params.automaticWithdrawal && !autoWithdrawFrequencies.has(params.autoWithdrawFrequency)) {
+        if (params.automaticWithdrawal &&
+            !autoWithdrawFrequencies.has(params.autoWithdrawFrequency)) {
             throw new Error("Invalid stream frequency");
         }
         const senderAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, sender, true);
         const streamMetadataKeypair = params.streamMetadataKeypair ?? web3_js_1.Keypair.generate();
         const streamTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, streamToken);
-        const amount = (0, bignumber_js_1.BigNumber)(params.amount).times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals)).toFixed(0);
+        const amount = (0, bignumber_js_1.BigNumber)(params.amount)
+            .times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals))
+            .toFixed(0);
         const cliffPercentage = new anchor_1.BN((0, core_utils_1.percentToBps)(params.cliffPercentage));
         const streamName = new Uint8Array(constants_1.STREAM_NAME_BUFFER_SIZE);
         streamName.set(anchor_1.utils.bytes.utf8.encode(params.streamName));
         const configAccount = await this.program.account.streamConfig.fetch(streamConfig);
-        const feeTiers = configAccount.feeTiers.tiers.map((tier) => ({
-            feeRateInPercent: (0, core_utils_1.bpsToPercent)(tier.fee.toNumber()),
-            minThreshold: (0, bignumber_js_1.BigNumber)(tier.minAmount.toString()).div(solana_common_1.UNITS_PER_USDC).toFixed(),
-            maxThreshold: (0, bignumber_js_1.BigNumber)(tier.maxAmount.toString()).div(solana_common_1.UNITS_PER_USDC).toFixed(),
-        }));
-        const feeAmount = await (0, utils_1.calculateFeeTokenAmountForStream)(params.streamTokenSymbol, params.amount, params.feeTokenSymbol, feeTiers, this.network);
-        const feeToken = (0, anchor_1.translateAddress)(params.feeToken);
-        const feeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, feeToken);
-        const parsedFeeAmount = (0, bignumber_js_1.BigNumber)(feeAmount).times(solana_common_1.TEN_BIGNUM.pow(feeTokenDecimals)).toFixed(0);
+        const feeInfo = await (0, utils_1.getFeeInfoForStream)(streamToken, amount, streamTokenDecimals, this.network);
+        const feeToken = (0, anchor_1.translateAddress)(feeInfo.feeToken.mintAddress);
+        const parsedFeeAmount = feeInfo.feeAmountRaw;
         const feeVault = configAccount.feeVault;
         const feeVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, feeVault, true);
         const senderFeeTokenAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, sender, true);
@@ -350,8 +361,14 @@ class ZebecStreamService {
     }
     async withdrawStream(params) {
         const receiver = (0, anchor_1.translateAddress)(params.receiver);
-        const withdrawer = params.withdrawer ? (0, anchor_1.translateAddress)(params.withdrawer) : receiver;
-        const feePayer = params.feePayer ? (0, anchor_1.translateAddress)(params.feePayer) : params.withdrawer ? withdrawer : receiver;
+        const withdrawer = params.withdrawer
+            ? (0, anchor_1.translateAddress)(params.withdrawer)
+            : receiver;
+        const feePayer = params.feePayer
+            ? (0, anchor_1.translateAddress)(params.feePayer)
+            : params.withdrawer
+                ? withdrawer
+                : receiver;
         const streamMetadata = (0, anchor_1.translateAddress)(params.streamMetadata);
         const streamMetadataAccount = await this.program.account.paymentStream.fetch(streamMetadata);
         const streamToken = streamMetadataAccount.financials.streamToken;
@@ -388,8 +405,12 @@ class ZebecStreamService {
             frequencies: configInfo.frequencies.map((frequency) => frequency.toNumber()),
             feeTiers: configInfo.feeTiers.tiers.map((tier) => ({
                 feeRateInPercent: (0, core_utils_1.bpsToPercent)(tier.fee.toNumber()),
-                minThreshold: (0, bignumber_js_1.BigNumber)(tier.minAmount.toString()).div(solana_common_1.UNITS_PER_USDC).toFixed(),
-                maxThreshold: (0, bignumber_js_1.BigNumber)(tier.maxAmount.toString()).div(solana_common_1.UNITS_PER_USDC).toFixed(),
+                minThreshold: (0, bignumber_js_1.BigNumber)(tier.minAmount.toString())
+                    .div(solana_common_1.UNITS_PER_USDC)
+                    .toFixed(),
+                maxThreshold: (0, bignumber_js_1.BigNumber)(tier.maxAmount.toString())
+                    .div(solana_common_1.UNITS_PER_USDC)
+                    .toFixed(),
             })),
             feeVault: configInfo.feeVault,
         };
@@ -419,7 +440,9 @@ class ZebecStreamService {
                     freezeAuthority: mintData.parsed.info.freezeAuthority
                         ? new web3_js_1.PublicKey(mintData.parsed.info.freezeAuthority)
                         : null,
-                    supply: (0, bignumber_js_1.BigNumber)(mintData.parsed.info.supply).div(solana_common_1.TEN_BIGNUM.pow(mintData.parsed.info.decimals)).toFixed(),
+                    supply: (0, bignumber_js_1.BigNumber)(mintData.parsed.info.supply)
+                        .div(solana_common_1.TEN_BIGNUM.pow(mintData.parsed.info.decimals))
+                        .toFixed(),
                     isInitialized: Boolean(mintData.parsed.info.isInitialized),
                     mintAuthority: mintData.parsed.info.mintAuthority
                         ? new web3_js_1.PublicKey(mintData.parsed.info.mintAuthority)

package/dist/types.d.ts

@@ -67,9 +67,6 @@ export type CreateStreamParams = {
     receiver: Address;
     sender: Address;
     streamToken: Address;
-    streamTokenSymbol: string;
-    feeToken: Address;
-    feeTokenSymbol: string;
     amount: Numeric;
     automaticWithdrawal: boolean;
     cancelableByRecipient: boolean;
@@ -137,3 +134,27 @@ export type ChangeStreamReceiverParams = {
     newRecipient: Address;
     signer: Address;
 };
+export type StreamFeeInfo = {
+    tokenSymbol: string;
+    mintAddress: string;
+    chain: string;
+    streamAmount: string;
+    streamAmountUi: string;
+    tokenPriceUsd: number;
+    streamAmountUsd: number;
+    feeTier: {
+        tier: number;
+        range: string;
+        feeRatePercent: number;
+    };
+    feeRatePercent: number;
+    feeAmountUsd: number;
+    feeToken: {
+        symbol: string;
+        decimals: number;
+        priceUsd: number;
+        mintAddress: string;
+    };
+    feeAmount: number;
+    feeAmountRaw: string;
+};

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import type { FeeTier, Numeric, RpcNetwork } from "./types";
-export declare function getTokenUsdPrice(tokenSymbol: string, network: RpcNetwork): Promise<number>;
-export declare function calculateFeeTokenAmountForStream(streamTokenSymbol: string, streamTokenAmount: Numeric, feeTokenSymbol: string, feeTiers: FeeTier[], network: RpcNetwork): Promise<BigNumber>;
-export declare function getFeeRateForUsdAmount(amount: BigNumber, feeTiers: FeeTier[]): string;
+import type { PublicKey } from "@solana/web3.js";
+import type { FeeTier, RpcNetwork, StreamFeeInfo } from "./types";
+export declare function getFeeInfoForStream(streamToken: PublicKey, parsedStreamTokenAmount: BigNumber.Value, streamTokenDecimals: number, network: RpcNetwork): Promise<StreamFeeInfo>;
+export declare function getFeeRateForUsdAmount(amount: BigNumber.Value, feeTiers: FeeTier[]): string;

package/dist/utils.js

@@ -1,40 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenUsdPrice = getTokenUsdPrice;
-exports.calculateFeeTokenAmountForStream = calculateFeeTokenAmountForStream;
+exports.getFeeInfoForStream = getFeeInfoForStream;
 exports.getFeeRateForUsdAmount = getFeeRateForUsdAmount;
-const bignumber_js_1 = require("bignumber.js");
 const core_utils_1 = require("@zebec-network/core-utils");
+const bignumber_js_1 = require("bignumber.js");
 const constants_1 = require("./constants");
-async function getTokenUsdPrice(tokenSymbol, network) {
-    const url = `${constants_1.SUPERAPP_BACKEND_URL[network]}/tokens/quotes/${encodeURIComponent(`${tokenSymbol}_USD`)}/1?type=EXACT_IN&chainName=SOLANA`;
+async function getFeeInfoForStream(streamToken, parsedStreamTokenAmount, streamTokenDecimals, network) {
+    const urlsParams = new URLSearchParams({
+        streamToken: streamToken.toBase58(),
+        chain: "SOLANA",
+        amount: (0, bignumber_js_1.BigNumber)(parsedStreamTokenAmount).toFixed(0),
+        decimals: streamTokenDecimals.toString(),
+    });
+    const url = `${constants_1.SUPERAPP_BACKEND_URL[network]}/l1-stream/fees/stream-quote?${urlsParams}`;
+    console.debug("fetching fee token amount from url:", url);
     const response = await fetch(url);
     if (!response.ok) {
         const body = await response.text().catch(() => "");
-        throw new Error(`Failed to fetch token price for symbol: ${tokenSymbol}, network: ${network}, status: ${response.status} ${body}`);
+        throw new Error(`Failed to fetch fee token amount: ${response.status} ${response.statusText} ${body}`.trim());
     }
     const data = await response.json();
-    if (!data || !("exchangeRate" in data)) {
-        console.debug("Unexpected response format when fetching token price:", data);
-        throw new Error(`Invalid response format when fetching token price for symbol: ${tokenSymbol}, network: ${network}`);
-    }
-    return Number(data.exchangeRate);
-}
-async function calculateFeeTokenAmountForStream(streamTokenSymbol, streamTokenAmount, feeTokenSymbol, feeTiers, network) {
-    const oneStreamTokenPriceInUsd = await getTokenUsdPrice(streamTokenSymbol, network);
-    const oneFeeTokenPriceInUsd = await getTokenUsdPrice(feeTokenSymbol, network);
-    if (oneFeeTokenPriceInUsd === 0) {
-        throw new Error(`Fee token price is zero for symbol: ${feeTokenSymbol}, network: ${network}`);
-    }
-    const streamTokenAmountUsdPrice = new bignumber_js_1.BigNumber(streamTokenAmount).times(oneStreamTokenPriceInUsd);
-    const feeRateInBps = getFeeRateForUsdAmount(streamTokenAmountUsdPrice, feeTiers);
-    const feeAmountUsdPrice = streamTokenAmountUsdPrice.times(feeRateInBps).div(10000);
-    const feeTokenAmount = feeAmountUsdPrice.div(oneFeeTokenPriceInUsd);
-    return feeTokenAmount;
+    return data;
 }
 function getFeeRateForUsdAmount(amount, feeTiers) {
     feeTiers.sort((a, b) => (0, bignumber_js_1.BigNumber)(a.minThreshold).comparedTo((0, bignumber_js_1.BigNumber)(b.minThreshold)) ?? 0);
-    const tier = feeTiers.find((tier) => amount.gte(tier.minThreshold) && amount.lt(tier.maxThreshold));
+    const tier = feeTiers.find((tier) => (0, bignumber_js_1.BigNumber)(amount).gte(tier.minThreshold) &&
+        (0, bignumber_js_1.BigNumber)(amount).lt(tier.maxThreshold));
     if (!tier) {
         throw new Error(`No fee tier found for amount: ${amount}`);
     }

package/package.json

@@ -40,5 +40,5 @@
     "test:single": "ts-mocha -p ./tsconfig.json -t 1000000000"
   },
   "types": "dist/index.d.ts",
-  "version": "3.0.0"
+  "version": "3.1.0-dev.1"
 }