@typemove/sui 1.13.4-rc.2 → 1.13.4

package/src/codegen/codegen.ts

@@ -1,4 +1,4 @@
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui/client'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
 
 import * as fs from 'fs'
 import chalk from 'chalk'
@@ -13,7 +13,7 @@ import {
 } from '@typemove/move'
 import { AbstractCodegen } from '@typemove/move/codegen'
 import { join } from 'path'
-import { SuiChainAdapter } from '../sui-chain-adapter.js'
+import { SuiChainAdapter, inferNetworkFromUrl } from '../sui-chain-adapter.js'
 
 export async function codegen(
   abisDir: string,
@@ -58,7 +58,7 @@ export class SuiCodegen extends AbstractCodegen<
   PAYLOAD_OPTIONAL = true
 
   constructor(endpoint: string) {
-    super(new SuiChainAdapter(new SuiClient({ url: endpoint })))
+    super(new SuiChainAdapter(new SuiJsonRpcClient({ url: endpoint, network: inferNetworkFromUrl(endpoint) })))
   }
 
   readModulesFile(fullPath: string) {
@@ -208,7 +208,7 @@ export class SuiCodegen extends AbstractCodegen<
     const returnType = `${this.generateFunctionReturnTypeParameters(func, module.address)}`
 
     return `export async function ${camel(normalizeToJSName(func.name))}${genericString}(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [${args.map((a) => a.paramType).join(',')}],
       ${
         typeParamArg.length > 0 ? `typeArguments: [${typeParamArg}]` : ``
@@ -269,7 +269,7 @@ export class SuiCodegen extends AbstractCodegen<
       ${super.generateImports()}
       import { ZERO_ADDRESS, TypedDevInspectResults, getMoveCoder } from '@typemove/sui'
       import { Transaction, TransactionArgument, TransactionObjectArgument } from '@mysten/sui/transactions'
-      import { SuiClient } from '@mysten/sui/client'
+      import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
       import {  transactionArgumentOrObject, 
                 transactionArgumentOrVec,
                 transactionArgumentOrPure,

package/src/codegen/run.ts

@@ -5,7 +5,8 @@ import { Command } from 'commander'
 import { createRequire } from 'module'
 import fs from 'fs'
 import path from 'path'
-import { SuiClient } from '@mysten/sui/client'
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
+import { inferNetworkFromUrl } from '../sui-chain-adapter.js'
 const require = createRequire(import.meta.url)
 let pkg = undefined
 try {
@@ -37,7 +38,7 @@ program
       endpoint = 'https://fullnode.testnet.sui.io/'
     }
 
-    const suiClient = new SuiClient({ url: endpoint })
+    const suiClient = new SuiJsonRpcClient({ url: endpoint, network: inferNetworkFromUrl(endpoint) })
 
     let abisDir = location
     if (location.startsWith('0x')) {

package/src/models.ts

@@ -1,4 +1,4 @@
-import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject, DevInspectResults } from '@mysten/sui/client'
+import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject, DevInspectResults } from '@mysten/sui/jsonRpc'
 import { DecodedStruct } from '@typemove/move'
 
 export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000000000000000000000000000'

package/src/move-coder.ts

@@ -16,10 +16,10 @@ import {
   SuiMoveNormalizedModule,
   SuiMoveObject,
   DevInspectResults,
-  SuiClient
-} from '@mysten/sui/client'
+  SuiJsonRpcClient
+} from '@mysten/sui/jsonRpc'
+import { SuiChainAdapter, inferNetworkFromUrl } from './sui-chain-adapter.js'
 import { toInternalModule } from './to-internal.js'
-import { SuiChainAdapter } from './sui-chain-adapter.js'
 import { dynamic_field } from './builtin/0x2.js'
 import { BcsType, bcs } from '@mysten/sui/bcs'
 
@@ -33,7 +33,7 @@ export class MoveCoder extends AbstractMoveCoder<
   SuiMoveNormalizedModule,
   SuiEvent | SuiMoveObject
 > {
-  constructor(client: SuiClient) {
+  constructor(client: SuiJsonRpcClient) {
     super(new SuiChainAdapter(client))
   }
 
@@ -283,17 +283,17 @@ const CHAIN_ID_CODER_MAP = new Map<string, MoveCoder>()
 export function defaultMoveCoder(endpoint: string = DEFAULT_ENDPOINT): MoveCoder {
   let coder = CODER_MAP.get(endpoint)
   if (!coder) {
-    coder = new MoveCoder(new SuiClient({ url: endpoint }))
+    coder = new MoveCoder(new SuiJsonRpcClient({ url: endpoint, network: inferNetworkFromUrl(endpoint) }))
     CODER_MAP.set(endpoint, coder)
   }
   return coder
 }
 
-const PROVIDER_CODER_MAP = new Map<SuiClient, MoveCoder>()
+const PROVIDER_CODER_MAP = new Map<SuiJsonRpcClient, MoveCoder>()
 
 let DEFAULT_CHAIN_ID: string | undefined
 
-export async function getMoveCoder(client: SuiClient): Promise<MoveCoder> {
+export async function getMoveCoder(client: SuiJsonRpcClient): Promise<MoveCoder> {
   let coder = PROVIDER_CODER_MAP.get(client)
   if (!coder) {
     coder = new MoveCoder(client)

package/src/sui-chain-adapter.ts

@@ -8,7 +8,7 @@ import {
   TypeDescriptor
 } from '@typemove/move'
 
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui/client'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
 
 export class SuiChainAdapter extends ChainAdapter<
   // SuiNetwork,
@@ -20,8 +20,8 @@ export class SuiChainAdapter extends ChainAdapter<
   }
   // static INSTANCE = new SuiChainAdapter()
 
-  client: SuiClient
-  constructor(client: SuiClient) {
+  client: SuiJsonRpcClient
+  constructor(client: SuiJsonRpcClient) {
     super()
     this.client = client
   }
@@ -108,6 +108,14 @@ export class SuiChainAdapter extends ChainAdapter<
   // }
 }
 
-function getRpcClient(endpoint: string): SuiClient {
-  return new SuiClient({ url: endpoint })
+export function inferNetworkFromUrl(url: string): string {
+  if (url.includes('mainnet')) return 'mainnet'
+  if (url.includes('testnet')) return 'testnet'
+  if (url.includes('devnet')) return 'devnet'
+  if (url.includes('localnet') || url.includes('127.0.0.1') || url.includes('localhost')) return 'localnet'
+  return 'custom'
+}
+
+function getRpcClient(endpoint: string): SuiJsonRpcClient {
+  return new SuiJsonRpcClient({ url: endpoint, network: inferNetworkFromUrl(endpoint) })
 }

package/src/tests/types/testnet/0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5.ts

@@ -19,7 +19,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions";
-import { SuiClient } from "@mysten/sui/client";
+import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
 import {
   transactionArgumentOrObject,
   transactionArgumentOrVec,
@@ -204,7 +204,7 @@ export namespace oracle {
   }
   export namespace view {
     export async function copyKey<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -220,7 +220,7 @@ export namespace oracle {
       );
     }
     export async function getOracle<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[bigint, bigint, bigint, bigint]>> {
@@ -236,7 +236,7 @@ export namespace oracle {
       >(inspectRes);
     }
     export async function newOracle<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -252,7 +252,7 @@ export namespace oracle {
       );
     }
     export async function update<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {

package/src/tests/types/testnet/0x6c4a21e3e7e6b6d51c4604021633e1d97e24e37a696f8c082cd48f37503e602a.ts

@@ -19,7 +19,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions";
-import { SuiClient } from "@mysten/sui/client";
+import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
 import {
   transactionArgumentOrObject,
   transactionArgumentOrVec,
@@ -142,7 +142,7 @@ export namespace comparator {
   }
   export namespace view {
     export async function compare<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[comparator.Result]>> {
@@ -158,7 +158,7 @@ export namespace comparator {
       >(inspectRes);
     }
     export async function compareU8Vector(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string[], string[]],
     ): Promise<TypedDevInspectResults<[comparator.Result]>> {
       const tx = new Transaction();
@@ -173,7 +173,7 @@ export namespace comparator {
       >(inspectRes);
     }
     export async function isEqual(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
     ): Promise<TypedDevInspectResults<[boolean]>> {
       const tx = new Transaction();
@@ -188,7 +188,7 @@ export namespace comparator {
       );
     }
     export async function isGreaterThan(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
     ): Promise<TypedDevInspectResults<[boolean]>> {
       const tx = new Transaction();
@@ -203,7 +203,7 @@ export namespace comparator {
       );
     }
     export async function isSmallerThan(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
     ): Promise<TypedDevInspectResults<[boolean]>> {
       const tx = new Transaction();
@@ -313,7 +313,7 @@ export namespace math_utils {
   }
   export namespace view {
     export async function max(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -328,7 +328,7 @@ export namespace math_utils {
       );
     }
     export async function maxU64(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -343,7 +343,7 @@ export namespace math_utils {
       );
     }
     export async function min(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -358,7 +358,7 @@ export namespace math_utils {
       );
     }
     export async function pow(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, number],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -373,7 +373,7 @@ export namespace math_utils {
       );
     }
     export async function sqrt(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -388,7 +388,7 @@ export namespace math_utils {
       );
     }
     export async function sqrtU256(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -1304,7 +1304,7 @@ export namespace pool {
   }
   export namespace view {
     export async function addLiquidity<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, string, bigint, bigint, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<pool.WISPLP<T0, T1>>]>> {
@@ -1320,7 +1320,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function borrowMutPool<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[string]>> {
@@ -1336,7 +1336,7 @@ export namespace pool {
       );
     }
     export async function borrowPool<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[string]>> {
@@ -1352,7 +1352,7 @@ export namespace pool {
       );
     }
     export async function createPool<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, string, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<pool.WISPLP<T0, T1>>]>> {
@@ -1368,7 +1368,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function createPoolName(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [_0x1.type_name.TypeName, _0x1.type_name.TypeName],
     ): Promise<TypedDevInspectResults<[pool.PoolName]>> {
       const tx = new Transaction();
@@ -1383,7 +1383,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function getAmounts<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[bigint, bigint, bigint]>> {
@@ -1399,7 +1399,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function getInputAmount<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, bigint, boolean],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[bigint]>> {
@@ -1415,7 +1415,7 @@ export namespace pool {
       );
     }
     export async function getOutputAmount<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, bigint, boolean],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[bigint]>> {
@@ -1431,7 +1431,7 @@ export namespace pool {
       );
     }
     export async function getPoolData<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<
@@ -1449,7 +1449,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function isPoolCreated<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[boolean]>> {
@@ -1465,7 +1465,7 @@ export namespace pool {
       );
     }
     export async function isPoolCreatedSorted<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[boolean]>> {
@@ -1481,7 +1481,7 @@ export namespace pool {
       );
     }
     export async function processSwapExactInput<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, string, bigint, boolean],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -1497,7 +1497,7 @@ export namespace pool {
       );
     }
     export async function processSwapExactOutput<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, string, bigint, boolean],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -1513,7 +1513,7 @@ export namespace pool {
       );
     }
     export async function removeLiquidity<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<
@@ -1531,7 +1531,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function setFeeTo_(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, string],
     ): Promise<TypedDevInspectResults<[]>> {
       const tx = new Transaction();
@@ -1546,7 +1546,7 @@ export namespace pool {
       );
     }
     export async function swapExactFirstToSecond<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<T1>]>> {
@@ -1562,7 +1562,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function swapExactSecondToFirst<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<T0>]>> {
@@ -1578,7 +1578,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function swapFirstToExactSecond<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<T1>]>> {
@@ -1594,7 +1594,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function swapSecondToExactFirst<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[_0x2.coin.Coin<T0>]>> {
@@ -1610,7 +1610,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function zapInFirst<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<
@@ -1630,7 +1630,7 @@ export namespace pool {
       >(inspectRes);
     }
     export async function zapInSecond<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<
@@ -1838,7 +1838,7 @@ export namespace pool_utils {
   }
   export namespace view {
     export async function executeReturnToken<T0 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [_0x2.coin.Coin<T0>],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -1854,7 +1854,7 @@ export namespace pool_utils {
       );
     }
     export async function getInputPrice(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint, bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -1869,7 +1869,7 @@ export namespace pool_utils {
       );
     }
     export async function getOptimalZapInAmount(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -1884,7 +1884,7 @@ export namespace pool_utils {
       );
     }
     export async function getOutputPrice(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint, bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -1899,7 +1899,7 @@ export namespace pool_utils {
       );
     }
     export async function getTripleType<T0 = any, T1 = any, T2 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [],
       typeArguments: [
         TypeDescriptor<T0> | string,
@@ -1931,7 +1931,7 @@ export namespace pool_utils {
       >(inspectRes);
     }
     export async function getType<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<
@@ -1949,7 +1949,7 @@ export namespace pool_utils {
       >(inspectRes);
     }
     export async function quote(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [bigint, bigint, bigint],
     ): Promise<TypedDevInspectResults<[bigint]>> {
       const tx = new Transaction();
@@ -1964,7 +1964,7 @@ export namespace pool_utils {
       );
     }
     export async function sortTokenType(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string],
     ): Promise<TypedDevInspectResults<[comparator.Result]>> {
       const tx = new Transaction();
@@ -2304,7 +2304,7 @@ export namespace router {
   }
   export namespace view {
     export async function addLiquidity_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], string[], bigint, bigint, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -2320,7 +2320,7 @@ export namespace router {
       );
     }
     export async function createPool_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], string[], bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -2336,7 +2336,7 @@ export namespace router {
       );
     }
     export async function removeLiquidity_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint, bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -2352,7 +2352,7 @@ export namespace router {
       );
     }
     export async function swapExactInput_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -2372,7 +2372,7 @@ export namespace router {
       T1 = any,
       T2 = any,
     >(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint, bigint],
       typeArguments: [
         TypeDescriptor<T0> | string,
@@ -2392,7 +2392,7 @@ export namespace router {
       );
     }
     export async function swapExactOutput_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint, bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {
@@ -2412,7 +2412,7 @@ export namespace router {
       T1 = any,
       T2 = any,
     >(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint, bigint],
       typeArguments: [
         TypeDescriptor<T0> | string,
@@ -2432,7 +2432,7 @@ export namespace router {
       );
     }
     export async function zapIn_<T0 = any, T1 = any>(
-      client: SuiClient,
+      client: SuiJsonRpcClient,
       args: [string, string[], bigint],
       typeArguments: [TypeDescriptor<T0> | string, TypeDescriptor<T1> | string],
     ): Promise<TypedDevInspectResults<[]>> {