@suilend/sui-fe-next 2.0.30 → 3.0.0

package/contexts/SettingsContext.d.ts

@@ -1,5 +1,6 @@
 import { PropsWithChildren } from "react";
-import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiGraphQLClient } from "@mysten/sui/graphql";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Explorer, ExplorerId, Rpc, RpcId } from "@suilend/sui-fe";
 interface SettingsContext {
     rpc: Rpc;
@@ -9,7 +10,8 @@ interface SettingsContext {
     setExplorerId: (id: ExplorerId) => void;
     gasBudget: string;
     setGasBudget: (value: string) => void;
-    suiClient: SuiJsonRpcClient;
+    suiGrpcClient: SuiGrpcClient;
+    suiGraphQLClient: SuiGraphQLClient;
 }
 declare const SettingsContext: import("react").Context<SettingsContext>;
 export declare const useSettingsContext: () => SettingsContext;

package/contexts/SettingsContext.jsx

@@ -10,9 +10,10 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { createContext, useContext, useMemo } from "react";
-import { SuiJsonRpcClient, getJsonRpcFullnodeUrl } from "@mysten/sui/jsonRpc";
+import { SuiGraphQLClient } from "@mysten/sui/graphql";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { useLocalStorage } from "usehooks-ts";
-import { EXPLORERS, RPCS, RpcId, } from "@suilend/sui-fe";
+import { EXPLORERS, RPCS, RPC_GRAPHQL_URL, RpcId, } from "@suilend/sui-fe";
 var defaultContextValue = {
     rpc: RPCS[0],
     setRpcId: function () {
@@ -29,8 +30,12 @@ var defaultContextValue = {
     setGasBudget: function () {
         throw Error("SettingsContextProvider not initialized");
     },
-    suiClient: new SuiJsonRpcClient({
-        url: getJsonRpcFullnodeUrl("mainnet"),
+    suiGrpcClient: new SuiGrpcClient({
+        baseUrl: "https://fullnode.mainnet.sui.io:443",
+        network: "mainnet",
+    }),
+    suiGraphQLClient: new SuiGraphQLClient({
+        url: RPC_GRAPHQL_URL,
         network: "mainnet",
     }),
 };
@@ -54,8 +59,9 @@ export function SettingsContextProvider(_a) {
     }, [explorerId]);
     // Gas budget
     var _e = useLocalStorage("gasBudget", defaultContextValue.gasBudget), gasBudget = _e[0], setGasBudget = _e[1];
-    // Sui client
-    var suiClient = useMemo(function () { return new SuiJsonRpcClient({ url: rpc.url, network: "mainnet" }); }, [rpc.url]);
+    // Sui clients
+    var suiGrpcClient = useMemo(function () { return new SuiGrpcClient({ baseUrl: rpc.url, network: "mainnet" }); }, [rpc.url]);
+    var suiGraphQLClient = useMemo(function () { return new SuiGraphQLClient({ url: RPC_GRAPHQL_URL, network: "mainnet" }); }, []);
     // Context
     var contextValue = useMemo(function () { return ({
         rpc: rpc,
@@ -65,7 +71,8 @@ export function SettingsContextProvider(_a) {
         setExplorerId: setExplorerId,
         gasBudget: gasBudget,
         setGasBudget: setGasBudget,
-        suiClient: suiClient,
+        suiGrpcClient: suiGrpcClient,
+        suiGraphQLClient: suiGraphQLClient,
     }); }, [
         rpc,
         setRpcId,
@@ -74,7 +81,8 @@ export function SettingsContextProvider(_a) {
         setExplorerId,
         gasBudget,
         setGasBudget,
-        suiClient,
+        suiGrpcClient,
+        suiGraphQLClient,
     ]);
     return (<SettingsContext.Provider value={contextValue}>
       {children}

package/contexts/WalletContext.d.ts

@@ -1,14 +1,15 @@
 import { Dispatch, PropsWithChildren, SetStateAction } from "react";
-import { type UiWallet } from "@mysten/dapp-kit-core";
-import { DevInspectResults, SuiTransactionBlockResponse } from "@mysten/sui/jsonRpc";
+import { UiWallet } from "@mysten/dapp-kit-core";
+import { SuiClientTypes } from "@mysten/sui/client";
+import { SignatureWithBytes } from "@mysten/sui/cryptography";
 import { Transaction } from "@mysten/sui/transactions";
-import { type SignedTransaction, type WalletIcon, type WalletAccount as WalletStandardWalletAccount } from "@mysten/wallet-standard";
+import { ReadonlyUint8Array, WalletIcon, WalletAccount as WalletStandardWalletAccount } from "@mysten/wallet-standard";
 export declare enum WalletType {
     EXTENSION = "extension",
     WEB = "web"
 }
 export type WalletAccount = Omit<WalletStandardWalletAccount, "publicKey"> & {
-    publicKey?: WalletStandardWalletAccount["publicKey"];
+    publicKey?: ReadonlyUint8Array;
 };
 type WalletPlatform = "iOS" | "android" | "extension";
 export type Wallet = {
@@ -50,8 +51,14 @@ export interface WalletContext {
     account?: WalletAccount;
     switchAccount: (account: WalletAccount, addressNameServiceName?: string) => void;
     address?: string;
-    dryRunTransaction: (transaction: Transaction, setGasBudget?: boolean) => Promise<DevInspectResults>;
-    signExecuteAndWaitForTransaction: (transaction: Transaction, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignedTransaction) => void, onExecute?: (res: SuiTransactionBlockResponse) => void) => Promise<SuiTransactionBlockResponse>;
+    dryRunTransaction: (transaction: Transaction, setGasBudget?: boolean) => Promise<SuiClientTypes.SimulateTransactionResult<{
+        commandResults: true;
+    }>>;
+    signExecuteAndWaitForTransaction: (transaction: Transaction, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignatureWithBytes) => void, onExecute?: (res: SuiClientTypes.Transaction) => void) => Promise<SuiClientTypes.Transaction<{
+        effects: true;
+        events: true;
+        balanceChanges: true;
+    }>>;
     isUsingLedger: boolean;
     setIsUsingLedger: (isUsingLedger: boolean) => void;
     signPersonalMessage: (message: Uint8Array) => Promise<{

package/contexts/WalletContext.jsx

@@ -57,12 +57,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var _a, _b;
 import { useRouter } from "next/router";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from "react";
-import { createDAppKit, getWalletUniqueIdentifier, } from "@mysten/dapp-kit-core";
+import { createDAppKit, } from "@mysten/dapp-kit-core";
 import { DAppKitProvider, useCurrentAccount, useCurrentWallet, useDAppKit, useWalletConnection, useWallets, } from "@mysten/dapp-kit-react";
-import { SuiJsonRpcClient, } from "@mysten/sui/jsonRpc";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Transaction } from "@mysten/sui/transactions";
-import { SUI_DECIMALS, toBase64 } from "@mysten/sui/utils";
-import { getWallets } from "@wallet-standard/app";
+import { SUI_DECIMALS, fromBase64, toBase64 } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import { useLDClient } from "launchdarkly-react-client-sdk";
 import { useLocalStorage } from "usehooks-ts";
@@ -218,7 +217,7 @@ function Inner(_a) {
     var queryParams = (_b = {},
         _b[WalletContextQueryParams.WALLET] = router.query[WalletContextQueryParams.WALLET],
         _b);
-    var _h = useSettingsContext(), rpc = _h.rpc, suiClient = _h.suiClient;
+    var _h = useSettingsContext(), rpc = _h.rpc, suiGrpcClient = _h.suiGrpcClient;
     // Only used for wallet connect
     var _j = useState(), universalConnector = _j[0], setUniversalConnector = _j[1];
     var _k = useState(), session = _k[0], setSession = _k[1];
@@ -243,7 +242,6 @@ function Inner(_a) {
     // Impersonated address
     var impersonatedAddress = queryParams[WalletContextQueryParams.WALLET];
     // Wallets
-    var dAppKit = useDAppKit();
     var wallets__installed = useWallets();
     var getInstalledWallet = useCallback(function (name) { return wallets__installed.find(function (w) { return w.name === name; }); }, [wallets__installed]);
     var wallets__extension_default = useMemo(function () {
@@ -354,6 +352,7 @@ function Inner(_a) {
     ]);
     // Wallet
     var _l = useState(false), isConnectWalletDropdownOpen = _l[0], setIsConnectWalletDropdownOpen = _l[1];
+    var dAppKit = useDAppKit();
     var rawWallet = useCurrentWallet();
     var wallet = useMemo(function () {
         if (sessionAddress) {
@@ -363,9 +362,6 @@ function Inner(_a) {
             ? wallets.find(function (w) { return w.name === rawWallet.name; })
             : undefined;
     }, [rawWallet, wallets, sessionAddress]);
-    var connectWallet = dAppKit.connectWallet;
-    var disconnectWallet = dAppKit.disconnectWallet;
-    var signPersonalMessageRaw = dAppKit.signPersonalMessage;
     var walletConnectSignPersonalMessage = useCallback(function (message) { return __awaiter(_this, void 0, void 0, function () {
         var res;
         return __generator(this, function (_a) {
@@ -390,24 +386,38 @@ function Inner(_a) {
         try {
             if (_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect) {
                 universalConnector.connect().then(function (res) {
-                    disconnectWallet();
-                    setSession(res.session);
+                    dAppKit
+                        .disconnectWallet()
+                        .then(function () {
+                        setSession(res.session);
+                    })
+                        .catch(function (err) {
+                        showErrorToast("Failed to connect ".concat(_wallet.name), err);
+                        console.error(err);
+                    });
                 });
                 return;
             }
             if (!_wallet.raw)
                 throw new Error("Missing wallet");
-            connectWallet({ wallet: _wallet.raw });
-            universalConnector.disconnect();
-            setSession(null);
-            showInfoToast("Connected ".concat(_wallet.name));
-            setIsConnectWalletDropdownOpen(false);
+            dAppKit
+                .connectWallet({ wallet: _wallet.raw })
+                .then(function (res) {
+                universalConnector.disconnect();
+                setSession(null);
+                showInfoToast("Connected ".concat(_wallet.name));
+                setIsConnectWalletDropdownOpen(false);
+            })
+                .catch(function (err) {
+                showErrorToast("Failed to connect ".concat(_wallet.name), err);
+                console.error(err);
+            });
         }
         catch (err) {
             showErrorToast("Failed to connect ".concat(_wallet.name), err);
             console.error(err);
         }
-    }, [connectWallet, disconnectWallet, universalConnector]);
+    }, [universalConnector, dAppKit]);
     var disconnectWalletWrapper = useCallback(function () {
         try {
             if (sessionAddress) {
@@ -415,20 +425,27 @@ function Inner(_a) {
                 setSession(null);
             }
             else {
-                disconnectWallet();
-                showInfoToast("Disconnected wallet");
+                dAppKit
+                    .disconnectWallet()
+                    .then(function () {
+                    showInfoToast("Disconnected wallet");
+                })
+                    .catch(function (err) {
+                    showErrorToast("Failed to disconnect wallet", err);
+                    console.error(err);
+                });
             }
         }
         catch (err) {
             showErrorToast("Failed to disconnect wallet", err);
             console.error(err);
         }
-    }, [sessionAddress, universalConnector, disconnectWallet]);
+    }, [sessionAddress, universalConnector, dAppKit]);
     // Accounts
-    var walletConnection = useWalletConnection();
-    var accountsRes = useMemo(function () { var _a, _b; return (_b = (_a = walletConnection.wallet) === null || _a === void 0 ? void 0 : _a.accounts) !== null && _b !== void 0 ? _b : []; }, [(_f = walletConnection.wallet) === null || _f === void 0 ? void 0 : _f.accounts]);
+    var connection = useWalletConnection();
+    var accountsRes = useMemo(function () { var _a, _b; return (_b = (_a = connection === null || connection === void 0 ? void 0 : connection.wallet) === null || _a === void 0 ? void 0 : _a.accounts) !== null && _b !== void 0 ? _b : []; }, [(_f = connection === null || connection === void 0 ? void 0 : connection.wallet) === null || _f === void 0 ? void 0 : _f.accounts]);
     var accountRes = (_g = useCurrentAccount()) !== null && _g !== void 0 ? _g : undefined;
-    var walletConnectAccount = useMemo(function () {
+    var account = useMemo(function () {
         return sessionAddress
             ? {
                 address: sessionAddress,
@@ -436,33 +453,32 @@ function Inner(_a) {
                 chains: ["sui:mainnet"],
                 features: [],
             }
-            : undefined;
-    }, [sessionAddress]);
-    var account = useMemo(function () { return walletConnectAccount !== null && walletConnectAccount !== void 0 ? walletConnectAccount : accountRes; }, [walletConnectAccount, accountRes]);
-    var accounts = useMemo(function () { return (walletConnectAccount ? [walletConnectAccount] : accountsRes); }, [walletConnectAccount, accountsRes]);
+            : accountRes;
+    }, [sessionAddress, accountRes]);
+    var accounts = useMemo(function () {
+        return sessionAddress
+            ? [
+                {
+                    address: sessionAddress,
+                    publicKey: new Uint8Array(),
+                    chains: ["sui:mainnet"],
+                    features: [],
+                },
+            ]
+            : accountsRes;
+    }, [sessionAddress, accountsRes]);
     var signPersonalMessage = useMemo(function () {
         return sessionAddress
             ? walletConnectSignPersonalMessage
-            : function (message) { return signPersonalMessageRaw({ message: message }); };
-    }, [sessionAddress, walletConnectSignPersonalMessage, signPersonalMessageRaw]);
-    var DAPP_KIT_STORAGE_KEY = "mysten-dapp-kit:selected-wallet-and-address";
+            : function (message) { return dAppKit.signPersonalMessage({ message: message }); };
+    }, [sessionAddress, walletConnectSignPersonalMessage, dAppKit]);
     var switchAccountWrapper = useCallback(function (_account, addressNameServiceName) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         var accountLabel = (_b = (_a = _account === null || _account === void 0 ? void 0 : _account.label) !== null && _a !== void 0 ? _a : addressNameServiceName) !== null && _b !== void 0 ? _b : formatAddress(_account.address);
         try {
-            var matchingAccount = (_c = walletConnection.wallet) === null || _c === void 0 ? void 0 : _c.accounts.find(function (a) { return a.address === _account.address; });
-            if (!matchingAccount)
-                throw new Error("Account not found");
-            dAppKit.switchAccount({ account: matchingAccount });
-            // Persist to dapp-kit's own storage key so autoconnect restores
-            // the correct account on page reload.
-            try {
-                var walletId = getWalletUniqueIdentifier(matchingAccount);
-                var intents = (_d = walletConnection.supportedIntents) !== null && _d !== void 0 ? _d : [];
-                var storageValue = "".concat(walletId.replace(":", "_"), ":").concat(matchingAccount.address, ":").concat(intents.join(","), ":");
-                localStorage.setItem(DAPP_KIT_STORAGE_KEY, storageValue);
-            }
-            catch (_e) { }
+            dAppKit.switchAccount({
+                account: _account,
+            });
             showInfoToast("Switched to ".concat(accountLabel), {
                 description: (_account === null || _account === void 0 ? void 0 : _account.label)
                     ? (addressNameServiceName !== null && addressNameServiceName !== void 0 ? addressNameServiceName : formatAddress(_account.address))
@@ -473,7 +489,7 @@ function Inner(_a) {
             showErrorToast("Failed to switch to ".concat(accountLabel), err);
             console.error(err);
         }
-    }, [dAppKit, walletConnection]);
+    }, [dAppKit]);
     // LaunchDarkly
     var ldClient = useLDClient();
     var ldKeyRef = useRef(undefined);
@@ -538,43 +554,46 @@ function Inner(_a) {
             args_1[_i - 1] = arguments[_i];
         }
         return __awaiter(_this, __spreadArray([transaction_1], args_1, true), void 0, function (transaction, setGasBudget) {
-            var _address, _transaction, inspectResults, err_2;
+            var _address, _transaction, simResult, err_2;
+            var _a, _b;
             if (setGasBudget === void 0) { setGasBudget = true; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         _address = impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address;
                         _transaction = Transaction.from(transaction);
-                        _a.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _c.trys.push([1, 3, , 4]);
                         // Gas budget
                         if (setGasBudget && gasBudget !== "")
                             _transaction.setGasBudget(+new BigNumber(gasBudget)
                                 .times(Math.pow(10, SUI_DECIMALS))
                                 .integerValue(BigNumber.ROUND_DOWN));
-                        return [4 /*yield*/, suiClient.devInspectTransactionBlock({
-                                sender: _address !== null && _address !== void 0 ? _address : "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                transactionBlock: _transaction,
+                        // Set sender for simulation
+                        _transaction.setSender(_address !== null && _address !== void 0 ? _address : "0x0000000000000000000000000000000000000000000000000000000000000000");
+                        return [4 /*yield*/, suiGrpcClient.simulateTransaction({
+                                transaction: _transaction,
+                                checksEnabled: false,
+                                include: { commandResults: true },
                             })];
                     case 2:
-                        inspectResults = _a.sent();
-                        console.log("[WalletContext] dryRunTransaction - inspectResults:", inspectResults);
-                        if (inspectResults.error)
-                            throw new Error(inspectResults.error);
-                        return [2 /*return*/, inspectResults];
+                        simResult = _c.sent();
+                        console.log("[WalletContext] dryRunTransaction - simResult:", simResult);
+                        if (simResult.FailedTransaction)
+                            throw new Error((_b = (_a = simResult.FailedTransaction.status.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : "Simulation failed");
+                        return [2 /*return*/, simResult];
                     case 3:
-                        err_2 = _a.sent();
-                        // _transaction.getData().inputs.filter(input=>!!input.Object).map(input=>input.)
+                        err_2 = _c.sent();
                         console.error(err_2);
                         throw err_2;
                     case 4: return [2 /*return*/];
                 }
             });
         });
-    }, [impersonatedAddress, account === null || account === void 0 ? void 0 : account.address, gasBudget, suiClient]);
+    }, [impersonatedAddress, account === null || account === void 0 ? void 0 : account.address, gasBudget, suiGrpcClient]);
     var signExecuteAndWaitForTransaction = useCallback(function (transaction, onSetGasBudget, onSign, onExecute) { return __awaiter(_this, void 0, void 0, function () {
-        var _address, txBytes, res, signedTransaction_1, res1_1, res2_1, msafeWallet, msafeFeature, msafeAccount, signedTransaction, res1, res2, err_3;
+        var _address, signedTransaction, txBytes, res, execResult, execTx, waitResult, tx, err_3;
         var _a, _b, _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -588,7 +607,7 @@ function Inner(_a) {
                     }
                     _e.label = 1;
                 case 1:
-                    _e.trys.push([1, 13, , 14]);
+                    _e.trys.push([1, 9, , 10]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -597,9 +616,10 @@ function Inner(_a) {
                     onSetGasBudget === null || onSetGasBudget === void 0 ? void 0 : onSetGasBudget(transaction);
                     // Log
                     console.log("[WalletContext] signExecuteAndWaitForTransaction - transaction.getData():", transaction.getData());
-                    if (!(sessionAddress && universalConnector)) return [3 /*break*/, 6];
+                    signedTransaction = void 0;
+                    if (!(sessionAddress && universalConnector)) return [3 /*break*/, 4];
                     transaction.setSender(sessionAddress);
-                    return [4 /*yield*/, transaction.build({ client: suiClient })];
+                    return [4 /*yield*/, transaction.build({ client: suiGrpcClient })];
                 case 2:
                     txBytes = _e.sent();
                     return [4 /*yield*/, universalConnector.request({
@@ -611,95 +631,63 @@ function Inner(_a) {
                         }, "sui:mainnet")];
                 case 3:
                     res = _e.sent();
-                    signedTransaction_1 = {
+                    signedTransaction = {
                         bytes: res.transactionBytes,
                         signature: res.signature,
                     };
-                    onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction_1);
-                    return [4 /*yield*/, suiClient.executeTransactionBlock({
-                            transactionBlock: signedTransaction_1.bytes,
-                            signature: signedTransaction_1.signature,
-                        })];
-                case 4:
-                    res1_1 = _e.sent();
-                    onExecute === null || onExecute === void 0 ? void 0 : onExecute(res1_1);
-                    return [4 /*yield*/, suiClient.waitForTransaction({
-                            digest: res1_1.digest,
-                            options: {
-                                showBalanceChanges: true,
-                                showEffects: true,
-                                showEvents: true,
-                                showObjectChanges: true,
-                            },
-                        })];
-                case 5:
-                    res2_1 = _e.sent();
-                    if (((_a = res2_1.effects) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
-                        res2_1.effects.status.status === "failure")
-                        throw new Error((_b = res2_1.effects.status.error) !== null && _b !== void 0 ? _b : "Transaction failed");
-                    return [2 /*return*/, res2_1];
-                case 6:
-                    if (!isInMsafeApp()) return [3 /*break*/, 9];
-                    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*/, 8];
-                    msafeAccount = msafeWallet.accounts.find(function (a) { return a.address === account.address; });
-                    if (!msafeAccount)
-                        throw new Error("MSafe account not found");
-                    return [4 /*yield*/, msafeFeature.signAndExecuteTransactionBlock({
-                            transactionBlock: transaction,
-                            account: msafeAccount,
-                            chain: "sui:mainnet",
-                        })];
-                case 7:
-                    _e.sent();
-                    throw new Error("Unreachable");
-                case 8: throw new Error("MSafe wallet not found. Please reload the page inside MSafe.");
-                case 9: return [4 /*yield*/, dAppKit.signTransaction({
+                    return [3 /*break*/, 6];
+                case 4: return [4 /*yield*/, dAppKit.signTransaction({
                         transaction: transaction,
                     })];
-                case 10:
+                case 5:
+                    // Sign
                     signedTransaction = _e.sent();
+                    _e.label = 6;
+                case 6:
+                    if (!signedTransaction)
+                        throw new Error("Failed to sign transaction");
                     onSign === null || onSign === void 0 ? void 0 : onSign(signedTransaction);
-                    return [4 /*yield*/, suiClient.executeTransactionBlock({
-                            transactionBlock: signedTransaction.bytes,
-                            signature: signedTransaction.signature,
+                    return [4 /*yield*/, suiGrpcClient.executeTransaction({
+                            transaction: fromBase64(signedTransaction.bytes),
+                            signatures: [signedTransaction.signature],
                         })];
-                case 11:
-                    res1 = _e.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,
+                case 7:
+                    execResult = _e.sent();
+                    execTx = (_a = execResult.Transaction) !== null && _a !== void 0 ? _a : execResult.FailedTransaction;
+                    if (!execTx)
+                        throw new Error("Transaction not found");
+                    onExecute === null || onExecute === void 0 ? void 0 : onExecute(execTx);
+                    return [4 /*yield*/, suiGrpcClient.waitForTransaction({
+                            digest: execTx.digest,
+                            include: {
+                                effects: true,
+                                events: true,
+                                balanceChanges: true,
                             },
                         })];
-                case 12:
-                    res2 = _e.sent();
-                    if (((_c = res2.effects) === null || _c === void 0 ? void 0 : _c.status) !== undefined &&
-                        res2.effects.status.status === "failure")
-                        throw new Error((_d = res2.effects.status.error) !== null && _d !== void 0 ? _d : "Transaction failed");
-                    return [2 /*return*/, res2];
-                case 13:
+                case 8:
+                    waitResult = _e.sent();
+                    tx = (_b = waitResult.Transaction) !== null && _b !== void 0 ? _b : waitResult.FailedTransaction;
+                    if (!tx)
+                        throw new Error("Transaction not found");
+                    if (!tx.status.success)
+                        throw new Error((_d = (_c = tx.status.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : "Transaction failed");
+                    return [2 /*return*/, tx];
+                case 9:
                     err_3 = _e.sent();
                     console.error(err_3);
                     throw err_3;
-                case 14: return [2 /*return*/];
+                case 10: return [2 /*return*/];
             }
         });
     }); }, [
-        universalConnector,
-        sessionAddress,
-        gasBudget,
         impersonatedAddress,
-        account,
+        account === null || account === void 0 ? void 0 : account.address,
         dryRunTransaction,
-        suiClient,
+        gasBudget,
+        sessionAddress,
+        universalConnector,
+        suiGrpcClient,
         dAppKit,
     ]);
     // Using Ledger
@@ -750,10 +738,9 @@ export function WalletContextProvider(_a) {
     var dAppKitInstance = useMemo(function () {
         return createDAppKit({
             networks: ["mainnet"],
-            createClient: function () {
-                return new SuiJsonRpcClient({ url: rpc.url, network: "mainnet" });
+            createClient: function (network) {
+                return new SuiGrpcClient({ network: network, baseUrl: rpc.url });
             },
-            defaultNetwork: "mainnet",
             autoConnect: true,
             slushWalletConfig: { appName: appName },
         });

package/fetchers/useFetchBalances.js

@@ -53,25 +53,26 @@ import { useWalletContext } from "../contexts/WalletContext";
 import { showErrorToast } from "../lib/toasts";
 export default function useFetchBalances() {
     var _this = this;
-    var suiClient = useSettingsContext().suiClient;
+    var suiGrpcClient = useSettingsContext().suiGrpcClient;
     var address = useWalletContext().address;
     var dataFetcher = function () { return __awaiter(_this, void 0, void 0, function () {
-        var balancesMap, rawBalances, _i, rawBalances_1, rawBalance, totalBalance;
+        var balancesMap, balances, rawBalances, _i, rawBalances_1, rawBalance, totalBalance;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     balancesMap = {};
                     if (!address) return [3 /*break*/, 2];
-                    return [4 /*yield*/, suiClient.getAllBalances({
+                    return [4 /*yield*/, suiGrpcClient.listBalances({
                             owner: address,
                         })];
                 case 1:
-                    rawBalances = (_a.sent())
-                        .map(function (cb) { return (__assign(__assign({}, cb), { coinType: normalizeStructTag(cb.coinType) })); })
+                    balances = (_a.sent()).balances;
+                    rawBalances = balances
+                        .map(function (b) { return (__assign(__assign({}, b), { coinType: normalizeStructTag(b.coinType) })); })
                         .sort(function (a, b) { return (a.coinType < b.coinType ? -1 : 1); });
                     for (_i = 0, rawBalances_1 = rawBalances; _i < rawBalances_1.length; _i++) {
                         rawBalance = rawBalances_1[_i];
-                        totalBalance = new BigNumber(rawBalance.totalBalance);
+                        totalBalance = new BigNumber(rawBalance.balance);
                         if (totalBalance.gt(0))
                             balancesMap[rawBalance.coinType] = totalBalance;
                     }

package/hooks/useCoinMetadataMap.d.ts

@@ -1,3 +1,3 @@
-import { CoinMetadata } from "@mysten/sui/jsonRpc";
-declare const useCoinMetadataMap: (coinTypes: string[]) => Record<string, CoinMetadata> | undefined;
+import { SuiClientTypes } from "@mysten/sui/client";
+declare const useCoinMetadataMap: (coinTypes: string[]) => Record<string, SuiClientTypes.CoinMetadata> | undefined;
 export default useCoinMetadataMap;

package/hooks/useLedgerHashDialog.js

@@ -39,7 +39,7 @@ import { getLedgerHash } from "@suilend/sui-fe";
 import { useSettingsContext } from "../contexts/SettingsContext";
 import { useWalletContext } from "../contexts/WalletContext";
 var useLedgerHashDialog = function () {
-    var suiClient = useSettingsContext().suiClient;
+    var suiGrpcClient = useSettingsContext().suiGrpcClient;
     var _a = useWalletContext(), address = _a.address, isUsingLedger = _a.isUsingLedger;
     var _b = useState(undefined), ledgerHash = _b[0], setLedgerHash = _b[1];
     var _c = useState(false), isOpen = _c[0], setIsOpen = _c[1];
@@ -52,7 +52,7 @@ var useLedgerHashDialog = function () {
                         return [2 /*return*/];
                     if (!isUsingLedger)
                         return [2 /*return*/];
-                    return [4 /*yield*/, getLedgerHash(address, transaction, suiClient)];
+                    return [4 /*yield*/, getLedgerHash(address, transaction, suiGrpcClient)];
                 case 1:
                     transactionLedgerHash = _a.sent();
                     setLedgerHash(transactionLedgerHash);
@@ -60,7 +60,7 @@ var useLedgerHashDialog = function () {
                     return [2 /*return*/];
             }
         });
-    }); }, [address, isUsingLedger, suiClient]);
+    }); }, [address, isUsingLedger, suiGrpcClient]);
     var close = useCallback(function () {
         setIsOpen(false);
     }, []);

package/hooks/useRefreshOnBalancesChange.js

@@ -39,7 +39,7 @@ import { isEqual } from "lodash";
 import { useSettingsContext } from "../contexts/SettingsContext";
 import { useWalletContext } from "../contexts/WalletContext";
 var useRefreshOnBalancesChange = function (refresh) {
-    var suiClient = useSettingsContext().suiClient;
+    var suiGrpcClient = useSettingsContext().suiGrpcClient;
     var address = useWalletContext().address;
     var previousBalancesRef = useRef(undefined);
     useEffect(function () {
@@ -52,11 +52,11 @@ var useRefreshOnBalancesChange = function (refresh) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 4, , 5]);
-                        return [4 /*yield*/, suiClient.getAllBalances({
+                        return [4 /*yield*/, suiGrpcClient.listBalances({
                                 owner: address,
                             })];
                     case 1:
-                        balances = _a.sent();
+                        balances = (_a.sent()).balances;
                         if (!(previousBalancesRef.current !== undefined &&
                             !isEqual(balances, previousBalancesRef.current))) return [3 /*break*/, 3];
                         return [4 /*yield*/, refresh()];
@@ -78,6 +78,6 @@ var useRefreshOnBalancesChange = function (refresh) {
             if (interval !== undefined)
                 clearInterval(interval);
         };
-    }, [address, suiClient, refresh]);
+    }, [address, suiGrpcClient, refresh]);
 };
 export default useRefreshOnBalancesChange;