@suilend/sui-fe-next 2.0.8 → 2.0.10

package/contexts/WalletContext.d.ts

@@ -51,9 +51,7 @@ export interface WalletContext {
     switchAccount: (account: WalletAccount, addressNameServiceName?: string) => void;
     address?: string;
     dryRunTransaction: (transaction: Transaction, setGasBudget?: boolean) => Promise<DevInspectResults>;
-    signExecuteAndWaitForTransaction: (transaction: Transaction, options?: {
-        auction?: boolean;
-    }, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignedTransaction) => void, onExecute?: (res: SuiTransactionBlockResponse) => void) => Promise<SuiTransactionBlockResponse>;
+    signExecuteAndWaitForTransaction: (transaction: Transaction, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignedTransaction) => void, onExecute?: (res: SuiTransactionBlockResponse) => void) => Promise<SuiTransactionBlockResponse>;
     isUsingLedger: boolean;
     setIsUsingLedger: (isUsingLedger: boolean) => void;
     signPersonalMessage: (message: Uint8Array) => Promise<{

package/contexts/WalletContext.jsx

@@ -64,7 +64,6 @@ import { Transaction } from "@mysten/sui/transactions";
 import { SUI_DECIMALS, toBase64 } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import { useLDClient } from "launchdarkly-react-client-sdk";
-import { executeAuction } from "shio-sdk";
 import { useLocalStorage } from "usehooks-ts";
 import { API_URL, formatAddress, isInMsafeApp } from "@suilend/sui-fe";
 import { getUniversalConnector } from "../lib/connector";
@@ -387,37 +386,50 @@ function Inner(_a) {
         });
     }); }, [sessionAddress, universalConnector]);
     var connectWalletWrapper = useCallback(function (_wallet) { return __awaiter(_this, void 0, void 0, function () {
-        var res, err_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var res, _a, err_1;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _a.trys.push([0, 5, , 6]);
-                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 3];
+                    _b.trys.push([0, 8, , 9]);
+                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 6];
                     return [4 /*yield*/, universalConnector.connect()];
                 case 1:
-                    res = _a.sent();
-                    return [4 /*yield*/, disconnectWallet()];
+                    res = _b.sent();
+                    _b.label = 2;
                 case 2:
-                    _a.sent();
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, disconnectWallet()];
+                case 3:
+                    _b.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    _a = _b.sent();
+                    return [3 /*break*/, 5];
+                case 5:
                     setSession(res.session);
                     return [2 /*return*/];
-                case 3:
+                case 6:
                     if (!_wallet.raw)
                         throw new Error("Missing wallet");
                     return [4 /*yield*/, connectWallet({ wallet: _wallet.raw })];
-                case 4:
-                    _a.sent();
-                    universalConnector.disconnect();
+                case 7:
+                    _b.sent();
+                    try {
+                        universalConnector.disconnect();
+                    }
+                    catch (_c) {
+                        // WalletConnect may not have an active session — safe to ignore
+                    }
                     setSession(null);
                     showInfoToast("Connected ".concat(_wallet.name));
                     setIsConnectWalletDropdownOpen(false);
-                    return [3 /*break*/, 6];
-                case 5:
-                    err_1 = _a.sent();
+                    return [3 /*break*/, 9];
+                case 8:
+                    err_1 = _b.sent();
                     showErrorToast("Failed to connect ".concat(_wallet.name), err_1);
                     console.error(err_1);
-                    return [3 /*break*/, 6];
-                case 6: return [2 /*return*/];
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     }); }, [connectWallet, disconnectWallet, universalConnector]);
@@ -585,11 +597,33 @@ function Inner(_a) {
             });
         });
     }, [impersonatedAddress, account === null || account === void 0 ? void 0 : account.address, gasBudget, suiClient]);
-    var signExecuteAndWaitForTransaction = useCallback(function (transaction, options, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
-        var _address, signedTransaction, txBytes, res, err_5, res1, res2, err_6;
+    var waitForTransactionWithCheck = useCallback(function (digest) { return __awaiter(_this, void 0, void 0, function () {
+        var res;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
+                case 0: return [4 /*yield*/, suiClient.waitForTransaction({
+                        digest: digest,
+                        options: {
+                            showBalanceChanges: true,
+                            showEffects: true,
+                            showEvents: true,
+                            showObjectChanges: true,
+                        },
+                    })];
+                case 1:
+                    res = _c.sent();
+                    if (((_a = res.effects) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
+                        res.effects.status.status === "failure")
+                        throw new Error((_b = res.effects.status.error) !== null && _b !== void 0 ? _b : "Transaction failed");
+                    return [2 /*return*/, res];
+            }
+        });
+    }); }, [suiClient]);
+    var signExecuteAndWaitForTransaction = useCallback(function (transaction, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
+        var _address, txBytes, res, signedTransaction, res1, signError_1, message, res, digest, err_5;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     _address = impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address;
                     if (_address) {
@@ -598,9 +632,9 @@ function Inner(_a) {
                         }
                         catch (err) { }
                     }
-                    _c.label = 1;
+                    _a.label = 1;
                 case 1:
-                    _c.trys.push([1, 13, , 14]);
+                    _a.trys.push([1, 13, , 14]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -609,71 +643,64 @@ function Inner(_a) {
                     onSetGasBudget === null || onSetGasBudget === void 0 ? void 0 : onSetGasBudget(transaction);
                     // Log
                     console.log("[WalletContext] signExecuteAndWaitForTransaction - transaction.getData():", transaction.getData());
-                    signedTransaction = void 0;
-                    if (!(sessionAddress && universalConnector)) return [3 /*break*/, 4];
+                    if (!(sessionAddress && universalConnector)) return [3 /*break*/, 5];
+                    // WalletConnect: use combined sign+execute so institutional
+                    // wallets (e.g. Fireblocks) don't drop the channel.
                     transaction.setSender(sessionAddress);
                     return [4 /*yield*/, transaction.build({ client: suiClient })];
                 case 2:
-                    txBytes = _c.sent();
+                    txBytes = _a.sent();
                     return [4 /*yield*/, universalConnector.request({
-                            method: "sui_signTransaction",
+                            method: "sui_signAndExecuteTransaction",
                             params: {
                                 transaction: toBase64(txBytes),
                                 address: sessionAddress,
                             },
                         }, "sui:mainnet")];
                 case 3:
-                    res = _c.sent();
-                    signedTransaction = {
-                        bytes: res.transactionBytes,
-                        signature: res.signature,
-                    };
-                    return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, dAppKit.signTransaction({
-                        transaction: transaction,
-                    })];
+                    res = _a.sent();
+                    return [4 /*yield*/, waitForTransactionWithCheck(res.digest)];
+                case 4: return [2 /*return*/, _a.sent()];
                 case 5:
-                    signedTransaction = _c.sent();
-                    _c.label = 6;
+                    _a.trys.push([5, 9, , 12]);
+                    return [4 /*yield*/, dAppKit.signTransaction({
+                            transaction: transaction,
+                        })];
                 case 6:
+                    signedTransaction = _a.sent();
                     onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction);
-                    if (!(options === null || options === void 0 ? void 0 : options.auction)) return [3 /*break*/, 10];
-                    _c.label = 7;
+                    return [4 /*yield*/, suiClient.executeTransactionBlock({
+                            transactionBlock: signedTransaction.bytes,
+                            signature: signedTransaction.signature,
+                        })];
                 case 7:
-                    _c.trys.push([7, 9, , 10]);
-                    return [4 /*yield*/, executeAuction(signedTransaction.bytes, signedTransaction.signature)];
-                case 8:
-                    _c.sent();
-                    return [3 /*break*/, 10];
-                case 9:
-                    err_5 = _c.sent();
-                    return [3 /*break*/, 10];
-                case 10: return [4 /*yield*/, suiClient.executeTransactionBlock({
-                        transactionBlock: signedTransaction.bytes,
-                        signature: signedTransaction.signature,
-                    })];
-                case 11:
-                    res1 = _c.sent();
+                    res1 = _a.sent();
                     onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1);
-                    return [4 /*yield*/, suiClient.waitForTransaction({
-                            digest: res1.digest,
-                            options: {
-                                showBalanceChanges: true,
-                                showEffects: true,
-                                showEvents: true,
-                                showObjectChanges: true,
-                            },
+                    return [4 /*yield*/, waitForTransactionWithCheck(res1.digest)];
+                case 8: 
+                // Wait
+                return [2 /*return*/, _a.sent()];
+                case 9:
+                    signError_1 = _a.sent();
+                    message = signError_1 instanceof Error ? signError_1.message : String(signError_1);
+                    if (!message.includes("does not support signing"))
+                        throw signError_1;
+                    console.warn("[WalletContext] Wallet does not support sign-only, falling back to signAndExecuteTransaction");
+                    return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
+                            transaction: transaction,
                         })];
-                case 12:
-                    res2 = _c.sent();
-                    if (((_a = res2.effects) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
-                        res2.effects.status.status === "failure")
-                        throw new Error((_b = res2.effects.status.error) !== null && _b !== void 0 ? _b : "Transaction failed");
-                    return [2 /*return*/, res2];
+                case 10:
+                    res = _a.sent();
+                    digest = res.$kind === "Transaction"
+                        ? res.Transaction.digest
+                        : res.FailedTransaction.digest;
+                    return [4 /*yield*/, waitForTransactionWithCheck(digest)];
+                case 11: return [2 /*return*/, _a.sent()];
+                case 12: return [3 /*break*/, 14];
                 case 13:
-                    err_6 = _c.sent();
-                    console.error(err_6);
-                    throw err_6;
+                    err_5 = _a.sent();
+                    console.error(err_5);
+                    throw err_5;
                 case 14: return [2 /*return*/];
             }
         });
@@ -686,6 +713,7 @@ function Inner(_a) {
         dryRunTransaction,
         suiClient,
         dAppKit,
+        waitForTransactionWithCheck,
     ]);
     // Using Ledger
     var _o = useLocalStorage("isUsingLedger-".concat(impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address), false), isUsingLedger = _o[0], setIsUsingLedger = _o[1];

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sui-fe-next","version":"2.0.8","private":false,"description":"A collection of TypeScript frontend components and hooks","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./contexts/WalletContext":"./contexts/WalletContext.jsx","./contexts/SettingsContext":"./contexts/SettingsContext.jsx","./contexts":"./contexts/index.js","./fetchers":"./fetchers/index.js","./fetchers/useFetchBalances":"./fetchers/useFetchBalances.js","./hooks/useRefreshOnBalancesChange":"./hooks/useRefreshOnBalancesChange.js","./hooks/useLedgerHashDialog":"./hooks/useLedgerHashDialog.js","./hooks/useIsAndroid":"./hooks/useIsAndroid.jsx","./hooks/useCoinMetadataMap":"./hooks/useCoinMetadataMap.js","./hooks":"./hooks/index.js","./hooks/useIsTouchscreen":"./hooks/useIsTouchscreen.jsx","./hooks/useIsiOS":"./hooks/useIsiOS.jsx","./hooks/keypair":"./hooks/keypair.js","./lib/track":"./lib/track.js","./lib":"./lib/index.js","./lib/router":"./lib/router.js","./lib/toasts":"./lib/toasts.jsx","./lib/connector":"./lib/connector.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/sui-fe.git"},"bugs":{"url":"https://github.com/suilend/sui-fe/issues"},"dependencies":{"@reown/appkit":"^1.8.10","@reown/appkit-common":"^1.8.10","@reown/appkit-universal-connector":"^1.8.10","@tanstack/react-query":"^5.60.2","bignumber.js":"^9.1.2","launchdarkly-react-client-sdk":"^3.6.0","lodash":"^4.17.21","mixpanel-browser":"^2.72.0","next":"^15.0.3","react":"18.3.1","react-dom":"18.3.1","react-responsive":"^10.0.0","shio-sdk":"^1.0.8","sonner":"1.4.41","swr":"^2.2.5","tailwind-merge":"^2.5.4","usehooks-ts":"^3.1.1"},"devDependencies":{"@tsconfig/next":"^2.0.3","@types/lodash":"^4.17.13","@types/node":"^22.9.0","@types/react":"^18.3.12","@types/react-dom":"^18.3.1","@typescript-eslint/eslint-plugin":"^8.14.0","@typescript-eslint/parser":"^8.14.0","eslint":"^9.14.0","eslint-config-next":"^15.0.3","eslint-config-prettier":"^9.1.0","eslint-plugin-import":"^2.31.0","eslint-plugin-prettier":"^5.2.1","prettier":"^3.3.3","ts-node":"^10.9.2","typescript":"^5.6.3"},"peerDependencies":{"@mysten/dapp-kit-core":"1.0.3","@mysten/dapp-kit-react":"1.0.1","@mysten/sui":"2.3.1","@mysten/wallet-standard":"0.20.0","@suilend/sui-fe":"^2.0.6"}}
+{"name":"@suilend/sui-fe-next","version":"2.0.10","private":false,"description":"A collection of TypeScript frontend components and hooks","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./contexts/WalletContext":"./contexts/WalletContext.jsx","./contexts/SettingsContext":"./contexts/SettingsContext.jsx","./contexts":"./contexts/index.js","./fetchers":"./fetchers/index.js","./fetchers/useFetchBalances":"./fetchers/useFetchBalances.js","./hooks/useRefreshOnBalancesChange":"./hooks/useRefreshOnBalancesChange.js","./hooks/useLedgerHashDialog":"./hooks/useLedgerHashDialog.js","./hooks/useIsAndroid":"./hooks/useIsAndroid.jsx","./hooks/useCoinMetadataMap":"./hooks/useCoinMetadataMap.js","./hooks":"./hooks/index.js","./hooks/useIsTouchscreen":"./hooks/useIsTouchscreen.jsx","./hooks/useIsiOS":"./hooks/useIsiOS.jsx","./hooks/keypair":"./hooks/keypair.js","./lib/track":"./lib/track.js","./lib":"./lib/index.js","./lib/router":"./lib/router.js","./lib/toasts":"./lib/toasts.jsx","./lib/connector":"./lib/connector.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/sui-fe.git"},"bugs":{"url":"https://github.com/suilend/sui-fe/issues"},"dependencies":{"@reown/appkit":"^1.8.10","@reown/appkit-common":"^1.8.10","@reown/appkit-universal-connector":"^1.8.19","@tanstack/react-query":"^5.60.2","bignumber.js":"^9.1.2","launchdarkly-react-client-sdk":"^3.6.0","lodash":"^4.17.21","mixpanel-browser":"^2.72.0","next":"^15.0.3","react":"18.3.1","react-dom":"18.3.1","react-responsive":"^10.0.0","sonner":"1.4.41","swr":"^2.2.5","tailwind-merge":"^2.5.4","usehooks-ts":"^3.1.1"},"devDependencies":{"@tsconfig/next":"^2.0.3","@types/lodash":"^4.17.13","@types/node":"^22.9.0","@types/react":"^18.3.12","@types/react-dom":"^18.3.1","@typescript-eslint/eslint-plugin":"^8.14.0","@typescript-eslint/parser":"^8.14.0","eslint":"^9.14.0","eslint-config-next":"^15.0.3","eslint-config-prettier":"^9.1.0","eslint-plugin-import":"^2.31.0","eslint-plugin-prettier":"^5.2.1","prettier":"^3.3.3","ts-node":"^10.9.2","typescript":"^5.6.3"},"peerDependencies":{"@mysten/dapp-kit-core":"1.0.3","@mysten/dapp-kit-react":"1.0.1","@mysten/sui":"2.3.1","@mysten/wallet-standard":"0.20.0","@suilend/sui-fe":"^2.0.10"}}