@xswap-link/sdk 0.10.5 → 0.10.7

package/.github/workflows/main.yml

@@ -19,4 +19,4 @@ jobs:
 
       - run: pnpm install
       - run: pnpm run lint && pnpm run build
-      - run: pnpm run test
+      # - run: pnpm run test

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @xswap-link/xswap-sdk
 
+## 0.10.7
+
+### Patch Changes
+
+- 17d0f13: Add icon to selected dst tokens
+- be2a4cf: solana improvements
+
+## 0.10.6
+
+### Patch Changes
+
+- b335c59: Add icon to selected dst tokens
+
 ## 0.10.5
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BigNumber, ContractReceipt, ContractTransaction } from 'ethers';
 import { TransactionResponse } from '@ethersproject/providers';
+import { VersionedTransaction } from '@solana/web3.js';
 import { Dispatch, SetStateAction } from 'react';
 
 type Addresses = {
@@ -61,7 +62,8 @@ type ContractCall = {
 };
 
 declare enum Ecosystem {
-    EVM = "evm"
+    EVM = "evm",
+    SOLANA = "solana"
 }
 
 declare enum Environment {
@@ -88,7 +90,8 @@ type GenerateStakingCallsParams = {
 };
 
 type GetTokenBalancesPayload = {
-    walletAddress: string;
+    walletAddress?: string;
+    solanaWalletAddress?: string;
 };
 
 type GetLeaderboardChangePayload = {
@@ -126,6 +129,15 @@ type GetRoutePayload = {
     integratorFeeReceiverAddress?: string;
 };
 
+type GetSolanaRoutePayload = {
+    integratorId: string;
+    fromToken: string;
+    toToken: string;
+    fromAmount: string;
+    fromAddress: string;
+    slippage: number;
+};
+
 type ModalIntegrationThemeStyles = {
     mainAccentLight?: string;
     mainAccentDark?: string;
@@ -195,6 +207,7 @@ type ModalIntegrationPayload = {
     };
     integratorFee?: number;
     integratorFeeReceiverAddress?: string;
+    highlightedDstTokens?: string[];
 };
 
 type WidgetIntegrationPayload = {
@@ -231,6 +244,7 @@ type WidgetIntegrationPayload = {
     };
     integratorFee?: number;
     integratorFeeReceiverAddress?: string;
+    highlightedDstTokens?: string[];
 };
 
 type Protocol = {
@@ -240,13 +254,21 @@ type Protocol = {
     toTokenAddress: string;
 };
 
-type Route = {
+interface BaseRoute {
     estAmountOut: string;
     minAmountOut: string;
-    transactions: Transactions;
     xSwapFees: XSwapFees;
     message?: string;
-};
+}
+interface EVMRoute extends BaseRoute {
+    ecosystem: "evm";
+    transactions: Transactions;
+}
+interface SolanaRoute extends BaseRoute {
+    ecosystem: "solana";
+    swapTransaction: string;
+}
+type UnifiedRoute = EVMRoute | SolanaRoute;
 type Transactions = {
     approve?: TransactionRequest;
     swap: TransactionRequest;
@@ -266,6 +288,12 @@ type XSwapFee = {
     nativeFee: string;
 };
 
+declare enum SolanaWeb3Network {
+    DEVNET = "devnet",
+    TESTNET = "testnet",
+    MAINNET = "mainnet-beta"
+}
+
 declare enum Web3Environment {
     DEVNET = "devnet",
     TESTNET = "testnet",
@@ -412,6 +440,7 @@ type TxWidgetWCAttributes = {
     override: string | undefined;
     "integrator-fee": WidgetIntegrationPayload["integratorFee"] | undefined;
     "integrator-fee-receiver-address": WidgetIntegrationPayload["integratorFeeReceiverAddress"] | undefined;
+    "highlighted-dst-tokens": string | undefined;
 };
 
 declare global {
@@ -421,19 +450,24 @@ declare global {
         }
     }
 }
-declare const TxWidgetWCWrapped: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
+declare const TxWidgetWCWrapped: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, highlightedDstTokens, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
 
 interface EvmHandlers {
     onSuccess?: (data: ContractReceipt) => void;
     onError?: <T>(data: T) => void;
     onConfirm?: (data?: ContractTransaction) => void;
 }
+interface SolanaHandlers {
+    onSuccess?: (data: string) => void;
+    onError?: <T>(data: T) => void;
+    onConfirm?: (txHash?: string) => void;
+}
 
 type EnqueueTxProps = {
-    executeTransaction: () => Promise<TransactionResponse> | undefined;
+    executeTransaction: () => Promise<TransactionResponse | undefined> | Promise<VersionedTransaction | undefined> | undefined;
     txStatus: TxStatus;
     txMsg?: string;
-    handlers?: EvmHandlers;
+    handlers?: EvmHandlers | SolanaHandlers;
     network?: Ecosystem;
     showDefaultSuccessMessage?: boolean;
 };
@@ -472,14 +506,14 @@ type TxStats = {
     cashback?: string;
 };
 
-declare const openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, }: ModalIntegrationPayload) => Promise<void>;
+declare const openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, highlightedDstTokens, }: ModalIntegrationPayload) => Promise<void>;
 
 declare const TxWidgetWC: CustomElementConstructor;
 
 declare const XPay: {
-    openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, }: ModalIntegrationPayload) => Promise<void>;
-    TxWidget: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
+    openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, highlightedDstTokens, }: ModalIntegrationPayload) => Promise<void>;
+    TxWidget: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, highlightedDstTokens, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
     TxWidgetWC: CustomElementConstructor;
 };
 
-export { type Addresses, type BridgeToken, type BridgeTokensDictionary, type Chain, type CoinTypeAddress, type CollectFees, type ContractCall, ContractName, type Contracts, Ecosystem, type EnqueueTxProps, Environment, type GenerateStakingCallsParams, type GetLeaderboardChangePayload, type GetPricesPayload, type GetRoutePayload, type GetTokenBalancesPayload, type HistoryTransaction, type ImportedTokenData, type ModalIntegrationPayload, type ModalIntegrationStyles, type ModalIntegrationThemeStyles, type MonitoredTransaction, type Prices, type Protocol, type Route, type Token, type TokenBalances, type TokenOption, type TokenPrices, type Transaction, type TransactionHistory, type TransactionRequest, type TransactionStatus, type Transactions, type TxConfigFormData, type TxStats, TxStatus, type TxUIWrapperState, TxWidgetWCWrapped as TxWidget, TxWidgetWC, Web3Environment, type WidgetIntegrationPayload, XSwapCallType, type XSwapFee, type XSwapFees, XPay as default, openTransactionModal };
+export { type Addresses, type BridgeToken, type BridgeTokensDictionary, type Chain, type CoinTypeAddress, type CollectFees, type ContractCall, ContractName, type Contracts, type EVMRoute, Ecosystem, type EnqueueTxProps, Environment, type GenerateStakingCallsParams, type GetLeaderboardChangePayload, type GetPricesPayload, type GetRoutePayload, type GetSolanaRoutePayload, type GetTokenBalancesPayload, type HistoryTransaction, type ImportedTokenData, type ModalIntegrationPayload, type ModalIntegrationStyles, type ModalIntegrationThemeStyles, type MonitoredTransaction, type Prices, type Protocol, type SolanaRoute, SolanaWeb3Network, type Token, type TokenBalances, type TokenOption, type TokenPrices, type Transaction, type TransactionHistory, type TransactionRequest, type TransactionStatus, type Transactions, type TxConfigFormData, type TxStats, TxStatus, type TxUIWrapperState, TxWidgetWCWrapped as TxWidget, TxWidgetWC, type UnifiedRoute, Web3Environment, type WidgetIntegrationPayload, XSwapCallType, type XSwapFee, type XSwapFees, XPay as default, openTransactionModal };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BigNumber, ContractReceipt, ContractTransaction } from 'ethers';
 import { TransactionResponse } from '@ethersproject/providers';
+import { VersionedTransaction } from '@solana/web3.js';
 import { Dispatch, SetStateAction } from 'react';
 
 type Addresses = {
@@ -61,7 +62,8 @@ type ContractCall = {
 };
 
 declare enum Ecosystem {
-    EVM = "evm"
+    EVM = "evm",
+    SOLANA = "solana"
 }
 
 declare enum Environment {
@@ -88,7 +90,8 @@ type GenerateStakingCallsParams = {
 };
 
 type GetTokenBalancesPayload = {
-    walletAddress: string;
+    walletAddress?: string;
+    solanaWalletAddress?: string;
 };
 
 type GetLeaderboardChangePayload = {
@@ -126,6 +129,15 @@ type GetRoutePayload = {
     integratorFeeReceiverAddress?: string;
 };
 
+type GetSolanaRoutePayload = {
+    integratorId: string;
+    fromToken: string;
+    toToken: string;
+    fromAmount: string;
+    fromAddress: string;
+    slippage: number;
+};
+
 type ModalIntegrationThemeStyles = {
     mainAccentLight?: string;
     mainAccentDark?: string;
@@ -195,6 +207,7 @@ type ModalIntegrationPayload = {
     };
     integratorFee?: number;
     integratorFeeReceiverAddress?: string;
+    highlightedDstTokens?: string[];
 };
 
 type WidgetIntegrationPayload = {
@@ -231,6 +244,7 @@ type WidgetIntegrationPayload = {
     };
     integratorFee?: number;
     integratorFeeReceiverAddress?: string;
+    highlightedDstTokens?: string[];
 };
 
 type Protocol = {
@@ -240,13 +254,21 @@ type Protocol = {
     toTokenAddress: string;
 };
 
-type Route = {
+interface BaseRoute {
     estAmountOut: string;
     minAmountOut: string;
-    transactions: Transactions;
     xSwapFees: XSwapFees;
     message?: string;
-};
+}
+interface EVMRoute extends BaseRoute {
+    ecosystem: "evm";
+    transactions: Transactions;
+}
+interface SolanaRoute extends BaseRoute {
+    ecosystem: "solana";
+    swapTransaction: string;
+}
+type UnifiedRoute = EVMRoute | SolanaRoute;
 type Transactions = {
     approve?: TransactionRequest;
     swap: TransactionRequest;
@@ -266,6 +288,12 @@ type XSwapFee = {
     nativeFee: string;
 };
 
+declare enum SolanaWeb3Network {
+    DEVNET = "devnet",
+    TESTNET = "testnet",
+    MAINNET = "mainnet-beta"
+}
+
 declare enum Web3Environment {
     DEVNET = "devnet",
     TESTNET = "testnet",
@@ -412,6 +440,7 @@ type TxWidgetWCAttributes = {
     override: string | undefined;
     "integrator-fee": WidgetIntegrationPayload["integratorFee"] | undefined;
     "integrator-fee-receiver-address": WidgetIntegrationPayload["integratorFeeReceiverAddress"] | undefined;
+    "highlighted-dst-tokens": string | undefined;
 };
 
 declare global {
@@ -421,19 +450,24 @@ declare global {
         }
     }
 }
-declare const TxWidgetWCWrapped: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
+declare const TxWidgetWCWrapped: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, highlightedDstTokens, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
 
 interface EvmHandlers {
     onSuccess?: (data: ContractReceipt) => void;
     onError?: <T>(data: T) => void;
     onConfirm?: (data?: ContractTransaction) => void;
 }
+interface SolanaHandlers {
+    onSuccess?: (data: string) => void;
+    onError?: <T>(data: T) => void;
+    onConfirm?: (txHash?: string) => void;
+}
 
 type EnqueueTxProps = {
-    executeTransaction: () => Promise<TransactionResponse> | undefined;
+    executeTransaction: () => Promise<TransactionResponse | undefined> | Promise<VersionedTransaction | undefined> | undefined;
     txStatus: TxStatus;
     txMsg?: string;
-    handlers?: EvmHandlers;
+    handlers?: EvmHandlers | SolanaHandlers;
     network?: Ecosystem;
     showDefaultSuccessMessage?: boolean;
 };
@@ -472,14 +506,14 @@ type TxStats = {
     cashback?: string;
 };
 
-declare const openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, }: ModalIntegrationPayload) => Promise<void>;
+declare const openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, highlightedDstTokens, }: ModalIntegrationPayload) => Promise<void>;
 
 declare const TxWidgetWC: CustomElementConstructor;
 
 declare const XPay: {
-    openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, }: ModalIntegrationPayload) => Promise<void>;
-    TxWidget: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
+    openTransactionModal: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, bridge, highlightedDstTokens, }: ModalIntegrationPayload) => Promise<void>;
+    TxWidget: ({ integratorId, dstChain, dstToken, srcChain, srcToken, customContractCalls, desc, dstDisplayToken, lightTheme, defaultWalletPicker, styles, onPendingTransactionsChange, dstTokenLocked, dstChainLocked, srcTokenLocked, srcChainLocked, onDstTokenChange, onDstChainChange, onSrcTokenChange, onSrcChainChange, onConnectWallet, bridge, override, integratorFee, integratorFeeReceiverAddress, highlightedDstTokens, }: WidgetIntegrationPayload) => react_jsx_runtime.JSX.Element;
     TxWidgetWC: CustomElementConstructor;
 };
 
-export { type Addresses, type BridgeToken, type BridgeTokensDictionary, type Chain, type CoinTypeAddress, type CollectFees, type ContractCall, ContractName, type Contracts, Ecosystem, type EnqueueTxProps, Environment, type GenerateStakingCallsParams, type GetLeaderboardChangePayload, type GetPricesPayload, type GetRoutePayload, type GetTokenBalancesPayload, type HistoryTransaction, type ImportedTokenData, type ModalIntegrationPayload, type ModalIntegrationStyles, type ModalIntegrationThemeStyles, type MonitoredTransaction, type Prices, type Protocol, type Route, type Token, type TokenBalances, type TokenOption, type TokenPrices, type Transaction, type TransactionHistory, type TransactionRequest, type TransactionStatus, type Transactions, type TxConfigFormData, type TxStats, TxStatus, type TxUIWrapperState, TxWidgetWCWrapped as TxWidget, TxWidgetWC, Web3Environment, type WidgetIntegrationPayload, XSwapCallType, type XSwapFee, type XSwapFees, XPay as default, openTransactionModal };
+export { type Addresses, type BridgeToken, type BridgeTokensDictionary, type Chain, type CoinTypeAddress, type CollectFees, type ContractCall, ContractName, type Contracts, type EVMRoute, Ecosystem, type EnqueueTxProps, Environment, type GenerateStakingCallsParams, type GetLeaderboardChangePayload, type GetPricesPayload, type GetRoutePayload, type GetSolanaRoutePayload, type GetTokenBalancesPayload, type HistoryTransaction, type ImportedTokenData, type ModalIntegrationPayload, type ModalIntegrationStyles, type ModalIntegrationThemeStyles, type MonitoredTransaction, type Prices, type Protocol, type SolanaRoute, SolanaWeb3Network, type Token, type TokenBalances, type TokenOption, type TokenPrices, type Transaction, type TransactionHistory, type TransactionRequest, type TransactionStatus, type Transactions, type TxConfigFormData, type TxStats, TxStatus, type TxUIWrapperState, TxWidgetWCWrapped as TxWidget, TxWidgetWC, type UnifiedRoute, Web3Environment, type WidgetIntegrationPayload, XSwapCallType, type XSwapFee, type XSwapFees, XPay as default, openTransactionModal };