@suilend/sui-fe-next 0.1.84 → 0.4.0

package/contexts/SettingsContext.d.ts

@@ -1,5 +1,6 @@
 import { PropsWithChildren } from "react";
-import { SuiClient } from "@mysten/sui/client";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
+import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
 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: SuiClient;
+    suiClient: SuiGrpcClient;
+    suiJsonRpcClient: SuiJsonRpcClient;
 }
 declare const SettingsContext: import("react").Context<SettingsContext>;
 export declare const useSettingsContext: () => SettingsContext;

package/contexts/SettingsContext.jsx

@@ -10,7 +10,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { createContext, useContext, useMemo } from "react";
-import { SuiClient, getFullnodeUrl } from "@mysten/sui/client";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
+import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
 import { useLocalStorage } from "usehooks-ts";
 import { EXPLORERS, RPCS, RpcId, } from "@suilend/sui-fe";
 var defaultContextValue = {
@@ -29,7 +30,8 @@ var defaultContextValue = {
     setGasBudget: function () {
         throw Error("SettingsContextProvider not initialized");
     },
-    suiClient: new SuiClient({ url: getFullnodeUrl("mainnet") }),
+    suiClient: null,
+    suiJsonRpcClient: null,
 };
 var SettingsContext = createContext(defaultContextValue);
 export var useSettingsContext = function () { return useContext(SettingsContext); };
@@ -52,7 +54,16 @@ export function SettingsContextProvider(_a) {
     // Gas budget
     var _e = useLocalStorage("gasBudget", defaultContextValue.gasBudget), gasBudget = _e[0], setGasBudget = _e[1];
     // Sui client
-    var suiClient = useMemo(function () { return new SuiClient({ url: rpc.url }); }, [rpc.url]);
+    var _f = useMemo(function () { return [
+        new SuiGrpcClient({
+            baseUrl: rpc.url,
+            network: "mainnet",
+        }),
+        new SuiJsonRpcClient({
+            url: rpc.url,
+            network: "mainnet",
+        }),
+    ]; }, [rpc.url]), suiClient = _f[0], suiJsonRpcClient = _f[1];
     // Context
     var contextValue = useMemo(function () { return ({
         rpc: rpc,
@@ -63,6 +74,7 @@ export function SettingsContextProvider(_a) {
         gasBudget: gasBudget,
         setGasBudget: setGasBudget,
         suiClient: suiClient,
+        suiJsonRpcClient: suiJsonRpcClient,
     }); }, [
         rpc,
         setRpcId,
@@ -72,6 +84,7 @@ export function SettingsContextProvider(_a) {
         gasBudget,
         setGasBudget,
         suiClient,
+        suiJsonRpcClient,
     ]);
     return (<SettingsContext.Provider value={contextValue}>
       {children}

package/contexts/WalletContext.d.ts

@@ -1,8 +1,9 @@
 import { Dispatch, PropsWithChildren, SetStateAction } from "react";
-import { DevInspectResults, SuiTransactionBlockResponse } from "@mysten/sui/client";
+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 { ReadonlyUint8Array, WalletIcon, WalletAccount as WalletStandardWalletAccount, WalletWithRequiredFeatures } from "@mysten/wallet-standard";
+import { ReadonlyUint8Array, WalletIcon, WalletAccount as WalletStandardWalletAccount } from "@mysten/wallet-standard";
 export declare enum WalletType {
     EXTENSION = "extension",
     WEB = "web"
@@ -17,7 +18,7 @@ export type Wallet = {
     iconUrl?: WalletIcon;
     type: WalletType;
     downloadUrls?: Record<WalletPlatform, string | undefined>;
-    raw?: WalletWithRequiredFeatures;
+    raw?: UiWallet;
     walletConnect?: boolean;
 };
 declare enum WalletName {
@@ -50,16 +51,13 @@ export interface WalletContext {
     account?: WalletAccount;
     switchAccount: (account: WalletAccount, addressNameServiceName?: string) => void;
     address?: string;
-    dryRunTransaction: (transaction: Transaction, setGasBudget?: boolean) => Promise<DevInspectResults>;
+    dryRunTransaction: (transaction: Transaction, setGasBudget?: boolean) => Promise<SuiClientTypes.SimulateTransactionResult>;
     signExecuteAndWaitForTransaction: (transaction: Transaction, options?: {
         auction?: boolean;
-    }, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignatureWithBytes) => void, onExecute?: (res: SuiTransactionBlockResponse) => void) => Promise<SuiTransactionBlockResponse>;
+    }, onSetGasBudget?: (transaction: Transaction) => void, onSign?: (signedTransaction: SignatureWithBytes) => void, onExecute?: (res: SuiClientTypes.TransactionResult) => void) => Promise<SuiClientTypes.TransactionResult>;
     isUsingLedger: boolean;
     setIsUsingLedger: (isUsingLedger: boolean) => void;
-    signPersonalMessage: (message: Uint8Array) => Promise<{
-        bytes: string;
-        signature: string;
-    }>;
+    signPersonalMessage: (message: Uint8Array) => Promise<SignatureWithBytes>;
 }
 export declare const useWalletContext: () => WalletContext;
 interface WalletContextProviderProps extends PropsWithChildren {

package/contexts/WalletContext.jsx

@@ -57,8 +57,8 @@ 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 { WalletProvider as MystenWalletProvider, SuiClientProvider, createNetworkConfig, useSignPersonalMessage, } from "@mysten/dapp-kit";
-import { useAccounts, useConnectWallet, useCurrentAccount, useCurrentWallet, useDisconnectWallet, useSignTransaction, useSwitchAccount, useWallets, } from "@mysten/dapp-kit";
+import { DAppKitProvider, createDAppKit, useCurrentAccount, useCurrentWallet, useDAppKit, useWalletConnection, useWallets, } from "@mysten/dapp-kit-react";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Transaction } from "@mysten/sui/transactions";
 import { SUI_DECIMALS, toBase64 } from "@mysten/sui/utils";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
@@ -212,16 +212,16 @@ export var useWalletContext = function () { return useContext(WalletContext); };
 function Inner(_a) {
     var _b;
     var _this = this;
-    var _c, _d, _e, _f;
+    var _c, _d, _e, _f, _g, _h;
     var appName = _a.appName, children = _a.children;
     var router = useRouter();
     var queryParams = (_b = {},
         _b[WalletContextQueryParams.WALLET] = router.query[WalletContextQueryParams.WALLET],
         _b);
-    var _g = useSettingsContext(), suiClient = _g.suiClient, rpc = _g.rpc;
+    var _j = useSettingsContext(), rpc = _j.rpc, suiClient = _j.suiClient;
     // Only used for wallet connect
-    var _h = useState(), universalConnector = _h[0], setUniversalConnector = _h[1];
-    var _j = useState(), session = _j[0], setSession = _j[1];
+    var _k = useState(), universalConnector = _k[0], setUniversalConnector = _k[1];
+    var _l = useState(), session = _l[0], setSession = _l[1];
     var sessionAddressWithout0x = (_e = (_d = (_c = session === null || session === void 0 ? void 0 : session.namespaces) === null || _c === void 0 ? void 0 : _c.sui) === null || _d === void 0 ? void 0 : _d.accounts) === null || _e === void 0 ? void 0 : _e[0];
     var sessionAddress = sessionAddressWithout0x
         ? sessionAddressWithout0x.split(":").pop()
@@ -352,8 +352,9 @@ function Inner(_a) {
         wallets__web,
     ]);
     // Wallet
-    var _k = useState(false), isConnectWalletDropdownOpen = _k[0], setIsConnectWalletDropdownOpen = _k[1];
-    var rawWallet = useCurrentWallet().currentWallet;
+    var _m = useState(false), isConnectWalletDropdownOpen = _m[0], setIsConnectWalletDropdownOpen = _m[1];
+    var dAppKit = useDAppKit();
+    var rawWallet = useCurrentWallet();
     var wallet = useMemo(function () {
         if (sessionAddress) {
             return WALLET_CONNECT_WALLET;
@@ -362,9 +363,6 @@ function Inner(_a) {
             ? wallets.find(function (w) { return w.name === rawWallet.name; })
             : undefined;
     }, [rawWallet, wallets, sessionAddress]);
-    var connectWallet = useConnectWallet().mutate;
-    var disconnectWallet = useDisconnectWallet().mutate;
-    var signPersonalMessageRaw = useSignPersonalMessage().mutateAsync;
     var walletConnectSignPersonalMessage = useCallback(function (message) { return __awaiter(_this, void 0, void 0, function () {
         var res;
         return __generator(this, function (_a) {
@@ -385,62 +383,70 @@ function Inner(_a) {
             }
         });
     }); }, [sessionAddress, universalConnector]);
-    var connectWalletWrapper = useCallback(function (_wallet) {
-        try {
-            if (_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect) {
-                universalConnector.connect().then(function (res) {
-                    disconnectWallet();
+    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) {
+                case 0:
+                    _a.trys.push([0, 5, , 6]);
+                    if (!(_wallet === null || _wallet === void 0 ? void 0 : _wallet.walletConnect)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, universalConnector.connect()];
+                case 1:
+                    res = _a.sent();
+                    return [4 /*yield*/, dAppKit.disconnectWallet()];
+                case 2:
+                    _a.sent();
                     setSession(res.session);
-                });
-                return;
-            }
-            if (!_wallet.raw)
-                throw new Error("Missing wallet");
-            connectWallet({ wallet: _wallet.raw }, {
-                onSuccess: function () {
+                    return [2 /*return*/];
+                case 3:
+                    if (!_wallet.raw)
+                        throw new Error("Missing wallet");
+                    return [4 /*yield*/, dAppKit.connectWallet({ wallet: _wallet.raw })];
+                case 4:
+                    _a.sent();
                     universalConnector.disconnect();
                     setSession(null);
                     showInfoToast("Connected ".concat(_wallet.name));
                     setIsConnectWalletDropdownOpen(false);
-                },
-                onError: 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]);
-    var disconnectWalletWrapper = useCallback(function () {
-        try {
-            if (sessionAddress) {
-                universalConnector.disconnect();
-                setSession(null);
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _a.sent();
+                    showErrorToast("Failed to connect ".concat(_wallet.name), err_1);
+                    console.error(err_1);
+                    return [3 /*break*/, 6];
+                case 6: return [2 /*return*/];
             }
-            else {
-                disconnectWallet(undefined, {
-                    onSuccess: function () {
-                        showInfoToast("Disconnected wallet");
-                    },
-                    onError: function (err) {
-                        showErrorToast("Failed to disconnect wallet", err);
-                        console.error(err);
-                    },
-                });
+        });
+    }); }, [universalConnector, dAppKit]);
+    var disconnectWalletWrapper = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
+        var err_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 4, , 5]);
+                    if (!sessionAddress) return [3 /*break*/, 1];
+                    universalConnector.disconnect();
+                    setSession(null);
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, dAppKit.disconnectWallet()];
+                case 2:
+                    _a.sent();
+                    showInfoToast("Disconnected wallet");
+                    _a.label = 3;
+                case 3: return [3 /*break*/, 5];
+                case 4:
+                    err_2 = _a.sent();
+                    showErrorToast("Failed to disconnect wallet", err_2);
+                    console.error(err_2);
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
-        }
-        catch (err) {
-            showErrorToast("Failed to disconnect wallet", err);
-            console.error(err);
-        }
-    }, [sessionAddress, universalConnector, disconnectWallet]);
+        });
+    }); }, [sessionAddress, universalConnector, dAppKit]);
     // Accounts
-    var accountsRes = useAccounts();
-    var accountRes = (_f = useCurrentAccount()) !== null && _f !== void 0 ? _f : undefined;
-    var switchAccount = useSwitchAccount().mutate;
+    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 accountRes = (_g = useCurrentAccount()) !== null && _g !== void 0 ? _g : undefined;
     var account = useMemo(function () {
         return sessionAddress
             ? {
@@ -463,49 +469,36 @@ function Inner(_a) {
             ]
             : accountsRes;
     }, [sessionAddress, accountsRes]);
-    var signPersonalMessage = useMemo(function () {
-        return sessionAddress
-            ? walletConnectSignPersonalMessage
-            : function (message) { return signPersonalMessageRaw({ message: message, account: account }); };
-    }, [
-        sessionAddress,
-        walletConnectSignPersonalMessage,
-        signPersonalMessageRaw,
-        account,
-    ]);
-    var switchAccountWrapper = useCallback(function (_account, addressNameServiceName) {
+    var signPersonalMessage = useCallback(function (message) { return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, sessionAddress
+                    ? walletConnectSignPersonalMessage(message)
+                    : dAppKit.signPersonalMessage({ message: message })];
+        });
+    }); }, [sessionAddress, walletConnectSignPersonalMessage, dAppKit]);
+    var switchAccountWrapper = useCallback(function (_account, addressNameServiceName) { return __awaiter(_this, void 0, void 0, function () {
+        var accountLabel, walletAccount;
         var _a, _b, _c;
-        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 {
-            switchAccount(
-            // only address needed here. rest for type compatibility
-            {
-                account: {
-                    address: _account.address,
-                    chains: _account.chains,
-                    features: _account.features,
-                    icon: _account.icon,
-                    label: _account.label,
-                    publicKey: (_c = _account.publicKey) !== null && _c !== void 0 ? _c : new Uint8Array(),
-                },
-            }, {
-                onSuccess: function () {
-                    showInfoToast("Switched to ".concat(accountLabel), {
-                        description: (_account === null || _account === void 0 ? void 0 : _account.label)
-                            ? (addressNameServiceName !== null && addressNameServiceName !== void 0 ? addressNameServiceName : formatAddress(_account.address))
-                            : undefined,
-                    });
-                },
-                onError: function (err) {
-                    showErrorToast("Failed to switch to ".concat(accountLabel), err);
-                },
-            });
-        }
-        catch (err) {
-            showErrorToast("Failed to switch to ".concat(accountLabel), err);
-            console.error(err);
-        }
-    }, [switchAccount]);
+        return __generator(this, function (_d) {
+            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 {
+                walletAccount = (_c = walletConnection.wallet) === null || _c === void 0 ? void 0 : _c.accounts.find(function (acc) { return acc.address === _account.address; });
+                if (!walletAccount)
+                    throw new Error("Account not found in wallet");
+                dAppKit.switchAccount({ account: walletAccount });
+                showInfoToast("Switched to ".concat(accountLabel), {
+                    description: (_account === null || _account === void 0 ? void 0 : _account.label)
+                        ? (addressNameServiceName !== null && addressNameServiceName !== void 0 ? addressNameServiceName : formatAddress(_account.address))
+                        : undefined,
+                });
+            }
+            catch (err) {
+                showErrorToast("Failed to switch to ".concat(accountLabel), err);
+                console.error(err);
+            }
+            return [2 /*return*/];
+        });
+    }); }, [(_h = walletConnection.wallet) === null || _h === void 0 ? void 0 : _h.accounts, dAppKit]);
     // LaunchDarkly
     var ldClient = useLDClient();
     var ldKeyRef = useRef(undefined);
@@ -534,7 +527,7 @@ function Inner(_a) {
         if (!(wallet === null || wallet === void 0 ? void 0 : wallet.name))
             return;
         (function () { return __awaiter(_this, void 0, void 0, function () {
-            var err_1;
+            var err_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -554,8 +547,8 @@ function Inner(_a) {
                         _a.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        err_1 = _a.sent();
-                        console.error(err_1);
+                        err_3 = _a.sent();
+                        console.error(err_3);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -564,53 +557,59 @@ function Inner(_a) {
     }, [impersonatedAddress, account === null || account === void 0 ? void 0 : account.address, wallet === null || wallet === void 0 ? void 0 : wallet.name, appName]);
     // Tx
     var gasBudget = useSettingsContext().gasBudget;
-    var signTransaction = useSignTransaction().mutateAsync;
     var dryRunTransaction = useCallback(function (transaction_1) {
         var args_1 = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             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, inspectResults, _a, _b, err_4;
+            var _c;
+            var _d, _e, _f, _g;
             if (setGasBudget === void 0) { setGasBudget = true; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_h) {
+                switch (_h.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;
+                        _h.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _h.trys.push([1, 4, , 5]);
                         // 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,
-                            })];
-                    case 2:
-                        inspectResults = _a.sent();
+                        // Set sender for simulation
+                        _transaction.setSender(_address !== null && _address !== void 0 ? _address : "0x0000000000000000000000000000000000000000000000000000000000000000");
+                        _b = (_a = suiClient).simulateTransaction;
+                        _c = {};
+                        return [4 /*yield*/, _transaction.build({ client: suiClient })];
+                    case 2: return [4 /*yield*/, _b.apply(_a, [(_c.transaction = _h.sent(),
+                                _c)])];
+                    case 3:
+                        inspectResults = _h.sent();
                         console.log("[WalletContext] dryRunTransaction - inspectResults:", inspectResults);
-                        if (inspectResults.error)
-                            throw new Error(inspectResults.error);
+                        // Check for failed transaction
+                        if (!!inspectResults.FailedTransaction)
+                            throw new Error((_g = (_f = (_e = (_d = inspectResults.FailedTransaction.effects) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.error) === null || _f === void 0 ? void 0 : _f.message) !== null && _g !== void 0 ? _g : "Failed to inspect transaction");
                         return [2 /*return*/, inspectResults];
-                    case 3:
-                        err_2 = _a.sent();
+                    case 4:
+                        err_4 = _h.sent();
                         // _transaction.getData().inputs.filter(input=>!!input.Object).map(input=>input.)
-                        console.error(err_2);
-                        throw err_2;
-                    case 4: return [2 /*return*/];
+                        console.error(err_4);
+                        throw err_4;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     }, [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_3, res1, res2, err_4;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _address, signedTransaction, txBytes, res, err_5, res1, _a, _b, txResult1, res2, txResult2, err_6;
+        var _c;
+        var _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     _address = impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address;
                     if (_address) {
@@ -619,9 +618,9 @@ function Inner(_a) {
                         }
                         catch (err) { }
                     }
-                    _c.label = 1;
+                    _h.label = 1;
                 case 1:
-                    _c.trys.push([1, 13, , 14]);
+                    _h.trys.push([1, 14, , 15]);
                     // Gas budget
                     if (gasBudget !== "")
                         transaction.setGasBudget(+new BigNumber(gasBudget)
@@ -635,7 +634,7 @@ function Inner(_a) {
                     transaction.setSender(sessionAddress);
                     return [4 /*yield*/, transaction.build({ client: suiClient })];
                 case 2:
-                    txBytes = _c.sent();
+                    txBytes = _h.sent();
                     return [4 /*yield*/, universalConnector.request({
                             method: "sui_signTransaction",
                             params: {
@@ -644,74 +643,79 @@ function Inner(_a) {
                             },
                         }, "sui:mainnet")];
                 case 3:
-                    res = _c.sent();
+                    res = _h.sent();
                     signedTransaction = {
                         bytes: res.transactionBytes,
                         signature: res.signature,
                     };
                     return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, signTransaction({
+                case 4: return [4 /*yield*/, dAppKit.signTransaction({
                         transaction: transaction,
-                        chain: "sui:mainnet",
                     })];
                 case 5:
                     // Sign
-                    signedTransaction = _c.sent();
-                    _c.label = 6;
+                    signedTransaction = _h.sent();
+                    _h.label = 6;
                 case 6:
                     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;
+                    _h.label = 7;
                 case 7:
-                    _c.trys.push([7, 9, , 10]);
+                    _h.trys.push([7, 9, , 10]);
                     return [4 /*yield*/, executeAuction(signedTransaction.bytes, signedTransaction.signature)];
                 case 8:
-                    _c.sent();
+                    _h.sent();
                     return [3 /*break*/, 10];
                 case 9:
-                    err_3 = _c.sent();
+                    err_5 = _h.sent();
                     return [3 /*break*/, 10];
-                case 10: return [4 /*yield*/, suiClient.executeTransactionBlock({
-                        transactionBlock: signedTransaction.bytes,
-                        signature: signedTransaction.signature,
-                    })];
-                case 11:
-                    res1 = _c.sent();
+                case 10:
+                    _b = (_a = suiClient).executeTransaction;
+                    _c = {};
+                    return [4 /*yield*/, transaction.build({ client: suiClient })];
+                case 11: return [4 /*yield*/, _b.apply(_a, [(_c.transaction = _h.sent(),
+                            _c.signatures = [signedTransaction.signature],
+                            _c)])];
+                case 12:
+                    res1 = _h.sent();
+                    txResult1 = (_d = res1.Transaction) !== null && _d !== void 0 ? _d : res1.FailedTransaction;
+                    if (!(txResult1 === null || txResult1 === void 0 ? void 0 : txResult1.digest))
+                        throw new Error("Failed to get transaction digest");
                     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,
+                            digest: txResult1.digest,
+                            include: {
+                                balanceChanges: true,
+                                effects: true,
+                                events: true,
+                                objectChanges: true,
                             },
                         })];
-                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 13:
-                    err_4 = _c.sent();
-                    console.error(err_4);
-                    throw err_4;
-                case 14: return [2 /*return*/];
+                    res2 = _h.sent();
+                    txResult2 = (_e = res2.Transaction) !== null && _e !== void 0 ? _e : res2.FailedTransaction;
+                    if ((txResult2 === null || txResult2 === void 0 ? void 0 : txResult2.effects) && !txResult2.effects.status.success)
+                        throw new Error((_g = (_f = txResult2.effects.status.error) === null || _f === void 0 ? void 0 : _f.message) !== null && _g !== void 0 ? _g : "Transaction failed");
+                    return [2 /*return*/, res2];
+                case 14:
+                    err_6 = _h.sent();
+                    console.error(err_6);
+                    throw err_6;
+                case 15: return [2 /*return*/];
             }
         });
     }); }, [
-        universalConnector,
-        sessionAddress,
-        gasBudget,
         impersonatedAddress,
         account === null || account === void 0 ? void 0 : account.address,
         dryRunTransaction,
+        gasBudget,
+        sessionAddress,
+        universalConnector,
         suiClient,
-        signTransaction,
+        dAppKit,
     ]);
     // Using Ledger
-    var _l = useLocalStorage("isUsingLedger-".concat(impersonatedAddress !== null && impersonatedAddress !== void 0 ? impersonatedAddress : account === null || account === void 0 ? void 0 : account.address), false), isUsingLedger = _l[0], setIsUsingLedger = _l[1];
+    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];
     // Context
     var contextValue = useMemo(function () {
         return {
@@ -755,15 +759,24 @@ function Inner(_a) {
 export function WalletContextProvider(_a) {
     var appName = _a.appName, children = _a.children;
     var rpc = useSettingsContext().rpc;
-    var networkConfig = createNetworkConfig({
-        mainnet: { url: rpc.url },
-    }).networkConfig;
-    var queryClient = new QueryClient();
+    var queryClient = useMemo(function () { return new QueryClient(); }, []);
+    var dAppKit = useMemo(function () {
+        return createDAppKit({
+            networks: ["mainnet"],
+            defaultNetwork: "mainnet",
+            createClient: function (network) {
+                return new SuiGrpcClient({
+                    baseUrl: rpc.url,
+                    network: network,
+                });
+            },
+            autoConnect: true,
+            slushWalletConfig: { appName: appName },
+        });
+    }, [rpc.url, appName]);
     return (<QueryClientProvider client={queryClient}>
-      <SuiClientProvider networks={networkConfig} defaultNetwork="mainnet">
-        <MystenWalletProvider preferredWallets={DEFAULT_EXTENSION_WALLET_NAMES} autoConnect slushWallet={{ name: appName }}>
-          <Inner appName={appName}>{children}</Inner>
-        </MystenWalletProvider>
-      </SuiClientProvider>
+      <DAppKitProvider dAppKit={dAppKit}>
+        <Inner appName={appName}>{children}</Inner>
+      </DAppKitProvider>
     </QueryClientProvider>);
 }