@funkit/connect 1.4.2 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @funkit/connect
 
+## 2.0.0
+
+### Major Changes
+
+- 4c467f2: feat: update minimum node version to v18, use native fetch
+
+### Minor Changes
+
+- d50a369: feat: dydx chain and usdc checkout compatibility
+
+### Patch Changes
+
+- d50a369: feat: checkout history safeguard across versions
+- Updated dependencies [d50a369]
+- Updated dependencies [d50a369]
+- Updated dependencies [4c467f2]
+  - @funkit/core@2.0.0
+  - @funkit/api-base@1.0.0
+  - @funkit/wagmi-tools@3.0.0
+
+## 1.5.0-next.0
+
+### Minor Changes
+
+- 24dbc49: fix: Update minimum node version to v18, use native fetch
+
+### Patch Changes
+
+- Updated dependencies [24dbc49]
+  - @funkit/wagmi-tools@2.1.0-next.0
+  - @funkit/api-base@0.1.0-next.0
+  - @funkit/core@1.1.0-next.0
+
 ## 1.4.2
 
 ### Patch Changes

package/dist/components/FunkitProvider/FunkitCheckoutContext.d.ts

@@ -11,6 +11,7 @@ export interface FunkitCheckoutActionParams {
     functionArgs: any[];
     value?: bigint;
 }
+export type DydxAddress = `dydx${string}`;
 export interface FunkitCheckoutConfig {
     /** ****************************
      * Api-related configurations *
@@ -28,7 +29,7 @@ export interface FunkitCheckoutConfig {
     /** Timestamp (in milliseconds) after which the checkout should not be performed, and the funds will become rescuable. Min: 300000 (5 mins), Max: 3600000 (1 hour). **/
     expirationTimestampMs: number;
     /** Custom recipient address of the checkout. If specified, a different checkout flow will be executed. It is not recommended to set this unless the Fun.xyz team advises it. **/
-    customRecipient?: Address;
+    customRecipient?: Address | DydxAddress;
     /** ****************************************
      * Checkout ModalUI-related configurations *
      *******************************************/

package/dist/config/getDefaultConfig.d.ts

@@ -3761,6 +3761,39 @@ export declare const getDefaultChains: () => ({
     formatters?: undefined;
     serializers?: import("viem").ChainSerializers<undefined> | undefined;
     fees?: import("viem").ChainFees<undefined> | undefined;
+} | {
+    id: number;
+    name: string;
+    nativeCurrency: {
+        symbol: string;
+        decimals: number;
+        name: string;
+    };
+    rpcUrls: {
+        default: {
+            http: string[];
+        };
+    };
+    blockExplorers: {
+        default: {
+            name: string;
+            url: string;
+            apiUrl: string;
+        };
+    };
+    contracts: {
+        ensRegistry: {
+            address: `0x${string}`;
+        };
+        ensUniversalResolver: {
+            address: `0x${string}`;
+            blockCreated: number;
+        };
+        multicall3: {
+            address: `0x${string}`;
+            blockCreated: number;
+        };
+    };
 } | {
     blockExplorers: {
         readonly default: {

package/dist/dydx-G2CHDMSF.js

@@ -0,0 +1,6 @@
+"use client";
+// src/components/FunkitProvider/chainIcons/dydx.svg
+var dydx_default = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgzIiBoZWlnaHQ9IjE4MyIgdmlld0JveD0iMCAwIDE4MyAxODMiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjEiIHk9IjEiIHdpZHRoPSIxODEiIGhlaWdodD0iMTgxIiByeD0iMzciIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcikiLz4KPHBhdGggZD0iTTExNS4zMTYgNDNMNDUgMTQxLjk5Mkg2Ni41ODg1TDEzNy4yNjkgNDNIMTE1LjMxNloiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik02OC44Mzc1IDQzTDg5LjUyNjUgNzIuMTY5Nkw3OC43MzIyIDg4LjA4MDRMNDYuNzk5MiA0M0g2OC44Mzc1WiIgZmlsbD0idXJsKCNwYWludDFfbGluZWFyKSIvPgo8cGF0aCBkPSJNMTE3LjQxMSAxNDJMOTQuNDczNyAxMDkuNzM3TDEwNS4yNjggOTQuMjY3OUwxMzkgMTQySDExNy40MTFaIiBmaWxsPSJ1cmwoI3BhaW50Ml9saW5lYXIpIi8+CjxyZWN0IHg9IjEiIHk9IjEiIHdpZHRoPSIxODEiIGhlaWdodD0iMTgxIiByeD0iMzciIHN0cm9rZT0iIzJEMkQzRCIgc3Ryb2tlLXdpZHRoPSIyIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXIiIHgxPSIxNDcuNSIgeTE9Ii0yNC41IiB4Mj0iMTAzIiB5Mj0iMTYwLjUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iIzJDMkMzRCIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMxYTFhMjciLz4KPC9saW5lYXJHcmFkaWVudD4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDFfbGluZWFyIiB4MT0iNjMuODkwMSIgeTE9IjQ5LjE4NzUiIHgyPSI5Mi44OTUxIiB5Mj0iODQuODIwNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSJ3aGl0ZSIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IndoaXRlIiBzdG9wLW9wYWNpdHk9IjAuNTUiLz4KPC9saW5lYXJHcmFkaWVudD4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDJfbGluZWFyIiB4MT0iMTIyLjM1OSIgeTE9IjEzNC40ODciIHgyPSI4Ni43ODczIiB5Mj0iODUuNjg2MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjNjk2NkZGIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzY5NjZGRiIgc3RvcC1vcGFjaXR5PSIwLjM2Ii8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==";
+export {
+  dydx_default as default
+};

package/dist/index.js

@@ -944,6 +944,7 @@ function useFunkitConfig() {
 }
 
 // src/components/FunkitProvider/provideFunkitConnectChains.ts
+import { DYDX_MAINNET_CHAIN_ID } from "@funkit/core";
 var arbitrumIcon = {
   iconBackground: "#96bedc",
   iconUrl: async () => (await import("./arbitrum-U5YFKKLG.js")).default
@@ -968,6 +969,10 @@ var cronosIcon = {
   iconBackground: "#002D74",
   iconUrl: async () => (await import("./cronos-2XRBT4RE.js")).default
 };
+var dydxIcon = {
+  iconBackground: "#2C2C3D",
+  iconUrl: async () => (await import("./dydx-G2CHDMSF.js")).default
+};
 var ethereumIcon = {
   iconBackground: "#484c50",
   iconUrl: async () => (await import("./ethereum-H5XMTX4V.js")).default
@@ -1031,6 +1036,7 @@ var chainMetadataByName = {
   bscTestnet: { chainId: 97, ...bscIcon },
   cronos: { chainId: 25, ...cronosIcon },
   cronosTestnet: { chainId: 338, ...cronosIcon },
+  dydxMainnet: { chainId: DYDX_MAINNET_CHAIN_ID, ...dydxIcon },
   goerli: { chainId: 5, ...ethereumIcon },
   hardhat: { chainId: 31337, ...hardhatIcon },
   holesky: { chainId: 17e3, ...ethereumIcon },
@@ -2558,6 +2564,18 @@ function normalizeSmallUsdNumber(usdNumber) {
   return parsedNumber;
 }
 
+// src/utils/isDydxAddress.ts
+function verifyIsBech32(address) {
+  try {
+  } catch (error) {
+    return error;
+  }
+  return void 0;
+}
+function isDydxAddress(address) {
+  return address.startsWith("dydx1") && verifyIsBech32(address) === void 0;
+}
+
 // src/utils/checkout.ts
 var CHECKOUT_EXPIRATION_TIMESTAMP_UPPERBOUND = 36e5;
 var CHECKOUT_EXPIRATION_TIMESTAMP_LOWERBOUND = 3e5;
@@ -2567,7 +2585,7 @@ var DUMMY_TRANSFER_PARAMS = {
   toAddress: "0x000000000000000000000000000000000000dEaD",
   tokenAmount: 5
 };
-function validateCheckoutConfig(config, isUserLoggedIn) {
+function validateCheckoutConfig(config) {
   var _a, _b;
   logger.log("validateCheckoutConfig_input", config);
   if (!config.checkoutItemTitle) {
@@ -2619,7 +2637,19 @@ function validateCheckoutConfig(config, isUserLoggedIn) {
       message: `Invalid targetChain configuration: Unsupported chain id ${config.targetChain} for checkout.`
     };
   }
-  if (config.customRecipient && !isAddress(config.customRecipient)) {
+  const chainCheckoutAssetWhitelist = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO3[config.targetChain].checkoutAssetWhitelist || [];
+  if ((chainCheckoutAssetWhitelist == null ? void 0 : chainCheckoutAssetWhitelist[0]) !== "*" && !chainCheckoutAssetWhitelist.some(
+    (asset) => {
+      var _a2;
+      return asset.toLowerCase() === ((_a2 = config.targetAsset) == null ? void 0 : _a2.toLowerCase());
+    }
+  )) {
+    return {
+      isValid: false,
+      message: `Invalid targetAsset ${config.targetAsset} for targetChain ${config.targetChain}.`
+    };
+  }
+  if (config.customRecipient && !isAddress(config.customRecipient) && !isDydxAddress(config.customRecipient)) {
     return {
       isValid: false,
       message: `Invalid customRecipient configuration: Has to be a valid address.`
@@ -2918,7 +2948,12 @@ function FunkitCheckoutProvider({ children }) {
         newCheckoutHistoryList = singleCheckoutHistory ? [singleCheckoutHistory] : [];
       }
       setCheckoutHistoryList(
-        newCheckoutHistoryList.filter((item) => item.state !== CheckoutState3.CANCELLED).sort((a, b) => b.createdTimeMs - a.createdTimeMs)
+        newCheckoutHistoryList.filter(
+          (item) => {
+            var _a, _b;
+            return item.state !== CheckoutState3.CANCELLED && !!((_a = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO5) == null ? void 0 : _a[item.fromChainId]) && !!((_b = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO5) == null ? void 0 : _b[item.toChainId]);
+          }
+        ).sort((a, b) => b.createdTimeMs - a.createdTimeMs)
       );
       setIsCheckoutHistoryInited(true);
     } catch (err) {
@@ -3599,13 +3634,15 @@ function FunkitCheckoutProvider({ children }) {
     [
       funkitConfig.apiKey,
       _getAndValidateCheckoutItemByCheckoutId,
-      isWeb3Login,
       isWeb2Login,
+      isWeb3Login,
       walletAddress,
       _generateClientMetadataForBackend,
       activeCheckouts,
       triggerRefreshSymbol,
-      _generateSignedBatchOperation
+      connector,
+      _generateSignedBatchOperation,
+      switchChainAsync
     ]
   );
   const contextValue = {
@@ -3781,10 +3818,7 @@ var useFunkitCheckout = (props) => {
         ...propsConfig || {},
         ...inputConfig || {}
       };
-      const validationResult = validateCheckoutConfig(
-        combinedConfig,
-        isUserLoggedIn
-      );
+      const validationResult = validateCheckoutConfig(combinedConfig);
       onValidation == null ? void 0 : onValidation(validationResult);
       if (validationResult.isValid) {
         const finalConfig = combinedConfig;
@@ -3794,15 +3828,13 @@ var useFunkitCheckout = (props) => {
         );
         if (isUserLoggedIn || !!finalConfig.customRecipient) {
           setPendingCheckoutConfig(void 0);
-          if (isUserLoggedIn) {
-            if (!((_b = (_a = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO5) == null ? void 0 : _a[finalConfig.targetChain]) == null ? void 0 : _b.isMainnet)) {
-              onErrorWrapper == null ? void 0 : onErrorWrapper({
-                type: "error",
-                message: "Unable to begin a new checkout: Insufficient funds on testnet account",
-                metadata: {}
-              });
-              return;
-            }
+          if (isUserLoggedIn && !((_b = (_a = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO5) == null ? void 0 : _a[finalConfig.targetChain]) == null ? void 0 : _b.isMainnet)) {
+            onErrorWrapper == null ? void 0 : onErrorWrapper({
+              type: "error",
+              message: "Unable to begin a new checkout: Insufficient funds on testnet account",
+              metadata: {}
+            });
+            return;
           }
           onOpenWrapper == null ? void 0 : onOpenWrapper(newId);
         } else {
@@ -4657,6 +4689,7 @@ var EditIcon = ({ size = "24" }) => /* @__PURE__ */ React32.createElement("svg",
 
 // src/components/FunCheckoutModal/FunCheckoutModal.tsx
 import {
+  dydxChain,
   FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO8,
   getTokenInfo as getTokenInfo2
 } from "@funkit/core";
@@ -9666,7 +9699,8 @@ function FunCheckoutModal({
     const originalTargetChainId = checkoutItem == null ? void 0 : checkoutItem.initSettings.config.targetChain.toString();
     const moonpayChainId = [
       zkSync2.id.toString(),
-      mantle2.id.toString()
+      mantle2.id.toString(),
+      dydxChain.id.toString()
     ].includes(originalTargetChainId) ? arbitrum.id.toString() : originalTargetChainId;
     const wethAddrOnTargetChain = (await getTokenInfo2("weth", moonpayChainId)).toLowerCase();
     const isTargetAssetEthOrWeth = [NATIVE_TOKEN, wethAddrOnTargetChain].includes(
@@ -15984,7 +16018,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey6, version);
 }
 function getCurrentSdkVersion() {
-  return "1.4.2";
+  return "2.0.0";
 }
 function useFingerprint() {
   const fingerprint = useCallback33(() => {

package/dist/utils/checkout.d.ts

@@ -13,7 +13,7 @@ export declare const DUMMY_TRANSFER_PARAMS: {
  * @param config - The checkout configuration to validate.
  * @returns An object indicating whether the configuration is valid and a message if it is not.
  */
-export declare function validateCheckoutConfig(config: Partial<FunkitCheckoutConfig>, isUserLoggedIn: boolean): {
+export declare function validateCheckoutConfig(config: Partial<FunkitCheckoutConfig>): {
     isValid: boolean;
     message: string;
 };

package/dist/utils/isDydxAddress.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Replicated from @dydxprotocol/v4-client-js https://github.com/dydxprotocol/v4-clients/blob/main/v4-client-js/src/lib/validation.ts#L145C1-L158
+ * Not importing the sdk in the interest of space.
+ */
+export declare function verifyIsBech32(address: string): Error | undefined;
+export declare function isDydxAddress(address: string): boolean;

package/dist/wallets/walletConnectors/index.js

@@ -1,31 +1,31 @@
 "use client";
-import {
-  zealWallet
-} from "./chunk-Z5QFIFDP.js";
 import {
   zerionWallet
 } from "./chunk-G4DNQN67.js";
+import {
+  zealWallet
+} from "./chunk-Z5QFIFDP.js";
 import {
   walletConnectWallet
 } from "./chunk-ASPRR7T3.js";
 import {
-  tokenPocketWallet
-} from "./chunk-UWU574XS.js";
+  roninWallet
+} from "./chunk-CNTLU4ZV.js";
 import {
-  subWallet
-} from "./chunk-WS4EM7AZ.js";
+  safeheronWallet
+} from "./chunk-FQDX6QIP.js";
 import {
-  tahoWallet
-} from "./chunk-PILSRRPJ.js";
+  tokenPocketWallet
+} from "./chunk-UWU574XS.js";
 import {
   talismanWallet
 } from "./chunk-R2GYJ376.js";
-import {
-  trustWallet
-} from "./chunk-BMHNXJZK.js";
 import {
   tokenaryWallet
 } from "./chunk-MD5OPFAT.js";
+import {
+  trustWallet
+} from "./chunk-BMHNXJZK.js";
 import {
   uniswapWallet
 } from "./chunk-XRSY4JVH.js";
@@ -33,62 +33,62 @@ import {
   xdefiWallet
 } from "./chunk-JNZ3EYC7.js";
 import {
-  phantomWallet
-} from "./chunk-4PTY6XNU.js";
+  rainbowWallet
+} from "./chunk-EXN2ODSI.js";
 import {
   rabbyWallet
 } from "./chunk-5SIHQ5GA.js";
-import {
-  rainbowWallet
-} from "./chunk-EXN2ODSI.js";
 import {
   ramperWallet
 } from "./chunk-XEZPRJPV.js";
-import {
-  roninWallet
-} from "./chunk-CNTLU4ZV.js";
 import {
   safeWallet
 } from "./chunk-D3DCQ72J.js";
 import {
-  safeheronWallet
-} from "./chunk-FQDX6QIP.js";
+  oneInchWallet
+} from "./chunk-LCPIZUR3.js";
 import {
   safepalWallet
 } from "./chunk-PQSJXOGA.js";
 import {
-  ledgerWallet
-} from "./chunk-Y6VY6E3L.js";
+  subWallet
+} from "./chunk-WS4EM7AZ.js";
 import {
-  metaMaskWallet
-} from "./chunk-TUK3HNKY.js";
+  tahoWallet
+} from "./chunk-PILSRRPJ.js";
+import {
+  injectedWallet
+} from "./chunk-GUJHPWTU.js";
 import {
   mewWallet
 } from "./chunk-ZCSUP7CX.js";
 import {
-  oktoWallet
-} from "./chunk-WKHTUEF5.js";
-import {
-  okxWallet
-} from "./chunk-5ZGE5SN5.js";
+  metaMaskWallet
+} from "./chunk-TUK3HNKY.js";
 import {
   omniWallet
 } from "./chunk-SVN7OEQR.js";
 import {
-  oneInchWallet
-} from "./chunk-LCPIZUR3.js";
+  okxWallet
+} from "./chunk-5ZGE5SN5.js";
+import {
+  oktoWallet
+} from "./chunk-WKHTUEF5.js";
 import {
   oneKeyWallet
 } from "./chunk-QS2J6MWB.js";
+import {
+  phantomWallet
+} from "./chunk-4PTY6XNU.js";
+import {
+  enkryptWallet
+} from "./chunk-SJWHYD45.js";
 import {
   frameWallet
 } from "./chunk-HXGBE5AH.js";
 import {
   frontierWallet
 } from "./chunk-LOEDYNWO.js";
-import {
-  foxWallet
-} from "./chunk-TKXMLZXG.js";
 import {
   imTokenWallet
 } from "./chunk-5MVV7OVS.js";
@@ -96,58 +96,58 @@ import {
   gateWallet
 } from "./chunk-QGQISKXF.js";
 import {
-  injectedWallet
-} from "./chunk-GUJHPWTU.js";
+  ledgerWallet
+} from "./chunk-Y6VY6E3L.js";
 import {
   kresusWallet
 } from "./chunk-X6T3CICZ.js";
 import {
-  bitgetWallet
-} from "./chunk-OUQ3ZF2W.js";
+  bybitWallet
+} from "./chunk-ZBQT5PV6.js";
 import {
   coin98Wallet
 } from "./chunk-3QXMJHL4.js";
 import {
-  bybitWallet
-} from "./chunk-ZBQT5PV6.js";
+  bitgetWallet
+} from "./chunk-OUQ3ZF2W.js";
 import {
   coreWallet
 } from "./chunk-32O7HVBJ.js";
 import {
   coinbaseWallet
 } from "./chunk-O77H3VWW.js";
-import {
-  desigWallet
-} from "./chunk-P4C7ZHIS.js";
-import {
-  enkryptWallet
-} from "./chunk-SJWHYD45.js";
 import {
   dawnWallet
 } from "./chunk-QUFNIKMV.js";
 import {
-  argentWallet
-} from "./chunk-NZ5G23JP.js";
+  desigWallet
+} from "./chunk-P4C7ZHIS.js";
+import {
+  foxWallet
+} from "./chunk-TKXMLZXG.js";
 import {
   bifrostWallet
 } from "./chunk-AFONKDII.js";
 import {
   bitskiWallet
 } from "./chunk-IMZRCMZR.js";
+import {
+  argentWallet
+} from "./chunk-NZ5G23JP.js";
+import {
+  bitverseWallet
+} from "./chunk-NL4I7WOT.js";
 import {
   bloomWallet
 } from "./chunk-NTGZF5BY.js";
 import "./chunk-ZOLACFTK.js";
 import {
-  bitverseWallet
-} from "./chunk-NL4I7WOT.js";
+  braveWallet
+} from "./chunk-KJWMF6GZ.js";
 import {
   clvWallet
 } from "./chunk-ND5YG63V.js";
 import "./chunk-ZDU3JFGR.js";
-import {
-  braveWallet
-} from "./chunk-KJWMF6GZ.js";
 import "./chunk-F3VCNZXS.js";
 export {
   argentWallet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/connect",
-  "version": "1.4.2",
+  "version": "2.0.0",
   "description": "Funkit Connect SDK elevates DeFi apps via web2 sign-ins and one-click checkouts.",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "src/css/reset.css.ts"
   ],
   "engines": {
-    "node": ">=12.4"
+    "node": ">=18"
   },
   "publishConfig": {
     "access": "public"
@@ -72,14 +72,15 @@
     "@vanilla-extract/dynamic": "2.1.0",
     "@vanilla-extract/sprinkles": "1.6.1",
     "@wagmi/core": "^2.10.2",
+    "bech32": "^2.0.0",
     "clsx": "2.1.1",
     "qrcode": "1.5.3",
     "react-remove-scroll": "2.5.7",
     "ua-parser-js": "^1.0.37",
     "uuid": "^9.0.1",
-    "@funkit/api-base": "0.0.6",
-    "@funkit/wagmi-tools": "2.0.5",
-    "@funkit/core": "1.0.20"
+    "@funkit/api-base": "1.0.0",
+    "@funkit/core": "2.0.0",
+    "@funkit/wagmi-tools": "3.0.0"
   },
   "repository": {
     "type": "git",