@@ -127,10 +129,12 @@ describe('SuiClientProvider', () => {
networks={{
a: {
url: 'http://localhost:8080',
+ network: 'localnet',
custom: setSelectedNetwork,
},
b: {
url: 'http://localhost:8080',
+ network: 'localnet',
custom: setSelectedNetwork,
},
}}
@@ -180,10 +184,12 @@ describe('SuiClientProvider', () => {
networks={{
a: {
url: 'http://localhost:8080',
+ network: 'localnet',
custom: setSelectedNetwork,
},
b: {
url: 'http://localhost:8080',
+ network: 'localnet',
custom: setSelectedNetwork,
},
}}
diff --git a/packages/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx b/packages/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
index fcd6b7a2c..76cd7a26f 100644
--- a/packages/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import { bcs } from '@mysten/sui/bcs';
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { Transaction } from '@mysten/sui/transactions';
import { act, renderHook, waitFor } from '@testing-library/react';
import { expect, type Mock } from 'vitest';
@@ -62,7 +62,10 @@ describe('useSignAndExecuteTransaction', () => {
features: suiFeatures,
});
- const suiClient = new SuiClient({ url: getFullnodeUrl('localnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('localnet'),
+ network: 'localnet',
+ });
const mockSignTransactionFeature = mockWallet.features['sui:signTransaction'];
const signTransaction = mockSignTransactionFeature!.signTransaction as Mock;
@@ -71,11 +74,6 @@ describe('useSignAndExecuteTransaction', () => {
signature: '123',
});
- const reportEffectsFeature = mockWallet.features['sui:reportTransactionEffects'];
- const reportEffects = reportEffectsFeature!.reportTransactionEffects as Mock;
-
- reportEffects.mockImplementation(async () => {});
-
const executeTransaction = vi.spyOn(suiClient, 'executeTransactionBlock');
executeTransaction.mockResolvedValueOnce({
@@ -109,11 +107,6 @@ describe('useSignAndExecuteTransaction', () => {
signature: '123',
rawEffects: [10, 20, 30],
});
- expect(reportEffects).toHaveBeenCalledWith({
- effects: 'ChQe',
- chain: 'sui:testnet',
- account: mockWallet.accounts[0],
- });
const call = signTransaction.mock.calls[0];
@@ -139,11 +132,10 @@ describe('useSignAndExecuteTransaction', () => {
signature: '123',
});
- const reportEffectsFeature = mockWallet.features['sui:reportTransactionEffects'];
- const reportEffects = reportEffectsFeature!.reportTransactionEffects as Mock;
- reportEffects.mockImplementation(async () => {});
-
- const suiClient = new SuiClient({ url: getFullnodeUrl('localnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('localnet'),
+ network: 'localnet',
+ });
const executeTransaction = vi.spyOn(suiClient, 'executeTransactionBlock');
executeTransaction.mockResolvedValueOnce({
digest: '123',
@@ -167,11 +159,6 @@ describe('useSignAndExecuteTransaction', () => {
});
await waitFor(() => expect(result.current.useSignAndExecuteTransaction.isSuccess).toBe(true));
- expect(reportEffects).toHaveBeenCalledWith({
- effects: 'ChQe',
- chain: 'sui:test',
- account: mockWallet.accounts[0],
- });
expect(signTransaction).toHaveBeenCalledWith({
transaction: expect.any(Object),
@@ -188,7 +175,10 @@ describe('useSignAndExecuteTransaction', () => {
features: suiFeatures,
});
- const suiClient = new SuiClient({ url: getFullnodeUrl('localnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('localnet'),
+ network: 'localnet',
+ });
const mockSignMessageFeature = mockWallet.features['sui:signTransaction'];
const signTransaction = mockSignMessageFeature!.signTransaction as Mock;
@@ -197,11 +187,6 @@ describe('useSignAndExecuteTransaction', () => {
signature: '123',
});
- const reportEffectsFeature = mockWallet.features['sui:reportTransactionEffects'];
- const reportEffects = reportEffectsFeature!.reportTransactionEffects as Mock;
-
- reportEffects.mockImplementation(async () => {});
-
const wrapper = createWalletProviderContextWrapper({}, suiClient);
const fakeDigest = toBase58(
@@ -272,11 +257,6 @@ describe('useSignAndExecuteTransaction', () => {
custom: 123,
});
expect(result.current.useSignAndExecuteTransaction.data?.custom).toBe(123);
- expect(reportEffects).toHaveBeenCalledWith({
- account: mockWallet.accounts[0],
- chain: 'sui:testnet',
- effects: effectsBcs,
- });
const call = signTransaction.mock.calls[0];
diff --git a/packages/dapp-kit/test/hooks/useSignTransaction.test.tsx b/packages/dapp-kit/test/hooks/useSignTransaction.test.tsx
index 1b1562fc2..6968853de 100644
--- a/packages/dapp-kit/test/hooks/useSignTransaction.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSignTransaction.test.tsx
@@ -87,7 +87,6 @@ describe('useSignTransaction', () => {
expect(result.current.signTransaction.data).toStrictEqual({
bytes: 'abc',
signature: '123',
- reportTransactionEffects: expect.any(Function),
});
expect(signTransactionMock).toHaveBeenCalledWith({
diff --git a/packages/dapp-kit/test/hooks/useSuiClient.test.tsx b/packages/dapp-kit/test/hooks/useSuiClient.test.tsx
index 64c39d616..4a3a41779 100644
--- a/packages/dapp-kit/test/hooks/useSuiClient.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSuiClient.test.tsx
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { renderHook } from '@testing-library/react';
import { useSuiClient } from '../../src/index.js';
@@ -13,8 +13,11 @@ describe('useSuiClient', () => {
);
});
- test('returns a SuiClient', () => {
- const suiClient = new SuiClient({ url: getFullnodeUrl('localnet') });
+ test('returns a SuiJsonRpcClient', () => {
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('localnet'),
+ network: 'localnet',
+ });
const wrapper = createSuiClientContextWrapper(suiClient);
const { result } = renderHook(() => useSuiClient(), { wrapper });
diff --git a/packages/dapp-kit/test/hooks/useSuiClientInfiniteQuery.test.tsx b/packages/dapp-kit/test/hooks/useSuiClientInfiniteQuery.test.tsx
index 687d13424..edfa5fb04 100644
--- a/packages/dapp-kit/test/hooks/useSuiClientInfiniteQuery.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSuiClientInfiniteQuery.test.tsx
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { act, renderHook, waitFor } from '@testing-library/react';
import { useSuiClientInfiniteQuery } from '../../src/hooks/useSuiClientInfiniteQuery.js';
@@ -8,7 +8,10 @@ import { createWalletProviderContextWrapper } from '../test-utils.js';
describe('useSuiClientInfiniteQuery', () => {
it('should fetch data', async () => {
- const suiClient = new SuiClient({ url: getFullnodeUrl('mainnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('mainnet'),
+ network: 'mainnet',
+ });
const wrapper = createWalletProviderContextWrapper({}, suiClient);
const queryTransactionBlocks = vi.spyOn(suiClient, 'queryTransactionBlocks');
diff --git a/packages/dapp-kit/test/hooks/useSuiClientMutation.test.tsx b/packages/dapp-kit/test/hooks/useSuiClientMutation.test.tsx
index e9293af14..f419b330b 100644
--- a/packages/dapp-kit/test/hooks/useSuiClientMutation.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSuiClientMutation.test.tsx
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { act, renderHook, waitFor } from '@testing-library/react';
import { useSuiClientMutation } from '../../src/hooks/useSuiClientMutation.js';
@@ -8,7 +8,10 @@ import { createWalletProviderContextWrapper } from '../test-utils.js';
describe('useSuiClientMutation', () => {
it('should fetch data', async () => {
- const suiClient = new SuiClient({ url: getFullnodeUrl('mainnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('mainnet'),
+ network: 'mainnet',
+ });
const wrapper = createWalletProviderContextWrapper({}, suiClient);
const queryTransactionBlocks = vi.spyOn(suiClient, 'queryTransactionBlocks');
diff --git a/packages/dapp-kit/test/hooks/useSuiClientQueries.test.tsx b/packages/dapp-kit/test/hooks/useSuiClientQueries.test.tsx
index 2dbfacc31..c042bd976 100644
--- a/packages/dapp-kit/test/hooks/useSuiClientQueries.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSuiClientQueries.test.tsx
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { renderHook, waitFor } from '@testing-library/react';
import { useSuiClientQueries } from '../../src/hooks/useSuiClientQueries.js';
@@ -21,7 +21,10 @@ const MOCK_QUERY_TRANSACTION_BLOCK_RESULT_DATA = {
};
describe('useSuiClientQueries', () => {
- const suiClient = new SuiClient({ url: getFullnodeUrl('mainnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('mainnet'),
+ network: 'mainnet',
+ });
const wrapper = createWalletProviderContextWrapper({}, suiClient);
test('should fetch data', async () => {
const getAllBalances = vi.spyOn(suiClient, 'getAllBalances');
diff --git a/packages/dapp-kit/test/hooks/useSuiClientQuery.test.tsx b/packages/dapp-kit/test/hooks/useSuiClientQuery.test.tsx
index 457d41920..290056e28 100644
--- a/packages/dapp-kit/test/hooks/useSuiClientQuery.test.tsx
+++ b/packages/dapp-kit/test/hooks/useSuiClientQuery.test.tsx
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { renderHook, waitFor } from '@testing-library/react';
import { useSuiClientQuery } from '../../src/hooks/useSuiClientQuery.js';
@@ -8,7 +8,10 @@ import { createWalletProviderContextWrapper } from '../test-utils.js';
describe('useSuiClientQuery', () => {
it('should fetch data', async () => {
- const suiClient = new SuiClient({ url: getFullnodeUrl('mainnet') });
+ const suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('mainnet'),
+ network: 'mainnet',
+ });
const wrapper = createWalletProviderContextWrapper({}, suiClient);
const queryTransactionBlocks = vi.spyOn(suiClient, 'queryTransactionBlocks');
diff --git a/packages/dapp-kit/test/mocks/mockFeatures.ts b/packages/dapp-kit/test/mocks/mockFeatures.ts
index 27da03be9..e34689a62 100644
--- a/packages/dapp-kit/test/mocks/mockFeatures.ts
+++ b/packages/dapp-kit/test/mocks/mockFeatures.ts
@@ -39,8 +39,4 @@ export const suiFeatures: SuiFeatures = {
version: '2.0.0',
signAndExecuteTransaction: vi.fn(),
},
- 'sui:reportTransactionEffects': {
- version: '1.0.0',
- reportTransactionEffects: vi.fn(),
- },
};
diff --git a/packages/dapp-kit/test/test-utils.tsx b/packages/dapp-kit/test/test-utils.tsx
index 997b5cc26..3a8c2f4bb 100644
--- a/packages/dapp-kit/test/test-utils.tsx
+++ b/packages/dapp-kit/test/test-utils.tsx
@@ -1,7 +1,7 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import type { IdentifierRecord, ReadonlyWalletAccount } from '@mysten/wallet-standard';
import { getWallets } from '@mysten/wallet-standard';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -12,7 +12,7 @@ import { SuiClientProvider } from '../src/index.js';
import { createMockAccount } from './mocks/mockAccount.js';
import { MockWallet } from './mocks/mockWallet.js';
-export function createSuiClientContextWrapper(client: SuiClient) {
+export function createSuiClientContextWrapper(client: SuiJsonRpcClient) {
return function SuiClientContextWrapper({ children }: { children: React.ReactNode }) {
return {children};
};
@@ -20,7 +20,10 @@ export function createSuiClientContextWrapper(client: SuiClient) {
export function createWalletProviderContextWrapper(
providerProps: Omit, 'children'> = {},
- suiClient: SuiClient = new SuiClient({ url: getFullnodeUrl('localnet') }),
+ suiClient: SuiJsonRpcClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('localnet'),
+ network: 'localnet',
+ }),
) {
const queryClient = new QueryClient();
return function WalletProviderContextWrapper({ children }: { children: React.ReactNode }) {
diff --git a/packages/dapp-kit/vitest.config.mts b/packages/dapp-kit/vitest.config.mts
index 1fb810ed3..214c9a36d 100644
--- a/packages/dapp-kit/vitest.config.mts
+++ b/packages/dapp-kit/vitest.config.mts
@@ -23,7 +23,7 @@ export default defineConfig({
'@mysten/utils': new URL('../utils/src', import.meta.url).pathname,
'@mysten/sui/keypairs/ed25519': new URL('../typescript/src/keypairs/ed25519', import.meta.url)
.pathname,
- '@mysten/sui/client': new URL('../typescript/src/client', import.meta.url).pathname,
+ '@mysten/sui/jsonRpc': new URL('../typescript/src/jsonRpc', import.meta.url).pathname,
'@mysten/sui/utils': new URL('../typescript/src/utils', import.meta.url).pathname,
'@mysten/sui/transactions': new URL('../typescript/src/transactions', import.meta.url)
.pathname,
diff --git a/packages/deepbook-v3/examples/accountOpenOrders.ts b/packages/deepbook-v3/examples/accountOpenOrders.ts
index 9a3945318..752633316 100644
--- a/packages/deepbook-v3/examples/accountOpenOrders.ts
+++ b/packages/deepbook-v3/examples/accountOpenOrders.ts
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { DeepBookClient } from '../src/index.js'; // Adjust import source accordingly
@@ -18,8 +18,8 @@ import { DeepBookClient } from '../src/index.js'; // Adjust import source accord
const dbClient = new DeepBookClient({
address: '0x0',
env: env,
- client: new SuiClient({
- url: getFullnodeUrl(env),
+ client: new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl(env),
}),
balanceManagers: balanceManagers,
});
diff --git a/packages/deepbook-v3/examples/accountOrderMap.ts b/packages/deepbook-v3/examples/accountOrderMap.ts
index 23fce3b0b..0f68e0332 100644
--- a/packages/deepbook-v3/examples/accountOrderMap.ts
+++ b/packages/deepbook-v3/examples/accountOrderMap.ts
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { DeepBookClient } from '../src/index.js'; // Adjust import source accordingly
@@ -19,8 +19,8 @@ import { DeepBookClient } from '../src/index.js'; // Adjust import source accord
const dbClient = new DeepBookClient({
address: '0x0',
env: env,
- client: new SuiClient({
- url: getFullnodeUrl(env),
+ client: new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl(env),
}),
balanceManagers: balanceManagers,
});
diff --git a/packages/deepbook-v3/examples/balance.ts b/packages/deepbook-v3/examples/balance.ts
index e292316cc..4b9930fbe 100644
--- a/packages/deepbook-v3/examples/balance.ts
+++ b/packages/deepbook-v3/examples/balance.ts
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { DeepBookClient } from '../src/index.js'; // Adjust import source accordingly
@@ -18,8 +18,8 @@ import { DeepBookClient } from '../src/index.js'; // Adjust import source accord
const dbClient = new DeepBookClient({
address: '0x0',
env: env,
- client: new SuiClient({
- url: getFullnodeUrl(env),
+ client: new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl(env),
}),
balanceManagers: balanceManagers,
});
diff --git a/packages/deepbook-v3/examples/deepbookMarketMaker.ts b/packages/deepbook-v3/examples/deepbookMarketMaker.ts
index 5c463f792..99430b84c 100644
--- a/packages/deepbook-v3/examples/deepbookMarketMaker.ts
+++ b/packages/deepbook-v3/examples/deepbookMarketMaker.ts
@@ -1,6 +1,6 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { decodeSuiPrivateKey } from '@mysten/sui/cryptography';
import type { Keypair } from '@mysten/sui/cryptography';
import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
@@ -11,7 +11,7 @@ import type { BalanceManager } from '../src/types/index.js';
export class DeepBookMarketMaker extends DeepBookClient {
keypair: Keypair;
- suiClient: SuiClient;
+ suiClient: SuiJsonRpcClient;
constructor(
keypair: string | Keypair,
@@ -32,16 +32,16 @@ export class DeepBookMarketMaker extends DeepBookClient {
super({
address: address,
env: env,
- client: new SuiClient({
- url: getFullnodeUrl(env),
+ client: new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl(env),
}),
balanceManagers: balanceManagers,
adminCap: adminCap,
});
this.keypair = resolvedKeypair;
- this.suiClient = new SuiClient({
- url: getFullnodeUrl(env),
+ this.suiClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl(env),
});
}
diff --git a/packages/deepbook-v3/src/client.ts b/packages/deepbook-v3/src/client.ts
index 81216bf21..bca9b0f3f 100644
--- a/packages/deepbook-v3/src/client.ts
+++ b/packages/deepbook-v3/src/client.ts
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import { bcs } from '@mysten/sui/bcs';
import { Account, Order, OrderDeepPrice, VecSet } from './types/bcs.js';
-import type { SuiClient } from '@mysten/sui/client';
+import type { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { Transaction } from '@mysten/sui/transactions';
import { normalizeSuiAddress } from '@mysten/sui/utils';
@@ -32,7 +32,7 @@ import { PoolProxyContract } from './transactions/poolProxy.js';
* DeepBookClient class for managing DeepBook operations.
*/
export class DeepBookClient {
- client: SuiClient;
+ client: SuiJsonRpcClient;
#config: DeepBookConfig;
#address: string;
balanceManager: BalanceManagerContract;
@@ -48,7 +48,7 @@ export class DeepBookClient {
poolProxy: PoolProxyContract;
/**
- * @param {SuiClient} client SuiClient instance
+ * @param {SuiJsonRpcClient} client SuiJsonRpcClient instance
* @param {string} address Address of the client
* @param {Environment} env Environment configuration
* @param {Object.} [balanceManagers] Optional initial BalanceManager map
@@ -71,7 +71,7 @@ export class DeepBookClient {
marginAdminCap,
marginMaintainerCap,
}: {
- client: SuiClient;
+ client: SuiJsonRpcClient;
address: string;
env: Environment;
balanceManagers?: { [key: string]: BalanceManager };
diff --git a/packages/deepbook-v3/src/pyth/pyth.ts b/packages/deepbook-v3/src/pyth/pyth.ts
index 305ae520b..3dbf81414 100644
--- a/packages/deepbook-v3/src/pyth/pyth.ts
+++ b/packages/deepbook-v3/src/pyth/pyth.ts
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import { bcs } from '@mysten/sui/bcs';
-import type { SuiClient } from '@mysten/sui/client';
+import type { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import type { Transaction } from '@mysten/sui/transactions';
import { coinWithBalance } from '@mysten/sui/transactions';
import { fromBase64, fromHex, parseStructTag } from '@mysten/sui/utils';
@@ -31,11 +31,11 @@ export class SuiPythClient {
#priceFeedObjectIdCache: Map> = new Map();
#priceTableInfo?: Promise<{ id: ObjectId; fieldType: ObjectId }>;
#baseUpdateFee?: Promise;
- provider: SuiClient;
+ provider: SuiJsonRpcClient;
pythStateId: ObjectId;
wormholeStateId: ObjectId;
- constructor(provider: SuiClient, pythStateId: ObjectId, wormholeStateId: ObjectId) {
+ constructor(provider: SuiJsonRpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId) {
this.provider = provider;
this.pythStateId = pythStateId;
this.wormholeStateId = wormholeStateId;
diff --git a/packages/deepbook/.prettierignore b/packages/deepbook/.prettierignore
index b0894a4b7..09f1d001d 100644
--- a/packages/deepbook/.prettierignore
+++ b/packages/deepbook/.prettierignore
@@ -7,3 +7,4 @@ yarn-error.log*
.swc/
out/
CHANGELOG.md
+test/e2e/data
diff --git a/packages/deepbook/src/client.ts b/packages/deepbook/src/client.ts
index ab4993997..c66d04865 100644
--- a/packages/deepbook/src/client.ts
+++ b/packages/deepbook/src/client.ts
@@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
import { bcs } from '@mysten/sui/bcs';
-import type { OrderArguments, PaginatedEvents, PaginationArguments } from '@mysten/sui/client';
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import type { OrderArguments, PaginatedEvents, PaginationArguments } from '@mysten/sui/jsonRpc';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import type { Argument, TransactionObjectInput, TransactionResult } from '@mysten/sui/transactions';
import { Transaction } from '@mysten/sui/transactions';
import {
@@ -44,7 +44,10 @@ export class DeepBookClient {
* @param currentAddress (optional) address of the current user (default: DUMMY_ADDRESS)
*/
constructor(
- public suiClient: SuiClient = new SuiClient({ url: getFullnodeUrl('testnet') }),
+ public suiClient: SuiJsonRpcClient = new SuiJsonRpcClient({
+ url: getJsonRpcFullnodeUrl('testnet'),
+ network: 'testnet',
+ }),
public accountCap: string | undefined = undefined,
public currentAddress: string = DUMMY_ADDRESS,
private clientOrderId: number = 0,
diff --git a/packages/deepbook/src/types/index.ts b/packages/deepbook/src/types/index.ts
index d02e87336..8eea9af29 100644
--- a/packages/deepbook/src/types/index.ts
+++ b/packages/deepbook/src/types/index.ts
@@ -1,7 +1,7 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0
-import type { EventId } from '@mysten/sui/client';
+import type { EventId } from '@mysten/sui/jsonRpc';
export * from './bcs.js';
diff --git a/packages/deepbook/test/e2e/setup.ts b/packages/deepbook/test/e2e/setup.ts
index 5d31cb5fd..2d10d2365 100644
--- a/packages/deepbook/test/e2e/setup.ts
+++ b/packages/deepbook/test/e2e/setup.ts
@@ -7,8 +7,8 @@ import type {
SuiObjectChangeCreated,
SuiObjectChangePublished,
SuiTransactionBlockResponse,
-} from '@mysten/sui/client';
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+} from '@mysten/sui/jsonRpc';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
import { FaucetRateLimitError, getFaucetHost, requestSuiFromFaucetV2 } from '@mysten/sui/faucet';
import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
import { Transaction } from '@mysten/sui/transactions';
@@ -22,17 +22,17 @@ import type { PoolSummary } from '../../src/types/index.js';
import { FLOAT_SCALING_FACTOR, NORMALIZED_SUI_COIN_TYPE } from '../../src/utils/index.js';
const DEFAULT_FAUCET_URL = process.env.FAUCET_URL ?? getFaucetHost('localnet');
-const DEFAULT_FULLNODE_URL = process.env.FULLNODE_URL ?? getFullnodeUrl('localnet');
+const DEFAULT_FULLNODE_URL = process.env.FULLNODE_URL ?? getJsonRpcFullnodeUrl('localnet');
export const DEFAULT_TICK_SIZE = 1n * FLOAT_SCALING_FACTOR;
export const DEFAULT_LOT_SIZE = 1n;
export class TestToolbox {
keypair: Ed25519Keypair;
- client: SuiClient;
+ client: SuiJsonRpcClient;
configPath: string;
- constructor(keypair: Ed25519Keypair, client: SuiClient, configPath: string) {
+ constructor(keypair: Ed25519Keypair, client: SuiJsonRpcClient, configPath: string) {
this.keypair = keypair;
this.client = client;
this.configPath = configPath;
@@ -47,8 +47,8 @@ export class TestToolbox {
}
}
-export function getClient(): SuiClient {
- return new SuiClient({
+export function getClient(): SuiJsonRpcClient {
+ return new SuiJsonRpcClient({
url: DEFAULT_FULLNODE_URL,
});
}
diff --git a/packages/docs/content/dapp-kit/index.mdx b/packages/docs/content/dapp-kit/index.mdx
index 2054949f9..a094302d3 100644
--- a/packages/docs/content/dapp-kit/index.mdx
+++ b/packages/docs/content/dapp-kit/index.mdx
@@ -32,13 +32,13 @@ respective pages.
```tsx
import { createNetworkConfig, SuiClientProvider, WalletProvider } from '@mysten/dapp-kit';
-import { getFullnodeUrl } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl } from '@mysten/sui/jsonRpc';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
// Config options for the networks you want to connect to
const { networkConfig } = createNetworkConfig({
- localnet: { url: getFullnodeUrl('localnet') },
- mainnet: { url: getFullnodeUrl('mainnet') },
+ localnet: { url: getJsonRpcFullnodeUrl('localnet') },
+ mainnet: { url: getJsonRpcFullnodeUrl('mainnet') },
});
const queryClient = new QueryClient();
diff --git a/packages/docs/content/dapp-kit/sui-client-provider.mdx b/packages/docs/content/dapp-kit/sui-client-provider.mdx
index 1c1fb277b..96703cb14 100644
--- a/packages/docs/content/dapp-kit/sui-client-provider.mdx
+++ b/packages/docs/content/dapp-kit/sui-client-provider.mdx
@@ -2,25 +2,25 @@
title: SuiClientProvider
---
-The `SuiClientProvider` manages the active `SuiClient` that hooks and components use in the dApp
-Kit.
+The `SuiClientProvider` manages the active `SuiJsonRpcClient` that hooks and components use in the
+dApp Kit.
## Usage
Place the `SuiClientProvider` at the root of your app and wrap all components that use the dApp Kit
hooks.
-`SuiClientProvider` accepts a list of network configurations to create `SuiClient` instances for the
-currently active network.
+`SuiClientProvider` accepts a list of network configurations to create `SuiJsonRpcClient` instances
+for the currently active network.
```tsx
import { createNetworkConfig, SuiClientProvider, WalletProvider } from '@mysten/dapp-kit';
-import { getFullnodeUrl } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl } from '@mysten/sui/jsonRpc';
// Config options for the networks you want to connect to
const { networkConfig } = createNetworkConfig({
- localnet: { url: getFullnodeUrl('localnet') },
- mainnet: { url: getFullnodeUrl('mainnet') },
+ localnet: { url: getJsonRpcFullnodeUrl('localnet') },
+ mainnet: { url: getJsonRpcFullnodeUrl('mainnet') },
});
function App() {
@@ -35,15 +35,15 @@ function App() {
## Props
- `networks`: A map of networks you can use. The keys are the network names, and the values can be
- either a configuration object (`SuiClientOptions`) or a `SuiClient` instance.
+ either a configuration object (`SuiClientOptions`) or a `SuiJsonRpcClient` instance.
- `defaultNetwork`: The name of the network to use by default when using the `SuiClientProvider` as
an uncontrolled component.
- `network`: The name of the network to use when using the `SuiClientProvider` as a controlled
component.
- `onNetworkChange`: A callback when the active network changes.
-- `createClient`: A callback when a new `SuiClient` is created (for example, when the active network
- changes). It receives the network name and configuration object as arguments, returning a
- `SuiClient` instance.
+- `createClient`: A callback when a new `SuiJsonRpcClient` is created (for example, when the active
+ network changes). It receives the network name and configuration object as arguments, returning a
+ `SuiJsonRpcClient` instance.
## Controlled component
@@ -51,13 +51,13 @@ The following example demonstrates a `SuiClientProvider` used as a controlled co
```tsx
import { createNetworkConfig, SuiClientProvider } from '@mysten/dapp-kit';
-import { getFullnodeUrl } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl } from '@mysten/sui/jsonRpc';
import { useState } from 'react';
// Config options for the networks you want to connect to
const { networkConfig } = createNetworkConfig({
- localnet: { url: getFullnodeUrl('localnet') },
- mainnet: { url: getFullnodeUrl('mainnet') },
+ localnet: { url: getJsonRpcFullnodeUrl('localnet') },
+ mainnet: { url: getJsonRpcFullnodeUrl('mainnet') },
});
function App() {
@@ -77,18 +77,18 @@ function App() {
}
```
-## SuiClient customization
+## SuiJsonRpcClient customization
-The following example demonstrates how to create a custom `SuiClient`.
+The following example demonstrates how to create a custom `SuiJsonRpcClient`.
```tsx
import { SuiClientProvider } from '@mysten/dapp-kit';
-import { getFullnodeUrl, SuiClient, SuiHTTPTransport } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl, SuiJsonRpcClient, SuiHTTPTransport } from '@mysten/sui/jsonRpc';
// Config options for the networks you want to connect to
const networks = {
- localnet: { url: getFullnodeUrl('localnet') },
- mainnet: { url: getFullnodeUrl('mainnet') },
+ localnet: { url: getJsonRpcFullnodeUrl('localnet') },
+ mainnet: { url: getJsonRpcFullnodeUrl('mainnet') },
} satisfies Record;
function App() {
@@ -97,7 +97,7 @@ function App() {
networks={networks}
defaultNetwork="localnet"
createClient={(network, config) => {
- return new SuiClient({
+ return new SuiJsonRpcClient({
transport: new SuiHTTPTransport({
url: 'https://api.safecoin.org',
rpc: {
@@ -115,9 +115,9 @@ function App() {
}
```
-## Using the SuiClient from the provider
+## Using the SuiJsonRpcClient from the provider
-To use the `SuiClient` from the provider, import the `useSuiClient` function from the
+To use the `SuiJsonRpcClient` from the provider, import the `useSuiClient` function from the
`@mysten/dapp-kit` module.
```tsx
@@ -166,19 +166,19 @@ to get the variables defined in your configuration.
```tsx
import { createNetworkConfig, SuiClientProvider, WalletProvider } from '@mysten/dapp-kit';
-import { getFullnodeUrl } from '@mysten/sui/client';
+import { getJsonRpcFullnodeUrl } from '@mysten/sui/jsonRpc';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
// Config options for the networks you want to connect to
const { networkConfig, useNetworkVariable } = createNetworkConfig({
localnet: {
- url: getFullnodeUrl('localnet'),
+ url: getJsonRpcFullnodeUrl('localnet'),
variables: {
myMovePackageId: '0x123',
},
},
mainnet: {
- url: getFullnodeUrl('mainnet'),
+ url: getJsonRpcFullnodeUrl('mainnet'),
variables: {
myMovePackageId: '0x456',
},
diff --git a/packages/docs/content/dapp-kit/wallet-hooks/_meta.json b/packages/docs/content/dapp-kit/wallet-hooks/_meta.json
index 12f0853d8..b275c19d5 100644
--- a/packages/docs/content/dapp-kit/wallet-hooks/_meta.json
+++ b/packages/docs/content/dapp-kit/wallet-hooks/_meta.json
@@ -9,6 +9,5 @@
"useSwitchAccount": "useSwitchAccount",
"useSignPersonalMessage": "useSignPersonalMessage",
"useSignTransaction": "useSignTransaction",
- "useSignAndExecuteTransaction": "useSignAndExecuteTransaction",
- "useReportTransactionEffects": "useReportTransactionEffects"
+ "useSignAndExecuteTransaction": "useSignAndExecuteTransaction"
}
diff --git a/packages/docs/content/dapp-kit/wallet-hooks/useReportTransactionEffects.mdx b/packages/docs/content/dapp-kit/wallet-hooks/useReportTransactionEffects.mdx
deleted file mode 100644
index 6f31e5f8c..000000000
--- a/packages/docs/content/dapp-kit/wallet-hooks/useReportTransactionEffects.mdx
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: useReportTransactionEffects
----
-
-import { UseSignTransactionExample } from '../../../examples/wallet-hooks';
-
-Use the `useReportTransactionEffects` hook can be used to report the effects of a transaction to the
-connected wallet. The `useSignAndExecuteTransaction` hook automatically reports effects, and the
-`useSignTransaction` hook provides a `reportTransactionEffects` callback to report effects manually,
-so this hook is only needed when using a non-standard flow for executing transactions.
-
-```ts
-import {
- ConnectButton,
- useCurrentAccount,
- useReportTransactionEffects,
- useSuiClient,
-} from '@mysten/dapp-kit';
-import { toBase64 } from '@mysten/sui/utils';
-import { useState } from 'react';
-
-function MyComponent() {
- const { mutateAsync: reportTransactionEffects } = useReportTransactionEffects();
- const [signature, setSignature] = useState('');
- const client = useSuiClient();
- const currentAccount = useCurrentAccount();
-
- return (
-
-
- {currentAccount && (
- <>
-
-
-
-
Signature: {signature}
-
- )}
-
- );
-}
-```
-
-## Arguments
-
-- `effects`: The effects of an executed transaction. This can either be the `rawEffects` returned
- from the JSON-RPC `executeTransactionBlock` method (returned when showRawEffects is set to true),
- or the `effects.bcs` when executing with the GraphQL API.
-- `chain`: (optional) The chain identifier the transaction was executed on.
-- `account` (optional) the account that signed the transaction, defaults to the currently connected
- account
diff --git a/packages/docs/content/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx b/packages/docs/content/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
index 15c9a2bc9..9544e960f 100644
--- a/packages/docs/content/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
+++ b/packages/docs/content/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
@@ -129,5 +129,5 @@ function MyComponent() {
- `execute`: (optional) A custom function to execute the transaction
In addition to these options, you can also pass any options that the
-[SuiClient.signAndExecuteTransaction](/typedoc/classes/_mysten_sui.client.SuiClient.html#signAndExecuteTransactionBlock)
+[SuiJsonRpcClient.signAndExecuteTransaction](/typedoc/classes/_mysten_sui.client.SuiJsonRpcClient.html#signAndExecuteTransactionBlock)
method accepts.
diff --git a/packages/docs/content/dapp-kit/wallet-hooks/useSignTransaction.mdx b/packages/docs/content/dapp-kit/wallet-hooks/useSignTransaction.mdx
index 95e6cc133..b48dbc91a 100644
--- a/packages/docs/content/dapp-kit/wallet-hooks/useSignTransaction.mdx
+++ b/packages/docs/content/dapp-kit/wallet-hooks/useSignTransaction.mdx
@@ -31,7 +31,7 @@ function MyComponent() {