chore: rest adjustments for ts checks

thorswap · Feb 11, 2025 · 7696e62 · 7696e62
1 parent 4e7fe3f
commit 7696e62
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/packages/plugins/thorchain/src/mayaPlugin.ts b/packages/plugins/thorchain/src/mayaPlugin.ts
@@ -95,6 +95,8 @@ function plugin({ getWallet }: SwapKitPluginParams) {
 
         default: {
           if (wallet) {
+            // @ts-expect-error TODO: right now it's inferred from toolboxes
+            // we need to simplify this to one object params
             return wallet.transfer(params);
           }
 

diff --git a/packages/plugins/thorchain/src/tcPlugin.ts b/packages/plugins/thorchain/src/tcPlugin.ts
@@ -106,6 +106,8 @@ function plugin({ getWallet }: SwapKitPluginParams) {
 
         default: {
           if (wallet) {
+            // @ts-expect-error TODO: right now it's inferred from toolboxes
+            // we need to simplify this to one object params
             return wallet.transfer(params);
           }
 

diff --git a/packages/swapkit/core/src/client.ts b/packages/swapkit/core/src/client.ts
@@ -31,7 +31,7 @@ import {
 
 export type PluginsType = {
   [key in string]: {
-    plugin: (params: SwapKitPluginParams<any>) => any;
+    plugin: (params: SwapKitPluginParams) => any;
     config?: any;
   };
 };
@@ -59,8 +59,8 @@ export function SwapKit<Plugins extends PluginsType, Wallets extends WalletsType
   const connectedWallets = {} as FullWallet;
 
   const availablePlugins = Object.entries(plugins || {}).reduce(
-    (acc, [pluginName, { plugin, config: pluginConfig }]) => {
-      const methods = plugin({ getWallet, config: pluginConfig });
+    (acc, [pluginName, { plugin }]) => {
+      const methods = plugin({ getWallet });
 
       // @ts-expect-error key is generic and cannot be indexed
       acc[pluginName] = methods;
@@ -247,6 +247,8 @@ export function SwapKit<Plugins extends PluginsType, Wallets extends WalletsType
     }
     const wallet = getWallet(chain as Exclude<Chain, Chain.Fiat | Chain.Radix>);
 
+    // @ts-expect-error TODO: right now it's inferred from toolboxes
+    // we need to simplify this to one object params
     return wallet.transfer({ ...params, assetValue });
   }
 

diff --git a/packages/toolboxes/utxo/src/toolbox/utxo.ts b/packages/toolboxes/utxo/src/toolbox/utxo.ts
@@ -82,6 +82,7 @@ function transfer(chain: UTXOChain) {
   }: UTXOWalletTransferParams<Psbt, Psbt>) {
     if (!from) throw new Error("From address must be provided");
     if (!recipient) throw new Error("Recipient address must be provided");
+    if (!signTransaction) throw new Error("Sign transaction must be provided");
     const txFeeRate = feeRate || (await getFeeRates(chain))[feeOptionKey || FeeOption.Fast];
 
     const { psbt } = await buildTx(chain)({

diff --git a/packages/toolboxes/utxo/src/types.ts b/packages/toolboxes/utxo/src/types.ts
@@ -66,5 +66,5 @@ export type UTXOTransferParams = {
 };
 
 export type UTXOWalletTransferParams<T, U> = UTXOTransferParams & {
-  signTransaction: (params: T) => U | Promise<U>;
+  signTransaction?: (params: T) => U | Promise<U>;
 };
diff --git a/packages/wallets/keystore/src/index.ts b/packages/wallets/keystore/src/index.ts
@@ -159,7 +159,7 @@ const getWalletMethods = async ({ chain, phrase, derivationPath }: Params) => {
 
     case Chain.Solana: {
       const { SOLToolbox } = await import("@swapkit/toolbox-solana");
-      const toolbox = SOLToolbox({ rpcUrl });
+      const toolbox = SOLToolbox();
       const keypair = toolbox.createKeysForPath({ phrase, derivationPath });
 
       return {