Merge pull request #116 from clober-dex/feat/improve-perf

feat: improve perf

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@clober/v2-sdk",
- "version": "0.0.72",
+ "version": "0.0.73",
  "description": "🛠 An SDK for building applications on top of Clober V2",
  "files": [
  "dist"

src/apis/strategy.ts

@@ -4,7 +4,8 @@ import { CHAIN_IDS } from '../constants/chain'
 import { CONTRACT_ADDRESSES } from '../constants/addresses'
 import { StrategyPrice } from '../model/strategy'
 import { STRATEGY_ABI } from '../abis/rebalancer/strategy-abi'
-import { formatPrice } from '../utils/prices'
+import { Market } from '../type'
+import { toPoolKey } from '../utils/pool-key'
 
 import { fetchPool } from './pool'
 
@@ -14,27 +15,34 @@ export async function fetchStrategyPrice(
  tokenAddresses: `0x${string}`[],
  salt: `0x${string}`,
  useSubgraph: boolean,
+ market?: Market,
 ): Promise<StrategyPrice> {
- const pool = await fetchPool(
- publicClient,
- chainId,
- tokenAddresses,
- salt,
- useSubgraph,
- )
+ let poolKey: `0x${string}` | undefined = undefined
+ if (market) {
+ poolKey = toPoolKey(
+ BigInt(market.bidBook.id),
+ BigInt(market.askBook.id),
+ salt,
+ )
+ } else {
+ const pool = await fetchPool(
+ publicClient,
+ chainId,
+ tokenAddresses,
+ salt,
+ useSubgraph,
+ )
+ poolKey = pool.key
+ }
  const getPriceResult = await publicClient.readContract({
  address: CONTRACT_ADDRESSES[chainId]!.Strategy,
  abi: STRATEGY_ABI,
  functionName: 'getPrice',
- args: [pool.key],
+ args: [poolKey],
  })
  return {
- oraclePrice: formatPrice(
- BigInt(getPriceResult.oraclePrice),
- pool.currencyA.decimals,
- pool.currencyB.decimals,
- ),
- tickA: BigInt(getPriceResult.tickA),
- tickB: BigInt(getPriceResult.tickB),
+ oraclePrice: BigInt(getPriceResult.oraclePrice),
+ bidTick: BigInt(getPriceResult.tickA),
+ askTick: BigInt(getPriceResult.tickB),
  }
 }

src/call.ts

@@ -15,6 +15,7 @@ import type {
  CurrencyFlow,
  DefaultWriteContractOptions,
  ERC20PermitParam,
+ Pool,
  Transaction,
 } from './type'
 import { calculateUnitSize } from './utils/unit-size'
@@ -1486,19 +1487,24 @@ export const refillOrder = async ({
  salt: `0x${string}`
  options?: DefaultWriteContractOptions & {
  useSubgraph?: boolean
+ pool?: Pool
  }
 }): Promise<Transaction> => {
  const publicClient = createPublicClient({
  chain: CHAIN_MAP[chainId],
  transport: options?.rpcUrl ? http(options.rpcUrl) : http(),
  })
- const pool = await fetchPool(
- publicClient,
- chainId,
- [token0, token1],
- salt,
- !!(options && options.useSubgraph),
- )
+ const pool = options?.pool
+ ? options.pool
+ : (
+ await fetchPool(
+ publicClient,
+ chainId,
+ [token0, token1],
+ salt,
+ !!(options && options.useSubgraph),
+ )
+ ).toJson()
  if (!pool.isOpened) {
  throw new Error(`
  Open the pool before rebalancing pool.
@@ -1524,6 +1530,7 @@ export const refillOrder = async ({
  args: [pool.key],
  },
  options?.gasLimit,
+ options?.gasPriceLimit,
  )
 }
 
@@ -1549,11 +1556,12 @@ export const adjustOrderPrice = async ({
  askPrice: string // price with bookA. ask price
  alpha: string // alpha value, 0 < alpha <= 1
  options?: {
- tickA?: bigint
- tickB?: bigint
+ bidTick?: bigint
+ askTick?: bigint
  roundingUpBidPrice?: boolean
  roundingUpAskPrice?: boolean
  useSubgraph?: boolean
+ pool?: Pool
  } & DefaultWriteContractOptions
 }): Promise<Transaction> => {
  if (Number(alpha) <= 0 || Number(alpha) > 1) {
@@ -1569,13 +1577,17 @@ export const adjustOrderPrice = async ({
  chain: CHAIN_MAP[chainId],
  transport: options?.rpcUrl ? http(options.rpcUrl) : http(),
  })
- const pool = await fetchPool(
- publicClient,
- chainId,
- [token0, token1],
- salt,
- !!(options && options.useSubgraph),
- )
+ const pool = options?.pool
+ ? options.pool
+ : (
+ await fetchPool(
+ publicClient,
+ chainId,
+ [token0, token1],
+ salt,
+ !!(options && options.useSubgraph),
+ )
+ ).toJson()
  if (!pool.isOpened) {
  throw new Error(`
  Open the pool before updating strategy price.
@@ -1615,11 +1627,11 @@ export const adjustOrderPrice = async ({
  pool.currencyA.decimals,
  pool.currencyB.decimals,
  )
- const tickA = options?.tickA
- ? Number(options.tickA)
+ const tickA = options?.bidTick
+ ? Number(options.bidTick)
  : Number(roundingUpBidPrice ? roundingUpTickA : roundingDownTickA)
- const tickB = options?.tickB
- ? Number(options.tickB)
+ const tickB = options?.askTick
+ ? Number(options.askTick)
  : Number(
  invertTick(roundingUpAskPrice ? roundingUpTickB : roundingDownTickB),
  )
@@ -1637,6 +1649,7 @@ export const adjustOrderPrice = async ({
  args: [pool.key, oracleRawPrice, tickA, tickB, alphaRaw],
  },
  options?.gasLimit,
+ options?.gasPriceLimit,
  )
 }
 

src/model/strategy.ts

@@ -1,5 +1,5 @@
 export type StrategyPrice = {
- oraclePrice: string
- tickA: bigint
- tickB: bigint
+ oraclePrice: bigint
+ bidTick: bigint
+ askTick: bigint
 }

src/type.ts

@@ -88,6 +88,7 @@ export type DefaultReadContractOptions = DefaultOptions
 
 export type DefaultWriteContractOptions = DefaultOptions & {
  gasLimit?: bigint
+ gasPriceLimit?: bigint
 }
 
 export type CurrencyFlow = {

src/utils/build-transaction.ts

@@ -11,6 +11,7 @@ export const buildTransaction = async (
  publicClient: PublicClient,
  args: WriteContractParameters | SimulateContractParameters,
  gasLimit?: bigint,
+ gasPriceLimit?: bigint,
 ): Promise<Transaction> => {
  const data = encodeFunctionData(args)
  const [gas, gasPrice] = await Promise.all([
@@ -21,7 +22,7 @@ export const buildTransaction = async (
  to: args.address,
  value: args.value || 0n,
  }),
- publicClient.getGasPrice(),
+ gasPriceLimit ?? publicClient.getGasPrice(),
  ])
  return {
  gas,

src/view.ts

@@ -198,6 +198,7 @@ export const getStrategyPrice = async ({
  token1: `0x${string}`
  salt: `0x${string}`
  options?: DefaultReadContractOptions & {
+ market?: Market
  useSubgraph?: boolean
  }
 }): Promise<StrategyPrice> => {
@@ -214,6 +215,7 @@ export const getStrategyPrice = async ({
  [token0, token1],
  salt,
  !!(options && options.useSubgraph),
+ options?.market,
  )
 }