@shapeshiftoss/swapper 17.6.10 → 17.7.0

package/dist/cjs/swappers/RelaySwapper/utils/getTrade.js

@@ -14,6 +14,7 @@ const viem_1 = require("viem");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const tenderly_1 = require("../../../utils/tenderly");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const constant_1 = require("../constant");
 const getRelayAssetAddress_1 = require("../utils/getRelayAssetAddress");
@@ -396,7 +397,7 @@ async function getTrade({ input, deps, relayChainMap, }) {
         // Fallback to Relay's gas amount
         return quote.fees.gas.amount;
     })();
-    const steps = swapSteps.map((quoteStep) => {
+    const steps = await Promise.all(swapSteps.map(async (quoteStep) => {
         const selectedItem = quoteStep.items?.[0];
         if (!selectedItem)
             throw new Error('Relay quote step contains no items');
@@ -406,7 +407,7 @@ async function getTrade({ input, deps, relayChainMap, }) {
             .plus(relayerFeesBuyAssetCryptoBaseUnit)
             .plus(appFeesBaseUnit)
             .toFixed();
-        const { allowanceContract, relayTransactionMetadata, solanaTransactionMetadata } = (() => {
+        const { allowanceContract, relayTransactionMetadata, solanaTransactionMetadata } = await (async () => {
             if (!selectedItem.data)
                 throw new Error('Relay quote step contains no data');
             if ((0, types_2.isRelayQuoteUtxoItemData)(selectedItem.data)) {
@@ -445,11 +446,38 @@ async function getTrade({ input, deps, relayChainMap, }) {
                 };
             }
             if ((0, types_2.isRelayQuoteSolanaItemData)(selectedItem.data)) {
+                const solanaInstructions = selectedItem.data?.instructions?.map(convertSolanaInstruction);
+                const addressLookupTableAddresses = selectedItem.data?.addressLookupTableAddresses;
+                // Build a trial VersionedTransaction to check if it exceeds the 1232-byte Solana tx size limit
+                const isOversized = await (async () => {
+                    if (!solanaInstructions?.length || !sendAddress)
+                        return false;
+                    try {
+                        const adapter = deps.assertGetSolanaChainAdapter(sellAsset.chainId);
+                        const lookupTableInfos = await adapter.getAddressLookupTableAccounts(addressLookupTableAddresses);
+                        const lookupTableAccounts = lookupTableInfos.map(info => new web3_js_1.AddressLookupTableAccount({
+                            key: new web3_js_1.PublicKey(info.key),
+                            state: web3_js_1.AddressLookupTableAccount.deserialize(new Uint8Array(info.data)),
+                        }));
+                        const messageV0 = web3_js_1.MessageV0.compile({
+                            payerKey: new web3_js_1.PublicKey(sendAddress),
+                            instructions: solanaInstructions,
+                            recentBlockhash: web3_js_1.PublicKey.default.toString(),
+                            addressLookupTableAccounts: lookupTableAccounts,
+                        });
+                        const txBytes = new web3_js_1.VersionedTransaction(messageV0).serialize();
+                        return txBytes.length > 1232;
+                    }
+                    catch {
+                        return false;
+                    }
+                })();
                 return {
                     allowanceContract: '',
                     solanaTransactionMetadata: {
-                        addressLookupTableAddresses: selectedItem.data?.addressLookupTableAddresses,
-                        instructions: selectedItem.data?.instructions?.map(convertSolanaInstruction),
+                        addressLookupTableAddresses,
+                        instructions: solanaInstructions,
+                        isOversized,
                     },
                     relayTransactionMetadata: {
                         relayId: quote.steps[0].requestId,
@@ -458,13 +486,23 @@ async function getTrade({ input, deps, relayChainMap, }) {
                 };
             }
             if ((0, types_2.isRelayQuoteTronItemData)(selectedItem.data)) {
+                const contractAddress = selectedItem.data.parameter?.contract_address;
+                const callData = selectedItem.data.parameter?.data;
+                const isTronToken = (0, utils_1.isToken)(sellAsset.assetId);
+                if (isTronToken && !contractAddress) {
+                    throw new Error('Missing Relay Tron contract address');
+                }
+                if (isTronToken && !callData) {
+                    throw new Error('Missing Relay Tron transaction data');
+                }
                 return {
-                    allowanceContract: '',
+                    allowanceContract: contractAddress ?? '',
                     solanaTransactionMetadata: undefined,
                     relayTransactionMetadata: {
                         relayId: quote.steps[0].requestId,
                         orderId,
-                        to: selectedItem.data?.parameter?.contract_address,
+                        to: contractAddress,
+                        data: callData,
                     },
                 };
             }
@@ -494,8 +532,19 @@ async function getTrade({ input, deps, relayChainMap, }) {
             estimatedExecutionTimeMs: timeEstimate * 1000,
             solanaTransactionMetadata,
             relayTransactionMetadata,
+            affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                strategy: 'fixed_asset',
+                affiliateBps,
+                sellAsset,
+                buyAsset,
+                sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                fixedAssetId: (0, utils_1.chainIdToFeeAssetId)(caip_1.baseChainId),
+                fixedAsset: deps.assetsById[(0, utils_1.chainIdToFeeAssetId)(caip_1.baseChainId)],
+                isEstimate: true,
+            }),
         };
-    });
+    }));
     const baseQuoteOrRate = {
         id: quote.steps[0].requestId,
         rate,

package/dist/cjs/swappers/RelaySwapper/utils/relayTokenToAssetId.js

@@ -112,11 +112,6 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Plasma,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
-            case caip_1.CHAIN_REFERENCE.PlumeMainnet:
-                return {
-                    assetReference: caip_1.ASSET_REFERENCE.Plume,
-                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
-                };
             case caip_1.CHAIN_REFERENCE.MantleMainnet:
                 return {
                     assetReference: caip_1.ASSET_REFERENCE.Mantle,
@@ -142,9 +137,9 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Katana,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
-            case caip_1.CHAIN_REFERENCE.FlowEvmMainnet:
+            case caip_1.CHAIN_REFERENCE.EtherealMainnet:
                 return {
-                    assetReference: caip_1.ASSET_REFERENCE.FlowEvm,
+                    assetReference: caip_1.ASSET_REFERENCE.Ethereal,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
             case caip_1.CHAIN_REFERENCE.CeloMainnet:
@@ -152,6 +147,16 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Celo,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
+            case caip_1.CHAIN_REFERENCE.FlowEvmMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.FlowEvm,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
+            case caip_1.CHAIN_REFERENCE.PlumeMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Plume,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
             case caip_1.CHAIN_REFERENCE.StoryMainnet:
                 return {
                     assetReference: caip_1.ASSET_REFERENCE.Story,
@@ -217,6 +222,16 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Soneium,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
+            case caip_1.CHAIN_REFERENCE.SeiMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Sei,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
+            case caip_1.CHAIN_REFERENCE.AbstractMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Abstract,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
             default:
                 throw Error(`chainId '${relayToken.chainId}' not supported`);
         }

package/dist/cjs/swappers/StonfiSwapper/swapperApi/getTradeQuote.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const constants_1 = require("../utils/constants");
 const helpers_2 = require("../utils/helpers");
@@ -39,7 +41,7 @@ const getTradeQuote = async (input) => {
     try {
         const slippageBps = (0, helpers_2.slippageDecimalToBps)(slippageTolerancePercentageDecimal, constants_1.STONFI_DEFAULT_SLIPPAGE_BPS);
         const referrerFeeBps = (0, helpers_2.affiliateBpsToNumber)(affiliateBps);
-        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId);
+        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.tonChainId);
         const referrerAddress = (0, helpers_2.tonAddressToOmnistonAddress)(tonTreasuryAddress);
         const quoteResult = await (0, helpers_2.waitForQuote)(omniston, {
             settlementMethods: [omniston_sdk_1.SettlementMethod.SETTLEMENT_METHOD_SWAP],
@@ -103,6 +105,15 @@ const getTradeQuote = async (input) => {
                     allowanceContract: '0x0',
                     estimatedExecutionTimeMs: 30000,
                     stonfiSpecific: buildStonfiSpecific(quote, bidAssetAddress, askAssetAddress),
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit,
+                        isEstimate: true,
+                    }),
                 },
             ],
         };

package/dist/cjs/swappers/StonfiSwapper/swapperApi/getTradeRate.js

@@ -5,6 +5,7 @@ const monads_1 = require("@sniptt/monads");
 const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const constants_1 = require("../utils/constants");
 const helpers_2 = require("../utils/helpers");
@@ -89,6 +90,15 @@ const getTradeRate = async (input) => {
                     allowanceContract: '0x0000000000000000000000000000000000000000',
                     estimatedExecutionTimeMs: 30000,
                     stonfiSpecific: buildStonfiSpecific(quote, bidAssetAddress, askAssetAddress),
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit,
+                        isEstimate: true,
+                    }),
                 },
             ],
         };

package/dist/cjs/swappers/SunioSwapper/utils/getQuoteOrRate.js

@@ -7,6 +7,7 @@ const monads_1 = require("@sniptt/monads");
 const tronweb_1 = require("tronweb");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const constants_1 = require("./constants");
 const fetchFromSunio_1 = require("./fetchFromSunio");
 const helpers_1 = require("./helpers/helpers");
@@ -187,6 +188,15 @@ async function getQuoteOrRate(input, deps) {
                             route: bestRoute,
                         },
                     }),
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                        isEstimate: true,
+                    }),
                 },
             ],
             swapperName: types_1.SwapperName.Sunio,

package/dist/cjs/swappers/ThorchainSwapper/ThorchainSwapper.js

@@ -10,6 +10,9 @@ exports.thorchainSwapper = {
     executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
         return signAndBroadcastTransaction(txToSign);
     },
+    executeSolanaTransaction: (txToSign, { signAndBroadcastTransaction }) => {
+        return signAndBroadcastTransaction(txToSign);
+    },
     executeTronTransaction: (txToSign, { signAndBroadcastTransaction }) => {
         return signAndBroadcastTransaction(txToSign);
     },

package/dist/cjs/swappers/ThorchainSwapper/endpoints.js

@@ -15,6 +15,8 @@ exports.thorchainApi = {
     getEvmTransactionFees: input => thorchain_utils_1.evm.getEvmTransactionFees(input, swapperName),
     getUnsignedUtxoTransaction: input => thorchain_utils_1.utxo.getUnsignedUtxoTransaction(input, swapperName),
     getUtxoTransactionFees: input => thorchain_utils_1.utxo.getUtxoTransactionFees(input, swapperName),
+    getUnsignedSolanaTransaction: input => thorchain_utils_1.solana.getUnsignedSolanaTransaction(input, swapperName),
+    getSolanaTransactionFees: input => thorchain_utils_1.solana.getSolanaTransactionFees(input, swapperName),
     getUnsignedTronTransaction: input => thorchain_utils_1.tron.getUnsignedTronTransaction(input, swapperName),
     getTronTransactionFees: input => thorchain_utils_1.tron.getTronTransactionFees(input, swapperName),
     getUnsignedCosmosSdkTransaction: async ({ tradeQuote, stepIndex, from, config, assertGetCosmosSdkChainAdapter, }) => {

package/dist/cjs/swappers/ThorchainSwapper/generated/generatedTradableAssetMap.json

@@ -37,6 +37,7 @@
     "ETH.YFI-0X0BC529C00C6401AEF6D220BE8C6EA1667F6AD93E": "eip155:1/erc20:0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e",
     "GAIA.ATOM": "cosmos:cosmoshub-4/slip44:118",
     "LTC.LTC": "bip122:12a765e31ffd4059bada1e25190f6e98/slip44:2",
+    "SOL.SOL": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501",
     "THOR.RUJI": "cosmos:thorchain-1/slip44:ruji",
     "THOR.TCY": "cosmos:thorchain-1/slip44:tcy",
     "TRON.TRX": "tron:0x2b6653dc/slip44:195",

package/dist/cjs/swappers/ThorchainSwapper/utils/poolAssetHelpers/poolAssetHelpers.d.ts

@@ -1,5 +1,5 @@
 import type { AssetId } from '@shapeshiftoss/caip';
-export declare const assetIdToThorPoolAssetIdMap: import("lodash").Dictionary<string>;
+export declare const assetIdToThorPoolAssetIdMap: Record<string, string>;
 export declare const thorPoolAssetIdToAssetId: (id: string) => AssetId | undefined;
 export declare const assetIdToThorPoolAssetId: ({ assetId }: {
     assetId: AssetId;

package/dist/cjs/swappers/ThorchainSwapper/utils/poolAssetHelpers/poolAssetHelpers.js

@@ -8,7 +8,8 @@ const invert_1 = __importDefault(require("lodash/invert"));
 const generatedTradableAssetMap_json_1 = __importDefault(require("../../generated/generatedTradableAssetMap.json"));
 const thorPoolIdAssetIdSymbolMap = generatedTradableAssetMap_json_1.default;
 exports.assetIdToThorPoolAssetIdMap = (0, invert_1.default)(thorPoolIdAssetIdSymbolMap);
+const assetIdToThorPoolAssetIdMapLower = Object.fromEntries(Object.entries(exports.assetIdToThorPoolAssetIdMap).map(([k, v]) => [k.toLowerCase(), v]));
 const thorPoolAssetIdToAssetId = (id) => thorPoolIdAssetIdSymbolMap[id.toUpperCase()];
 exports.thorPoolAssetIdToAssetId = thorPoolAssetIdToAssetId;
-const assetIdToThorPoolAssetId = ({ assetId }) => exports.assetIdToThorPoolAssetIdMap[assetId.toLowerCase()];
+const assetIdToThorPoolAssetId = ({ assetId }) => assetIdToThorPoolAssetIdMapLower[assetId.toLowerCase()];
 exports.assetIdToThorPoolAssetId = assetIdToThorPoolAssetId;

package/dist/cjs/swappers/ThorchainSwapper/utils/poolAssetHelpers/poolAssetHelpers.test.js

@@ -18,6 +18,10 @@ const poolAssetHelpers_1 = require("./poolAssetHelpers");
             const result = (0, poolAssetHelpers_1.thorPoolAssetIdToAssetId)('ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48');
             (0, vitest_1.expect)(result).toEqual(usdcAssetId);
         });
+        (0, vitest_1.it)('returns Solana assetId when poolAssetId is SOL.SOL', () => {
+            const result = (0, poolAssetHelpers_1.thorPoolAssetIdToAssetId)('SOL.SOL');
+            (0, vitest_1.expect)(result).toEqual(caip_1.solAssetId);
+        });
         (0, vitest_1.it)('returns undefined for an asset we dont support', () => {
             const result = (0, poolAssetHelpers_1.thorPoolAssetIdToAssetId)('BNB.AVA-645');
             (0, vitest_1.expect)(result).toEqual(undefined);
@@ -46,6 +50,12 @@ const poolAssetHelpers_1 = require("./poolAssetHelpers");
             const poolAssetId = 'ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48';
             (0, vitest_1.expect)(result).toEqual(poolAssetId);
         });
+        (0, vitest_1.it)('returns SOL pool when assetId is solAssetId (base58 case-sensitive)', () => {
+            const assetId = caip_1.solAssetId;
+            const result = (0, poolAssetHelpers_1.assetIdToThorPoolAssetId)({ assetId });
+            const poolAssetId = 'SOL.SOL';
+            (0, vitest_1.expect)(result).toEqual(poolAssetId);
+        });
         (0, vitest_1.it)('returns undefined for an unsupported asset', () => {
             const assetId = 'foobar';
             const result = (0, poolAssetHelpers_1.assetIdToThorPoolAssetId)({ assetId });

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.js

@@ -9,6 +9,7 @@ const uuid_1 = require("uuid");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const fetchFromZrx_1 = require("../utils/fetchFromZrx");
 const helpers_2 = require("../utils/helpers/helpers");
@@ -99,6 +100,14 @@ async function getZrxTradeQuote(input, assertGetEvmChainAdapter, assetsById, zrx
                     buyAmountAfterFeesCryptoBaseUnit: buyAmount,
                     sellAmountIncludingProtocolFeesCryptoBaseUnit,
                     source: types_1.SwapperName.Zrx,
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit: buyAmount,
+                    }),
                     permit2Eip712: permit2Eip712,
                     zrxTransactionMetadata: transactionMetadata,
                 },

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeRate/getZrxTradeRate.js

@@ -6,6 +6,7 @@ const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const fetchFromZrx_1 = require("../utils/fetchFromZrx");
 const helpers_2 = require("../utils/helpers/helpers");
@@ -65,6 +66,14 @@ async function getZrxTradeRate(input, assetsById, zrxBaseUrl) {
                 buyAmountAfterFeesCryptoBaseUnit: buyAmount,
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 source: types_1.SwapperName.Zrx,
+                affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                    strategy: 'buy_asset',
+                    affiliateBps,
+                    sellAsset,
+                    buyAsset,
+                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                    buyAmountCryptoBaseUnit: buyAmount,
+                }),
             },
         ],
     });

package/dist/cjs/swappers/utils/affiliateFee.d.ts

@@ -0,0 +1,17 @@
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { AffiliateFee } from '../../types';
+export type AffiliateFeeStrategy = 'buy_asset' | 'sell_asset' | 'fixed_asset';
+type BuildAffiliateFeeParams = {
+    strategy: AffiliateFeeStrategy;
+    affiliateBps: string;
+    sellAsset: Asset;
+    buyAsset: Asset;
+    sellAmountCryptoBaseUnit: string;
+    buyAmountCryptoBaseUnit: string;
+    fixedAsset?: Asset;
+    fixedAssetId?: AssetId;
+    isEstimate?: boolean;
+};
+export declare const buildAffiliateFee: (params: BuildAffiliateFeeParams) => AffiliateFee | undefined;
+export {};

package/dist/cjs/swappers/utils/affiliateFee.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAffiliateFee = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const buildAffiliateFee = (params) => {
+    const { strategy, affiliateBps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, buyAmountCryptoBaseUnit, fixedAsset, fixedAssetId, isEstimate, } = params;
+    if ((0, utils_1.bnOrZero)(affiliateBps).lte(0))
+        return undefined;
+    const bpsDecimal = (0, utils_1.bn)(affiliateBps).div(10000);
+    switch (strategy) {
+        case 'buy_asset': {
+            const feeAmount = (0, utils_1.bnOrZero)(buyAmountCryptoBaseUnit).times(bpsDecimal).toFixed(0);
+            return {
+                assetId: buyAsset.assetId,
+                amountCryptoBaseUnit: feeAmount,
+                asset: buyAsset,
+                isEstimate,
+            };
+        }
+        case 'sell_asset': {
+            const feeAmount = (0, utils_1.bnOrZero)(sellAmountCryptoBaseUnit).times(bpsDecimal).toFixed(0);
+            return {
+                assetId: sellAsset.assetId,
+                amountCryptoBaseUnit: feeAmount,
+                asset: sellAsset,
+                isEstimate,
+            };
+        }
+        case 'fixed_asset': {
+            if (!fixedAsset || !fixedAssetId)
+                return undefined;
+            return {
+                assetId: fixedAssetId,
+                amountCryptoBaseUnit: '0',
+                asset: fixedAsset,
+                isEstimate: true,
+            };
+        }
+        default:
+            return undefined;
+    }
+};
+exports.buildAffiliateFee = buildAffiliateFee;

package/dist/cjs/thorchain-utils/getL1RateOrQuote.js

@@ -28,21 +28,25 @@ const caip_1 = require("@shapeshiftoss/caip");
 const adapters = __importStar(require("@shapeshiftoss/chain-adapters"));
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
+const web3_js_1 = require("@solana/web3.js");
 const tronweb_1 = require("tronweb");
 const uuid_1 = require("uuid");
 const index_1 = require("../index");
+const affiliateFee_1 = require("../swappers/utils/affiliateFee");
 const types_1 = require("../types");
 const utils_2 = require("../utils");
 const evm = __importStar(require("./evm"));
 const getLimitWithManualSlippage_1 = require("./getLimitWithManualSlippage/getLimitWithManualSlippage");
 const getQuote_1 = require("./getQuote");
 const index_2 = require("./index");
+const solana = __importStar(require("./solana"));
 const tron = __importStar(require("./tron"));
 const utxo = __importStar(require("./utxo"));
 const SAFE_GAS_LIMIT = '100000'; // depositWithExpiry()
+const SOLANA_MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapperName) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, receiveAddress, affiliateBps: requestedAffiliateBps, } = input;
-    const { config, assertGetEvmChainAdapter, assertGetUtxoChainAdapter, assertGetCosmosSdkChainAdapter, } = deps;
+    const { config, assertGetEvmChainAdapter, assertGetUtxoChainAdapter, assertGetCosmosSdkChainAdapter, assertGetSolanaChainAdapter, } = deps;
     // "NativePrecision" is intended to indicate the base unit precision of the asset
     // for the corresponding swapper network (THORChain or MAYAChain)
     // (CACAO = 10, everything else = 8)
@@ -193,6 +197,14 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                     accountNumber,
                     allowanceContract,
                     feeData,
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps: route.affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                    }),
                     thorchainSpecific: {
                         maxStreamingQuantity: route.quote.max_streaming_quantity,
                     },
@@ -305,10 +317,51 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             }));
         }
         case caip_1.CHAIN_NAMESPACE.Solana: {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'Solana is not supported',
-                code: types_1.TradeQuoteError.UnsupportedTradePair,
+            const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+            const sendAddress = input.sendAddress;
+            const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {
+                const memo = getMemo(route);
+                const protocolFees = getProtocolFees(route.quote);
+                const feeData = await (async () => {
+                    if (!sendAddress)
+                        return { networkFeeCryptoBaseUnit: undefined, protocolFees };
+                    const { vault } = await solana.getThorTxData({ sellAsset, config, swapperName });
+                    const memoInstruction = new web3_js_1.TransactionInstruction({
+                        keys: [],
+                        programId: new web3_js_1.PublicKey(SOLANA_MEMO_PROGRAM_ID),
+                        data: Buffer.from(memo, 'utf8'),
+                    });
+                    const transferInstruction = web3_js_1.SystemProgram.transfer({
+                        fromPubkey: new web3_js_1.PublicKey(sendAddress),
+                        toPubkey: new web3_js_1.PublicKey(vault),
+                        lamports: BigInt(sellAmountCryptoBaseUnit),
+                    });
+                    const { fast } = await adapter.getFeeData({
+                        to: vault,
+                        value: '0',
+                        chainSpecific: {
+                            from: sendAddress,
+                            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+                            instructions: [memoInstruction, transferInstruction],
+                        },
+                    });
+                    return { networkFeeCryptoBaseUnit: fast.txFee, protocolFees };
+                })();
+                return makeThorTradeRateOrQuote({
+                    route,
+                    allowanceContract: '0x0',
+                    memo,
+                    feeData,
+                });
             }));
+            const routes = maybeRoutes.filter(utils_1.isFulfilled).map(r => r.value);
+            if (!routes.length)
+                return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                    message: 'Unable to create any routes',
+                    code: types_1.TradeQuoteError.UnsupportedTradePair,
+                    cause: maybeRoutes.filter(utils_1.isRejected).map(r => r.reason),
+                }));
+            return (0, monads_1.Ok)(routes);
         }
         case caip_1.CHAIN_NAMESPACE.Tron: {
             const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {

package/dist/cjs/thorchain-utils/index.d.ts

@@ -13,6 +13,7 @@ export * from './getL1RateOrQuote';
 export * from './getPoolDetails';
 export * as cosmossdk from './cosmossdk';
 export * as evm from './evm';
+export * as solana from './solana';
 export * as tron from './tron';
 export * as utxo from './utxo';
 export declare const getChainIdBySwapper: (swapperName: SwapperName) => import("@shapeshiftoss/caip").ChainId;
@@ -21,7 +22,7 @@ export declare const isThorTradeQuote: (quote: TradeQuote | undefined) => quote
 export declare const getDaemonUrl: (config: SwapperConfig, swapperName: SwapperName) => string;
 export declare const getMidgardUrl: (config: SwapperConfig, swapperName: SwapperName) => string;
 export declare const isNativeAsset: (assetId: AssetId, swapperName: SwapperName) => boolean;
-export declare const getNativePrecision: (assetId: AssetId, swapperName: SwapperName) => 10 | 8;
+export declare const getNativePrecision: (assetId: AssetId, swapperName: SwapperName) => 8 | 10;
 export declare const getNativeFee: (swapperName: SwapperName) => "2000000" | "2000000000";
 export declare const getAffiliate: (swapperName: SwapperName) => "ss" | "ssmaya";
 export declare const getPoolAssetId: ({ assetId, swapperName, }: {

package/dist/cjs/thorchain-utils/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSwapSource = exports.getPoolAssetId = exports.getAffiliate = exports.getNativeFee = exports.getNativePrecision = exports.isNativeAsset = exports.getMidgardUrl = exports.getDaemonUrl = exports.isThorTradeQuote = exports.isThorTradeRate = exports.getChainIdBySwapper = exports.utxo = exports.tron = exports.evm = exports.cosmossdk = void 0;
+exports.getSwapSource = exports.getPoolAssetId = exports.getAffiliate = exports.getNativeFee = exports.getNativePrecision = exports.isNativeAsset = exports.getMidgardUrl = exports.getDaemonUrl = exports.isThorTradeQuote = exports.isThorTradeRate = exports.getChainIdBySwapper = exports.utxo = exports.tron = exports.solana = exports.evm = exports.cosmossdk = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const adapters = __importStar(require("@shapeshiftoss/chain-adapters"));
 const MayachainSwapper_1 = require("../swappers/MayachainSwapper");
@@ -43,6 +43,7 @@ __exportStar(require("./getL1RateOrQuote"), exports);
 __exportStar(require("./getPoolDetails"), exports);
 exports.cosmossdk = __importStar(require("./cosmossdk"));
 exports.evm = __importStar(require("./evm"));
+exports.solana = __importStar(require("./solana"));
 exports.tron = __importStar(require("./tron"));
 exports.utxo = __importStar(require("./utxo"));
 const getChainIdBySwapper = (swapperName) => {

package/dist/cjs/thorchain-utils/solana/constants.d.ts

@@ -0,0 +1 @@
+export declare const MEMO_PROGRAM_ID = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr";

package/dist/cjs/thorchain-utils/solana/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MEMO_PROGRAM_ID = void 0;
+// Solana Memo Program v2
+// https://spl.solana.com/memo
+exports.MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';

package/dist/cjs/thorchain-utils/solana/getSolanaTransactionFees.d.ts

@@ -0,0 +1,2 @@
+import type { GetUnsignedSolanaTransactionArgs, SwapperName } from '../../types';
+export declare const getSolanaTransactionFees: (args: GetUnsignedSolanaTransactionArgs, swapperName: SwapperName) => Promise<string>;

package/dist/cjs/thorchain-utils/solana/getSolanaTransactionFees.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSolanaTransactionFees = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const web3_js_1 = require("@solana/web3.js");
+const utils_2 = require("../../utils");
+const getThorTxData_1 = require("./getThorTxData");
+const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+const getSolanaTransactionFees = async (args, swapperName) => {
+    const { tradeQuote, stepIndex, from, assertGetSolanaChainAdapter, config } = args;
+    if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const { memo } = tradeQuote;
+    if (!memo)
+        throw new Error('Memo is required');
+    const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
+    const { sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset } = step;
+    const { vault } = await (0, getThorTxData_1.getThorTxData)({ sellAsset, config, swapperName });
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    const memoInstruction = new web3_js_1.TransactionInstruction({
+        keys: [],
+        programId: new web3_js_1.PublicKey(MEMO_PROGRAM_ID),
+        data: Buffer.from(memo, 'utf8'),
+    });
+    const transferInstruction = web3_js_1.SystemProgram.transfer({
+        fromPubkey: new web3_js_1.PublicKey(from),
+        toPubkey: new web3_js_1.PublicKey(vault),
+        lamports: BigInt(sellAmountIncludingProtocolFeesCryptoBaseUnit),
+    });
+    const { fast } = await adapter.getFeeData({
+        to: vault,
+        value: '0',
+        chainSpecific: {
+            from,
+            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+            instructions: [memoInstruction, transferInstruction],
+        },
+    });
+    return fast.txFee;
+};
+exports.getSolanaTransactionFees = getSolanaTransactionFees;