chore: remove wizard, remove re-exports and adjust todos

.changeset/pre.json

@@ -8,7 +8,6 @@
     "@swapkit/sdk": "2.2.17",
     "@swapkit/toolboxes": "0.1.0",
     "@swapkit/wallets": "2.0.20",
-    "@swapkit/wizard": "2.1.0",
     "@internal/playground-nextjs": "0.0.0",
     "@internal/playground-node": "0.0.0",
     "@internal/playground-vite": "0.0.0",

.github/workflows/check-token-lists.yml

@@ -44,20 +44,3 @@ jobs:
           title: "[Bot] Update Token List"
           label: token-list
           get_diff: true
-
-      # TODO: figure out how to create changeset from cli
-      # - name: Publish Token List
-      #   if: ${{ steps.commit.outputs.numberOfChangedFiles > 0 }}
-      #   run: |
-      #     git config --global user.email "[email protected]"
-      #     git config --global user.name "swapkit-bot"
-      #     cp .npmrc.prod ./packages/swapkit/tokens/.npmrc
-      #     bun changeset version --snapshot nightly
-      #     cd packages/swapkit/tokens
-      #     npm config list --no-workspaces
-      #     npm publish --no-workspaces
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #     NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-      #     NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-

package.json

@@ -38,8 +38,7 @@
     "test": "bun --filter '*' --elide-lines=1000 test",
     "test:coverage": "bun --filter '*' test:coverage",
     "type-check": "bun --filter '*' --elide-lines=100 type-check",
-    "version-bump": "bun changeset version",
-    "wizard": "bun --cwd ./packages/swapkit/wizard"
+    "version-bump": "bun changeset version"
   },
   "trustedDependencies": [
     "@biomejs/biome",

packages/helpers/fetchTokenLists.ts

@@ -1,4 +1,4 @@
-import { Chain, ChainId, ProviderName } from "./src";
+import { Chain, ProviderName } from "./src";
 import { SwapKitApi } from "./src/api";
 
 const providers = (await SwapKitApi.getTokenListProviders()).filter(
@@ -17,8 +17,6 @@ console.info(
     .join("\n-")}`,
 );
 
-const thorchainChainId = ChainId.THORChain;
-
 for (const { provider } of providers) {
   try {
     const tokenList = await SwapKitApi.getTokenList(provider);
@@ -30,8 +28,7 @@ for (const { provider } of providers) {
       .map((token) => ({
         address: token.address,
         chain: parseChain(token.chain),
-        // TODO remove after fork
-        chainId: token.chainId === "thorchain-mainnet-v1" ? thorchainChainId : token.chainId,
+        chainId: token.chainId,
         decimals: token.decimals,
         identifier: parseIdentifier(token.identifier),
         logoURI: token.logoURI,

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

@@ -25,7 +25,6 @@ function getApiUrl(path?: `/${string}`) {
   return `${isDev ? devApiUrl : apiUrl}${path}`;
 }
 
-// TODO: refactor to use apiKey
 function getAuthHeaders(hash?: string) {
   const { swapKit } = SKConfig.get("apiKeys");
   const { referer } = SKConfig.get("envs");
@@ -58,7 +57,6 @@ export const computeHash = (
   return crypto.createHash("sha256").update(data, "utf8").digest("hex");
 };
 
-// TODO: refactor to use apiKey
 export function getTrackerDetails(payload: TrackerParams) {
   return RequestClient.post<TrackerResponse>(getApiUrl("/track"), {
     json: payload,

packages/toolboxes/src/evm/helpers.ts

@@ -141,6 +141,5 @@ export const estimateTransactionFee = async (
     );
   }
 
-  // TODO:
   throw new Error("No gas price found");
 };

packages/toolboxes/src/evm/index.ts

@@ -1,16 +1,3 @@
-// TODO remove with next major
-export {
-  AbstractSigner,
-  BrowserProvider,
-  HDNodeWallet,
-  JsonRpcProvider,
-  Signature,
-  Transaction,
-  type Eip1193Provider,
-  type Provider,
-  type TransactionRequest,
-} from "ethers";
-
 /**
  * Package
  */

packages/toolboxes/src/evm/toolbox/EVMToolbox.ts

@@ -513,12 +513,13 @@ export const getChecksumAddressFromAsset = (asset: Asset, chain: EVMChain) => {
 
 export const getTokenAddress = ({ chain, symbol, ticker }: Asset, baseAssetChain: EVMChain) => {
   try {
-    if (
-      // TODO: refactor this to use simplify the logic
-      (chain === baseAssetChain && symbol === baseAssetChain && ticker === baseAssetChain) ||
-      (chain === Chain.BinanceSmartChain && symbol === "BNB" && ticker === "BNB") ||
-      ([Chain.Arbitrum, Chain.Base].includes(chain) && symbol === "ETH" && ticker === "ETH")
-    ) {
+    const isBSCBNB = chain === Chain.BinanceSmartChain && symbol === "BNB" && ticker === "BNB";
+    const isBaseAsset =
+      chain === baseAssetChain && symbol === baseAssetChain && ticker === baseAssetChain;
+    const isEVMAsset =
+      [Chain.Arbitrum, Chain.Base].includes(chain) && symbol === "ETH" && ticker === "ETH";
+
+    if (isBaseAsset || isBSCBNB || isEVMAsset) {
       return baseAssetAddress[baseAssetChain];
     }
 

packages/toolboxes/src/radix/toolbox.ts

@@ -110,7 +110,7 @@
 // //       tip_percentage: intent.header.tipPercentage,
 // //       nonce: intent.header.nonce,
 // //       signer_public_keys: [retPublicKeyToGatewayPublicKey(intent.header.notaryPublicKey)],
-// //       // TODO: Add message
+
 // //       flags: {
 // //         assume_all_signature_proofs: false,
 // //         skip_epoch_check: false,
@@ -680,7 +680,6 @@
 // //   return function signMessage(_message: string) {
 // //     throw new SwapKitError("not_implemented", { method: "signMessage", toolbox: "radix" });
 
-// //     // TODO: convert message to Uint8Array
 // //     // return signer.signToSignatureWithPublicKey(message);
 // //   };
 // // }
@@ -689,7 +688,6 @@
 // //   return function validateSignature(_signature: SignatureWithPublicKey) {
 // //     throw new SwapKitError("not_implemented", { method: "validateSignature", toolbox: "radix" });
 
-// //     // TODO: validate signature
 // //     // return
 // //   };
 // // }

packages/wallets/src/index.ts

@@ -1,4 +1,3 @@
-import type { Eip1193Provider } from "@swapkit/toolboxes/evm";
 import { bitgetWallet } from "./bitget";
 import { coinbaseWallet } from "./coinbase";
 import { ctrlWallet } from "./ctrl";
@@ -36,20 +35,3 @@ export const wallets = {
   ...trezorWallet,
   ...walletconnectWallet,
 };
-
-declare global {
-  interface Window {
-    keepkey?: {
-      binance: Eip1193Provider;
-      bitcoin: Eip1193Provider;
-      bitcoincash: Eip1193Provider;
-      dogecoin: Eip1193Provider;
-      ethereum: Eip1193Provider;
-      cosmos: Eip1193Provider;
-      dash: Eip1193Provider;
-      litecoin: Eip1193Provider;
-      thorchain: Eip1193Provider;
-      mayachain: Eip1193Provider;
-    };
-  }
-}

packages/wallets/src/keepkey-bex/walletHelpers.ts

@@ -68,6 +68,21 @@ export const getProviderNameFromChain = (chain: Chain): string => {
   }
 };
 
+declare const window: {
+  keepkey?: {
+    binance: Eip1193Provider;
+    bitcoin: Eip1193Provider;
+    bitcoincash: Eip1193Provider;
+    dogecoin: Eip1193Provider;
+    ethereum: Eip1193Provider;
+    cosmos: Eip1193Provider;
+    dash: Eip1193Provider;
+    litecoin: Eip1193Provider;
+    thorchain: Eip1193Provider;
+    mayachain: Eip1193Provider;
+  };
+} & Window;
+
 export function getKEEPKEYProvider<T extends Chain>(chain: T) {
   if (!window.keepkey) throw new SwapKitError("wallet_keepkey_not_found");
 

packages/wallets/src/ledger/clients/cosmos.ts

@@ -54,7 +54,6 @@ export class CosmosLedger extends CosmosLedgerInterface {
     ];
   };
 
-  // TODO: Fix type inference
   signAmino = async (signerAddress: string, signDoc: any): Promise<any> => {
     await this.checkOrCreateTransportAndLedger(true);
 

packages/wallets/src/ledger/clients/evm.ts

@@ -90,7 +90,6 @@ class EVMLedgerInterface extends AbstractSigner {
     return Signature.from(sig).serialized;
   };
 
-  // TODO: fix typing infer from ethers
   sendTransaction = async (tx: TransactionRequest): Promise<any> => {
     if (!this.provider) throw new Error("No provider set");
 

packages/wallets/src/walletconnect/evmSigner.ts

@@ -1,5 +1,5 @@
 import { type EVMChain, SwapKitError, WalletOption } from "@swapkit/helpers";
-import type { JsonRpcProvider, Provider, TransactionRequest } from "ethers";
+import type { JsonRpcProvider, Provider, TransactionRequest, TransactionResponse } from "ethers";
 import { AbstractSigner } from "ethers";
 
 import { DEFAULT_EIP155_METHODS } from "./constants";
@@ -100,7 +100,6 @@ class WalletconnectSigner extends AbstractSigner {
     // return txHash.startsWith('0x') ? txHash : `0x${txHash}`;
   };
 
-  // @ts-expect-error TODO: fix this
   sendTransaction = async ({ from, to, value, data }: TransactionRequest) => {
     const { toHexString } = await import("@swapkit/toolboxes/evm");
 
@@ -119,10 +118,9 @@ class WalletconnectSigner extends AbstractSigner {
       },
     });
 
-    return response;
+    return response as TransactionResponse;
   };
 
-  // @ts-expect-error TODO: fix this
   connect = (provider: Provider | null) => {
     if (!provider) {
       throw new SwapKitError({

packages/wallets/src/walletconnect/index.ts

@@ -137,7 +137,6 @@ async function getToolbox({
       const signer = await getEVMSigner({ walletconnect, chain, provider });
       const toolbox = getToolboxByChain(chain);
 
-      // @ts-expect-error TODO: fix this signer issue
       return toolbox({ provider, signer });
     }