@suilend/sui-fe-next 2.0.19 → 2.0.21

package/contexts/WalletContext.jsx

@@ -682,10 +682,10 @@ function Inner(_a) {
         });
     }); }, [suiClient]);
     var signExecuteAndWaitForTransaction = useCallback(function (transaction, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
-        var _address, provider, txBytes, txBase64, params, res_1, signAndExecErr_1, signRes, execRes, msafeWallet, msafeFeature, msafeAccount, usedSignOnly, signedTransaction, res1, err_5, message, res, digest, err_6;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _address, provider, txBytes, txBase64, params, topic_1, signClient_1, wcRequest, methods, signRes, execDigest, _i, methods_1, method, res_1, err_5, execRes, msafeWallet, msafeFeature, msafeAccount, usedSignOnly, signedTransaction, res1, err_6, message, res, digest, err_7;
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     _address = impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address;
                     if (_address) {
@@ -694,9 +694,9 @@ function Inner(_a) {
                         }
                         catch (err) { }
                     }
-                    _c.label = 1;
+                    _e.label = 1;
                 case 1:
-                    _c.trys.push([1, 24, , 25]);
+                    _e.trys.push([1, 29, , 30]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -705,61 +705,114 @@ function Inner(_a) {
                     onSetGasBudget === null || onSetGasBudget === void 0 ? void 0 : onSetGasBudget(transaction);
                     // Log
                     console.log("[WalletContext] signExecuteAndWaitForTransaction - transaction.getData():", transaction.getData());
-                    if (!sessionAddress) return [3 /*break*/, 12];
+                    if (!sessionAddress) return [3 /*break*/, 17];
                     return [4 /*yield*/, getWalletConnectProvider()];
                 case 2:
-                    provider = _c.sent();
+                    provider = _e.sent();
                     transaction.setSender(sessionAddress);
                     return [4 /*yield*/, transaction.build({ client: suiClient })];
                 case 3:
-                    txBytes = _c.sent();
+                    txBytes = _e.sent();
                     txBase64 = toBase64(txBytes);
                     params = {
                         transaction: txBase64,
                         address: wcRawAddress !== null && wcRawAddress !== void 0 ? wcRawAddress : sessionAddress,
                     };
-                    console.log("[WalletContext] WalletConnect — session topic:", (_a = provider.session) === null || _a === void 0 ? void 0 : _a.topic);
+                    topic_1 = (_a = provider.session) === null || _a === void 0 ? void 0 : _a.topic;
+                    console.log("[WalletContext] WalletConnect — session topic:", topic_1);
                     console.log("[WalletContext] WalletConnect — session namespaces:", JSON.stringify((_b = provider.session) === null || _b === void 0 ? void 0 : _b.namespaces));
                     console.log("[WalletContext] WalletConnect — request params:", params);
-                    _c.label = 4;
+                    if (!topic_1)
+                        throw new Error("WalletConnect session not found");
+                    signClient_1 = provider.client;
+                    // Debug: check relay connectivity and session health
+                    console.log("[WalletContext] WalletConnect — relay connected:", signClient_1.core.relayer.connected);
+                    console.log("[WalletContext] WalletConnect — session expiry:", (_c = provider.session) === null || _c === void 0 ? void 0 : _c.expiry, "now:", Math.floor(Date.now() / 1000), "expired:", ((_d = provider.session) === null || _d === void 0 ? void 0 : _d.expiry)
+                        ? provider.session.expiry < Math.floor(Date.now() / 1000)
+                        : "unknown");
+                    wcRequest = function (method, requestParams, timeoutMs) {
+                        if (timeoutMs === void 0) { timeoutMs = 120000; }
+                        return new Promise(function (resolve, reject) {
+                            var timer = setTimeout(function () {
+                                reject(new Error("WalletConnect request \"".concat(method, "\" timed out after ").concat(timeoutMs / 1000, "s \u2014 the wallet did not respond. ") +
+                                    "This usually means the wallet does not support this method."));
+                            }, timeoutMs);
+                            signClient_1
+                                .request({
+                                topic: topic_1,
+                                chainId: "sui:mainnet",
+                                request: { method: method, params: requestParams },
+                            })
+                                .then(function (res) {
+                                clearTimeout(timer);
+                                resolve(res);
+                            })
+                                .catch(function (err) {
+                                clearTimeout(timer);
+                                reject(err);
+                            });
+                        });
+                    };
+                    methods = [
+                        WC_SUI_METHODS.SIGN_TRANSACTION,
+                        WC_SUI_METHODS.SIGN_AND_EXECUTE_TRANSACTION,
+                    ];
+                    signRes = null;
+                    execDigest = null;
+                    _i = 0, methods_1 = methods;
+                    _e.label = 4;
                 case 4:
-                    _c.trys.push([4, 7, , 8]);
-                    console.log("[WalletContext] WalletConnect — trying sui_signAndExecuteTransaction");
-                    return [4 /*yield*/, provider.request({
-                            method: WC_SUI_METHODS.SIGN_AND_EXECUTE_TRANSACTION,
-                            params: params,
-                        }, "sui:mainnet")];
+                    if (!(_i < methods_1.length)) return [3 /*break*/, 12];
+                    method = methods_1[_i];
+                    _e.label = 5;
                 case 5:
-                    res_1 = _c.sent();
-                    console.log("[WalletContext] WalletConnect — sui_signAndExecuteTransaction succeeded, digest:", res_1.digest);
-                    return [4 /*yield*/, waitForTransactionWithCheck(res_1.digest)];
-                case 6: return [2 /*return*/, _c.sent()];
-                case 7:
-                    signAndExecErr_1 = _c.sent();
-                    console.warn("[WalletContext] WalletConnect — sui_signAndExecuteTransaction failed:", signAndExecErr_1);
-                    return [3 /*break*/, 8];
+                    _e.trys.push([5, 10, , 11]);
+                    console.log("[WalletContext] WalletConnect \u2014 trying ".concat(method));
+                    if (!(method === WC_SUI_METHODS.SIGN_TRANSACTION)) return [3 /*break*/, 7];
+                    return [4 /*yield*/, wcRequest(method, params)];
+                case 6:
+                    signRes = _e.sent();
+                    console.log("[WalletContext] WalletConnect \u2014 ".concat(method, " succeeded"));
+                    return [3 /*break*/, 12];
+                case 7: return [4 /*yield*/, wcRequest(method, params)];
                 case 8:
-                    // Fallback: sign-only, then dApp-side execute
-                    console.log("[WalletContext] WalletConnect — trying sui_signTransaction (sign-only fallback)");
-                    return [4 /*yield*/, provider.request({ method: WC_SUI_METHODS.SIGN_TRANSACTION, params: params }, "sui:mainnet")];
-                case 9:
-                    signRes = _c.sent();
-                    console.log("[WalletContext] WalletConnect — sui_signTransaction succeeded, executing on-chain");
+                    res_1 = _e.sent();
+                    console.log("[WalletContext] WalletConnect \u2014 ".concat(method, " succeeded, digest:"), res_1.digest);
+                    execDigest = res_1.digest;
+                    return [3 /*break*/, 12];
+                case 9: return [3 /*break*/, 11];
+                case 10:
+                    err_5 = _e.sent();
+                    console.warn("[WalletContext] WalletConnect \u2014 ".concat(method, " failed:"), err_5);
+                    return [3 /*break*/, 11];
+                case 11:
+                    _i++;
+                    return [3 /*break*/, 4];
+                case 12:
+                    if (!execDigest) return [3 /*break*/, 14];
+                    return [4 /*yield*/, waitForTransactionWithCheck(execDigest)];
+                case 13: return [2 /*return*/, _e.sent()];
+                case 14:
+                    if (!signRes) {
+                        throw new Error("WalletConnect: wallet did not respond to any signing method. " +
+                            "Check that the wallet supports Sui transactions and that the session is active.");
+                    }
+                    console.log("[WalletContext] WalletConnect — executing signed transaction on-chain");
                     return [4 /*yield*/, suiClient.executeTransactionBlock({
                             transactionBlock: signRes.transactionBytes,
                             signature: signRes.signature,
                         })];
-                case 10:
-                    execRes = _c.sent();
+                case 15:
+                    execRes = _e.sent();
                     return [4 /*yield*/, waitForTransactionWithCheck(execRes.digest)];
-                case 11: return [2 /*return*/, _c.sent()];
-                case 12:
-                    if (!isInMsafeApp()) return [3 /*break*/, 15];
+                case 16: return [2 /*return*/, _e.sent()];
+                case 17:
+                    if (!isInMsafeApp()) return [3 /*break*/, 20];
                     msafeWallet = getWallets()
                         .get()
                         .find(function (w) { return w.name === WalletName.MSAFE_WALLET; });
                     msafeFeature = msafeWallet === null || msafeWallet === void 0 ? void 0 : msafeWallet.features["sui:signAndExecuteTransactionBlock"];
-                    if (!(msafeFeature && account)) return [3 /*break*/, 14];
+                    if (!(msafeFeature && account)) return [3 /*break*/, 19];
                     msafeAccount = msafeWallet.accounts.find(function (a) { return a.address === account.address; });
                     if (!msafeAccount)
                         throw new Error("MSafe account not found");
@@ -768,58 +821,58 @@ function Inner(_a) {
                             account: msafeAccount,
                             chain: "sui:mainnet",
                         })];
-                case 13:
-                    _c.sent();
+                case 18:
+                    _e.sent();
                     // MSafe proposes the transaction to the multisig queue;
                     // the promise never resolves (only rejects on cancel).
                     // If we reach here the proposal was accepted.
                     throw new Error("Unreachable");
-                case 14: throw new Error("MSafe wallet not found. Please reload the page inside MSafe.");
-                case 15:
+                case 19: throw new Error("MSafe wallet not found. Please reload the page inside MSafe.");
+                case 20:
                     usedSignOnly = false;
-                    _c.label = 16;
-                case 16:
-                    _c.trys.push([16, 20, , 21]);
+                    _e.label = 21;
+                case 21:
+                    _e.trys.push([21, 25, , 26]);
                     return [4 /*yield*/, dAppKit.signTransaction({
                             transaction: transaction,
                         })];
-                case 17:
-                    signedTransaction = _c.sent();
+                case 22:
+                    signedTransaction = _e.sent();
                     usedSignOnly = true;
                     onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction);
                     return [4 /*yield*/, suiClient.executeTransactionBlock({
                             transactionBlock: signedTransaction.bytes,
                             signature: signedTransaction.signature,
                         })];
-                case 18:
-                    res1 = _c.sent();
+                case 23:
+                    res1 = _e.sent();
                     onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1);
                     return [4 /*yield*/, waitForTransactionWithCheck(res1.digest)];
-                case 19: return [2 /*return*/, _c.sent()];
-                case 20:
-                    err_5 = _c.sent();
+                case 24: return [2 /*return*/, _e.sent()];
+                case 25:
+                    err_6 = _e.sent();
                     if (usedSignOnly)
-                        throw err_5;
-                    message = err_5 instanceof Error ? err_5.message : String(err_5);
+                        throw err_6;
+                    message = err_6 instanceof Error ? err_6.message : String(err_6);
                     if (!message.includes("does not support"))
-                        throw err_5;
+                        throw err_6;
                     console.warn("[WalletContext] Wallet does not support sign-only, falling back to signAndExecuteTransaction");
-                    return [3 /*break*/, 21];
-                case 21: return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
+                    return [3 /*break*/, 26];
+                case 26: return [4 /*yield*/, dAppKit.signAndExecuteTransaction({
                         transaction: transaction,
                     })];
-                case 22:
-                    res = _c.sent();
+                case 27:
+                    res = _e.sent();
                     digest = res.$kind === "Transaction"
                         ? res.Transaction.digest
                         : res.FailedTransaction.digest;
                     return [4 /*yield*/, waitForTransactionWithCheck(digest)];
-                case 23: return [2 /*return*/, _c.sent()];
-                case 24:
-                    err_6 = _c.sent();
-                    console.error(err_6);
-                    throw err_6;
-                case 25: return [2 /*return*/];
+                case 28: return [2 /*return*/, _e.sent()];
+                case 29:
+                    err_7 = _e.sent();
+                    console.error(err_7);
+                    throw err_7;
+                case 30: return [2 /*return*/];
             }
         });
     }); }, [

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sui-fe-next","version":"2.0.19","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.2","@tanstack/react-query":"^5.60.2","@wallet-standard/app":"^1.1.0","@walletconnect/universal-provider":"2.21.1","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"}}
+{"name":"@suilend/sui-fe-next","version":"2.0.21","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.2","@tanstack/react-query":"^5.60.2","@wallet-standard/app":"^1.1.0","@walletconnect/universal-provider":"2.21.1","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"}}