chore: keystore transaction signing

.github/workflows/release.yml

@@ -27,10 +27,6 @@ jobs:
       - run: bun lint
       - run: bun type-check:ci
 
-      - name: Test
-        if: github.ref_name == 'nightly'
-        run: bun test:ci
-
   publish:
     needs: [build-lint-test]
     runs-on: ubuntu-latest

bun.lock

@@ -75,9 +75,11 @@
         "@swapkit/plugins": "workspace:*",
         "@swapkit/toolboxes": "workspace:*",
         "@swapkit/wallets": "workspace:*",
+        "cosmjs-types": "0.10.1",
         "ts-pattern": "^5.9.0",
       },
       "devDependencies": {
+        "cosmjs-types": "0.10.1",
         "ts-pattern": "5.9.0",
       },
     },
@@ -105,6 +107,8 @@
       "name": "@swapkit/plugins",
       "version": "4.2.9",
       "dependencies": {
+        "@mysten/sui": "1.44.0",
+        "@near-js/transactions": "2.5.0",
         "@near-js/utils": "~2.5.0",
         "@polkadot/keyring": "~13.5.7",
         "@polkadot/util": "~13.5.7",
@@ -131,6 +135,7 @@
         "@swapkit/server": "workspace:*",
         "@swapkit/toolboxes": "workspace:*",
         "@swapkit/wallets": "workspace:*",
+        "cosmjs-types": "0.10.1",
       },
     },
     "packages/server": {
@@ -293,6 +298,7 @@
         "@swapkit/wallets": "workspace:*",
         "class-variance-authority": "0.7.1",
         "clsx": "2.1.1",
+        "cosmjs-types": "0.10.1",
         "lucide-react": "0.552.0",
         "react": "19.1.1",
         "react-hook-form": "7.65.0",
@@ -324,6 +330,7 @@
         "@swapkit/helpers": "workspace:*",
         "@swapkit/toolboxes": "workspace:*",
         "@swapkit/wallet-core": "workspace:*",
+        "cosmjs-types": "0.10.1",
         "ethers": "^6.14.0",
         "sats-connect": "~1.0.0",
         "ts-pattern": "~5.9.0",
@@ -334,6 +341,7 @@
         "@near-js/crypto": "2.5.0",
         "@near-js/transactions": "2.5.0",
         "@solana/web3.js": "1.98.4",
+        "cosmjs-types": "0.10.1",
         "ethers": "6.15.0",
         "sats-connect": "1.0.0",
         "ts-pattern": "5.9.0",
@@ -3741,7 +3749,7 @@
 
     "oniguruma-parser": ["[email protected]", "", {}, "sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w=="],
 
-    "oniguruma-to-es": ["[email protected].3", "", { "dependencies": { "oniguruma-parser": "^0.12.1", "regex": "^6.0.1", "regex-recursion": "^6.0.2" } }, "sha512-rPiZhzC3wXwE59YQMRDodUwwT9FZ9nNBwQQfsd1wfdtlKEyCdRV0avrTcSZ5xlIvGRVPd/cx6ZN45ECmS39xvg=="],
+    "oniguruma-to-es": ["[email protected].4", "", { "dependencies": { "oniguruma-parser": "^0.12.1", "regex": "^6.0.1", "regex-recursion": "^6.0.2" } }, "sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA=="],
 
     "open": ["[email protected]", "", { "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", "is-wsl": "^2.2.0" } }, "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="],
 
@@ -5337,8 +5345,6 @@
 
     "abi-wan-kanabi/fs-extra": ["[email protected]", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="],
 
-    "ajv-formats/ajv": ["[email protected]", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" } }, "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="],
-
     "anymatch/picomatch": ["[email protected]", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
     "aria-hidden/tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],

package.json

@@ -22,7 +22,7 @@
     "xrpl": "4.4.2"
   },
   "name": "swapkit-monorepo",
-  "packageManager": "bun@^1.3.1",
+  "packageManager": "bun@^1.3.2",
   "private": true,
   "scripts": {
     "bootstrap": "bun clean --force; bun build:ci",

packages/core/package.json

@@ -5,10 +5,11 @@
     "@swapkit/plugins": "workspace:*",
     "@swapkit/toolboxes": "workspace:*",
     "@swapkit/wallets": "workspace:*",
+    "cosmjs-types": "0.10.1",
     "ts-pattern": "^5.9.0"
   },
   "description": "SwapKit - Core",
-  "devDependencies": { "ts-pattern": "5.9.0" },
+  "devDependencies": { "cosmjs-types": "0.10.1", "ts-pattern": "5.9.0" },
   "exports": {
     ".": {
       "bun": "./src/index.ts",

packages/core/src/index.ts

@@ -15,7 +15,9 @@ import {
   type SKConfigState,
   SwapKitError,
   type SwapParams,
+  supportsV3SwapFlow,
   UTXOChains,
+  type WalletOption,
 } from "@swapkit/helpers";
 import type { EVMTransaction, QuoteResponseRoute } from "@swapkit/helpers/api";
 import type { createPlugin } from "@swapkit/plugins";
@@ -202,6 +204,23 @@ export function SwapKit<
   }
 
   function swap<T extends PluginName>({ route, pluginName, ...rest }: SwapParams<T, QuoteResponseRoute>) {
+    const fromChain = AssetValue.from({ asset: route.sellAsset }).chain;
+    const wallet = getWallet(fromChain);
+
+    if (!wallet) {
+      throw new SwapKitError("core_wallet_connection_not_found");
+    }
+
+    const useV3Flow = supportsV3SwapFlow(wallet.walletType as WalletOption, fromChain) && route.tx;
+
+    if (useV3Flow) {
+      const plugin = getSwapKitPlugin("trading");
+      if ("swap" in plugin) {
+        // @ts-expect-error TODO: fix this
+        return plugin.swap({ ...rest, route });
+      }
+    }
+
     const plugin = getSwapKitPlugin(pluginName || route.providers[0]);
 
     if ("swap" in plugin) {

packages/helpers/src/api/swapkitApi/endpoints.ts

@@ -1,4 +1,5 @@
 import {
+  AssetValue,
   type Chain,
   type EVMChain,
   EVMChains,
@@ -10,6 +11,7 @@ import {
 } from "@swapkit/helpers";
 import { match, P } from "ts-pattern";
 import {
+  type ApproveResponse,
   type BalanceResponse,
   type BrokerDepositChannelParams,
   type DepositChannelResponse,
@@ -122,6 +124,26 @@ export async function getChainBalance<T extends Chain>({
   return scamFilter ? filterAssets(balances) : balances;
 }
 
+export function getTokenApproval(
+  params: { spender: string; userWallet: string; assetValue: AssetValue } | { routeId: string; spender: string },
+) {
+  return match(params)
+    .with({ routeId: P.string, spender: P.string }, ({ routeId, spender }) => {
+      const url = getApiUrl(`/approve?routeId=${routeId}&sourceAddress=${spender}`);
+      return SKRequestClient.get<ApproveResponse>(url);
+    })
+    .with(
+      { assetValue: P.instanceOf(AssetValue), spender: P.string, userWallet: P.string },
+      ({ spender, userWallet, assetValue }) => {
+        const url = getApiUrl(
+          `/approve?tokenIdentifier=${assetValue.toString()}&userWalletAddress=${userWallet}&spender=${spender}&amount=${assetValue.getValue("string")}`,
+        );
+        return SKRequestClient.get<ApproveResponse>(url);
+      },
+    )
+    .exhaustive();
+}
+
 export function getTokenListProviders() {
   const url = getApiUrl("/providers");
   return SKRequestClient.get<TokenListProvidersResponse>(url);

packages/helpers/src/api/swapkitApi/types.ts

@@ -446,6 +446,21 @@ export const EVMTransactionSchema = object({
 
 export type EVMTransaction = z.infer<typeof EVMTransactionSchema>;
 
+export const TronTransactionSchema = z.object({
+  raw_data: z.object({
+    contract: z.any(),
+    expiration: z.number(),
+    ref_block_bytes: z.string(),
+    ref_block_hash: z.string(),
+    timestamp: z.number(),
+  }),
+  raw_data_hex: z.string(),
+  txID: z.string(),
+  visible: z.boolean(),
+});
+
+export type TronTransaction = z.infer<typeof TronTransactionSchema>;
+
 export const EVMTransactionDetailsParamsSchema = array(
   union([
     string(),
@@ -468,7 +483,36 @@ export const EVMTransactionDetailsSchema = object({
 
 export type EVMTransactionDetails = z.infer<typeof EVMTransactionDetailsSchema>;
 
-const EncodeObjectSchema = object({ typeUrl: string(), value: unknown() });
+const ThorchainDepositMsgSchema = object({
+  typeUrl: string("/types.MsgDeposit"),
+  value: object({
+    coins: array(
+      object({
+        amount: string(),
+        asset: object({ chain: string(), symbol: string(), synth: boolean(), ticker: string() }),
+      }),
+    ),
+    memo: string(),
+    signer: string(),
+  }),
+});
+
+export type ThorchainDepositMsg = z.infer<typeof ThorchainDepositMsgSchema>;
+
+const CosmosSendMsgSchema = object({
+  typeUrl: string("/types.MsgSend"),
+  value: object({
+    amount: array(object({ amount: string(), denom: string() })),
+    fromAddress: string(),
+    toAddress: string(),
+  }),
+});
+
+export type CosmosSendMsg = z.infer<typeof CosmosSendMsgSchema>;
+
+const EncodeObjectSchema = object({ typeUrl: string(), value: CosmosSendMsgSchema.or(ThorchainDepositMsgSchema) });
+
+export type APICosmosEncodedObject = z.infer<typeof EncodeObjectSchema>;
 
 const FeeSchema = object({ amount: array(object({ amount: string(), denom: string() })), gas: string() });
 
@@ -572,7 +616,7 @@ export const QuoteResponseRouteItem = object({
   sourceAddress: string().describe("Source address"),
   targetAddress: optional(string().describe("Target address")),
   totalSlippageBps: number().describe("Total slippage in bps"),
-  tx: optional(union([EVMTransactionSchema, CosmosTransactionSchema, string()])),
+  tx: optional(union([EVMTransactionSchema, CosmosTransactionSchema, TronTransactionSchema, string()])),
   txType: optional(z.enum(RouteQuoteTxType)),
   warnings: RouteQuoteWarningSchema,
 });
@@ -622,3 +666,34 @@ const BalanceResponseSchema = array(
 );
 
 export type BalanceResponse = z.infer<typeof BalanceResponseSchema>;
+
+export const ApproveRequestParams = z.union([
+  z.object({ amount: z.string(), spender: z.string(), tokenIdentifier: z.string(), userWalletAddress: z.string() }),
+  z.object({
+    amount: z.string(),
+    chainId: z.enum(ChainId),
+    spender: z.string(),
+    tokenContractAddress: z.string(),
+    userWalletAddress: z.string(),
+  }),
+  z.object({ routeId: z.string() }),
+]);
+
+export type ApproveRequest = z.infer<typeof ApproveRequestParams>;
+
+export const ApproveResponseSchema = z.object({
+  approvalTransaction: z.optional(
+    z.object({
+      data: z.string(),
+      from: z.string(),
+      gasLimit: z.optional(z.string()),
+      gasPrice: z.optional(z.string()),
+      to: z.string(),
+      value: z.string(),
+    }),
+  ),
+  approvedAmount: z.string(),
+  isApproved: z.boolean(),
+});
+
+export type ApproveResponse = z.infer<typeof ApproveResponseSchema>;

packages/helpers/src/modules/swapKitConfig.ts

@@ -12,6 +12,15 @@ import type { BalanceResponse, QuoteRequest, QuoteResponse, QuoteResponseRoute }
 import { WalletOption } from "../types";
 import type { FeeMultiplierConfig } from "./feeMultiplier";
 
+export type V3SwapFlowConfig = {
+  /**
+   * Global flag to enable/disable V3 swap flow (raw tx signing from API).
+   * When disabled, always falls back to named plugins.
+   * @default true
+   */
+  enabled: boolean;
+};
+
 export type SKConfigIntegrations = {
   chainflip?: { useSDKBroker?: boolean; brokerUrl: string };
   coinbase?: {
@@ -80,6 +89,7 @@ const initialState = {
 
   requestOptions: { retry: { backoffMultiplier: 2, baseDelay: 300, maxDelay: 5000, maxRetries: 3 }, timeoutMs: 30000 },
   rpcUrls,
+  v3SwapFlow: { enabled: true } as V3SwapFlowConfig,
   wallets: Object.values(WalletOption),
 };
 type SKState = typeof initialState;
@@ -89,10 +99,11 @@ export type SKConfigState = {
   chains?: SKState["chains"];
   endpoints?: Partial<CustomApiEndpoints>;
   envs?: Partial<SKState["envs"]>;
+  feeMultipliers?: FeeMultiplierConfig;
   integrations?: Partial<SKConfigIntegrations>;
   rpcUrls?: Partial<SKState["rpcUrls"]>;
+  v3SwapFlow?: Partial<V3SwapFlowConfig>;
   wallets?: SKState["wallets"];
-  feeMultipliers?: FeeMultiplierConfig;
 };
 
 type SwapKitConfigStore = SKState & {
@@ -122,6 +133,7 @@ export const useSwapKitStore = create<SwapKitConfigStore>((set) => ({
       feeMultipliers: config?.feeMultipliers || s.feeMultipliers,
       integrations: { ...s.integrations, ...config?.integrations },
       rpcUrls: { ...s.rpcUrls, ...config?.rpcUrls },
+      v3SwapFlow: { ...s.v3SwapFlow, ...config?.v3SwapFlow },
       wallets: s.wallets.concat(config?.wallets || []),
     })),
   setEndpoint: (key, endpoint) => set((s) => ({ endpoints: { ...s.endpoints, [key]: endpoint } })),
@@ -149,6 +161,7 @@ export const useSwapKitConfig = () =>
       feeMultipliers: state?.feeMultipliers,
       integrations: state?.integrations,
       rpcUrls: state?.rpcUrls,
+      v3SwapFlow: state?.v3SwapFlow,
       wallets: state?.wallets,
     })),
   );

packages/helpers/src/modules/swapKitError.ts

@@ -409,6 +409,10 @@ const errorCodes = {
    * Garden Plugin
    */
   plugin_garden_missing_data: 42001,
+  /**
+   * Swap Plugin
+   */
+  plugin_generic_swap_invalid_data: 43001,
   /**
    * SwapKit API
    */

packages/helpers/src/types/sdk.ts

@@ -8,7 +8,10 @@ export type GenericSwapParams<T = unknown> = {
   route: T;
 };
 
-export type SwapParams<PluginNames = string, R = unknown> = GenericSwapParams<R> & { pluginName?: PluginNames };
+export type SwapParams<PluginNames = string, R = unknown> = GenericSwapParams<R> & {
+  pluginName?: PluginNames;
+  useApiTx?: boolean;
+};
 
 export enum FeeOption {
   Average = "average",