tempo.ts 0.2.1 → 0.4.0

package/src/viem/Chain.ts

@@ -23,42 +23,63 @@ export type Chain<
         feeToken: feeToken
       })
 
-export function define<chain extends viem_Chain>(chain: chain) {
-  function inner<const chain extends Chain>(chain: chain) {
-    return {
-      blockTime: 1_000,
-      contracts: {
-        multicall3: {
-          address: '0xca11bde05977b3631167028862be2a173976ca11',
-          blockCreated: 0,
-        },
+function config<const chain extends Chain>(chain: chain) {
+  return {
+    blockTime: 1_000,
+    contracts: {
+      multicall3: {
+        address: '0xca11bde05977b3631167028862be2a173976ca11',
+        blockCreated: 0,
       },
-      formatters: {
-        transaction: defineTransaction({
-          format: Formatters.formatTransaction,
-        }),
-        transactionRequest: defineTransactionRequest({
-          format: (
-            ...args: Parameters<
-              typeof Formatters.formatTransactionRequest<chain>
-            >
-          ) => Formatters.formatTransactionRequest<chain>(...args),
-        }),
-      },
-      serializers: {
-        // TODO: casting to satisfy viem – viem v3 to have more flexible serializer type.
-        transaction: Transaction.serialize as SerializeTransactionFn,
-      },
-      ...chain,
-    } as const
-  }
+    },
+    formatters: {
+      transaction: defineTransaction({
+        format: Formatters.formatTransaction,
+      }),
+      transactionRequest: defineTransactionRequest({
+        format: (
+          ...[request, action]: Parameters<
+            typeof Formatters.formatTransactionRequest<chain>
+          >
+        ) =>
+          Formatters.formatTransactionRequest<chain>(
+            {
+              ...request,
+              ...(!request.feePayer &&
+              (action === 'estimateGas' || action === 'sendTransaction')
+                ? {
+                    feeToken: request.feeToken ?? chain.feeToken,
+                  }
+                : {}),
+            },
+            action,
+          ),
+      }),
+    },
+    serializers: {
+      // TODO: casting to satisfy viem – viem v3 to have more flexible serializer type.
+      transaction: ((transaction, signature) =>
+        Transaction.serialize(
+          {
+            ...transaction,
+            ...(!(transaction as { feePayer?: unknown }).feePayer
+              ? { feeToken: chain.feeToken ?? undefined }
+              : {}),
+          } as never,
+          signature,
+        )) as SerializeTransactionFn,
+    },
+    ...chain,
+  } as const
+}
 
+export function define<const chain extends viem_Chain>(
+  chain: chain,
+): define.ReturnValue<chain> {
   return Object.assign(
-    <properties extends define.Properties | undefined>(
-      properties: properties = {} as properties,
-    ) => inner({ ...chain, ...properties }),
+    (properties = {}) => config({ ...chain, ...properties }),
     { id: chain.id },
-  )
+  ) as never
 }
 
 export declare namespace define {
@@ -74,4 +95,10 @@ export declare namespace define {
      */
     feeToken?: TokenId.TokenIdOrAddress | null | undefined
   }
+
+  type ReturnValue<chain extends viem_Chain> = (<
+    properties extends define.Properties | undefined,
+  >(
+    properties: properties,
+  ) => ReturnType<typeof config<chain & properties>>) & { id: chain['id'] }
 }

package/src/viem/Decorator.ts

@@ -652,7 +652,7 @@ export type Decorator<
      *   transport: http(),
      * }).extend(tempoActions())
      *
-     * const level = await client.dex.getPriceLevel({
+     * const level = await client.dex.getTickLevel({
      *   base: '0x20c...11',
      *   tick: Tick.fromPrice('1.001'),
      *   isBid: true,
@@ -662,9 +662,9 @@ export type Decorator<
      * @param parameters - Parameters.
      * @returns The price level information.
      */
-    getPriceLevel: (
-      parameters: dexActions.getPriceLevel.Parameters,
-    ) => Promise<dexActions.getPriceLevel.ReturnValue>
+    getTickLevel: (
+      parameters: dexActions.getTickLevel.Parameters,
+    ) => Promise<dexActions.getTickLevel.ReturnValue>
     /**
      * Gets the quote for selling a specific amount of tokens.
      *
@@ -2980,8 +2980,8 @@ export function decorator() {
         getBuyQuote: (parameters) => dexActions.getBuyQuote(client, parameters),
         getOrder: (parameters) => dexActions.getOrder(client, parameters),
         getOrders: (parameters) => dexActions.getOrders(client, parameters),
-        getPriceLevel: (parameters) =>
-          dexActions.getPriceLevel(client, parameters),
+        getTickLevel: (parameters) =>
+          dexActions.getTickLevel(client, parameters),
         getSellQuote: (parameters) =>
           dexActions.getSellQuote(client, parameters),
         place: (parameters) => dexActions.place(client, parameters),

package/src/viem/e2e.test.ts

@@ -130,11 +130,11 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-          "gas": 239290n,
+          "gas": 217317n,
           "gasPrice": 10000000000n,
-          "hash": "0x1b62b8248f353290df1c914ee4aaf37c5ece8d020e1ac171cf78906612d7bc5a",
+          "hash": "0x5644cb4aca7b42c7f4d28c324b9cbc4d0ba4ff3aeddbe41fa418a5966923ab36",
           "maxFeePerBlobGas": undefined,
           "maxFeePerGas": 12000000000n,
           "maxPriorityFeePerGas": 0n,
@@ -142,9 +142,9 @@ describe('sendTransaction', () => {
           "nonceKey": 0n,
           "signature": {
             "signature": {
-              "r": 78503646767442786974432974752095559477349685648765578842048507711761355176107n,
-              "s": 57178559224012078251730091306310112266493733814812722813686070134939395899608n,
-              "yParity": 0,
+              "r": 1770799250379385769866461071353582741695856909786638355195145760341199788761n,
+              "s": 52417275998342468381261131517961079083566057345688940928298921493890348732163n,
+              "yParity": 1,
             },
             "type": "secp256k1",
           },

package/src/wagmi/Actions/dex.test.ts

@@ -599,7 +599,7 @@ describe('getOrderbook', () => {
   })
 })
 
-describe('getPriceLevel', () => {
+describe('getTickLevel', () => {
   test('default', async () => {
     const { base } = await setupTokenPair()
 
@@ -614,7 +614,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get the price level
-    const level = await Actions.dex.getPriceLevel(config, {
+    const level = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
@@ -632,7 +632,7 @@ describe('getPriceLevel', () => {
     const tick = Tick.fromPrice('1.001')
 
     // Query a tick with no orders
-    const level = await Actions.dex.getPriceLevel(config, {
+    const level = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
@@ -666,7 +666,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get the price level
-    const level = await Actions.dex.getPriceLevel(config, {
+    const level = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
@@ -700,14 +700,14 @@ describe('getPriceLevel', () => {
     })
 
     // Get bid side
-    const bidLevel = await Actions.dex.getPriceLevel(config, {
+    const bidLevel = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
     })
 
     // Get ask side
-    const askLevel = await Actions.dex.getPriceLevel(config, {
+    const askLevel = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: false,
@@ -740,7 +740,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get level before cancellation
-    const levelBefore = await Actions.dex.getPriceLevel(config, {
+    const levelBefore = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
@@ -752,7 +752,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get level after cancellation
-    const levelAfter = await Actions.dex.getPriceLevel(config, {
+    const levelAfter = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: true,
@@ -776,7 +776,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get level before fill
-    const levelBefore = await Actions.dex.getPriceLevel(config, {
+    const levelBefore = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: false,
@@ -791,7 +791,7 @@ describe('getPriceLevel', () => {
     })
 
     // Get level after fill
-    const levelAfter = await Actions.dex.getPriceLevel(config, {
+    const levelAfter = await Actions.dex.getTickLevel(config, {
       base,
       tick,
       isBid: false,
@@ -813,7 +813,7 @@ describe('getPriceLevel', () => {
     })
 
     // Query min tick
-    const minLevel = await Actions.dex.getPriceLevel(config, {
+    const minLevel = await Actions.dex.getTickLevel(config, {
       base,
       tick: Tick.minTick,
       isBid: false,
@@ -829,7 +829,7 @@ describe('getPriceLevel', () => {
     })
 
     // Query max tick
-    const maxLevel = await Actions.dex.getPriceLevel(config, {
+    const maxLevel = await Actions.dex.getTickLevel(config, {
       base,
       tick: Tick.maxTick,
       isBid: true,

package/src/wagmi/Actions/dex.ts

@@ -831,7 +831,7 @@ export namespace getOrderbook {
  *   },
  * })
  *
- * const level = await Actions.dex.getPriceLevel(config, {
+ * const level = await Actions.dex.getTickLevel(config, {
  *   base: '0x20c...11',
  *   tick: Tick.fromPrice('1.001'),
  *   isBid: true,
@@ -842,25 +842,25 @@ export namespace getOrderbook {
  * @param parameters - Parameters.
  * @returns The price level information.
  */
-export function getPriceLevel<config extends Config>(
+export function getTickLevel<config extends Config>(
   config: config,
-  parameters: getPriceLevel.Parameters<config>,
-): Promise<getPriceLevel.ReturnValue> {
+  parameters: getTickLevel.Parameters<config>,
+): Promise<getTickLevel.ReturnValue> {
   const { chainId, ...rest } = parameters
   const client = config.getClient({ chainId })
-  return viem_Actions.getPriceLevel(client, rest)
+  return viem_Actions.getTickLevel(client, rest)
 }
 
-export namespace getPriceLevel {
+export namespace getTickLevel {
   export type Parameters<config extends Config> = ChainIdParameter<config> &
-    viem_Actions.getPriceLevel.Parameters
+    viem_Actions.getTickLevel.Parameters
 
-  export type ReturnValue = viem_Actions.getPriceLevel.ReturnValue
+  export type ReturnValue = viem_Actions.getTickLevel.ReturnValue
 
   export function queryKey<config extends Config>(
     parameters: Parameters<config>,
   ) {
-    return ['getPriceLevel', parameters] as const
+    return ['getTickLevel', parameters] as const
   }
 
   export type QueryKey<config extends Config> = ReturnType<
@@ -877,7 +877,7 @@ export namespace getPriceLevel {
       queryKey: queryKey(rest),
       async queryFn({ queryKey }) {
         const [, parameters] = queryKey
-        return await getPriceLevel(config, parameters)
+        return await getTickLevel(config, parameters)
       },
     }
   }
@@ -885,8 +885,8 @@ export namespace getPriceLevel {
   export declare namespace queryOptions {
     export type Parameters<
       config extends Config,
-      selectData = getPriceLevel.ReturnValue,
-    > = getPriceLevel.Parameters<config> & {
+      selectData = getTickLevel.ReturnValue,
+    > = getTickLevel.Parameters<config> & {
       query?:
         | Omit<ReturnValue<config, selectData>, 'queryKey' | 'queryFn'>
         | undefined
@@ -894,13 +894,13 @@ export namespace getPriceLevel {
 
     export type ReturnValue<
       config extends Config,
-      selectData = getPriceLevel.ReturnValue,
+      selectData = getTickLevel.ReturnValue,
     > = RequiredBy<
       Query.QueryOptions<
-        getPriceLevel.ReturnValue,
+        getTickLevel.ReturnValue,
         Query.DefaultError,
         selectData,
-        getPriceLevel.QueryKey<config>
+        getTickLevel.QueryKey<config>
       >,
       'queryKey' | 'queryFn'
     >

package/src/wagmi/Hooks/dex.ts

@@ -26,8 +26,8 @@ import {
   getOrder,
   getOrderbook,
   getOrders,
-  getPriceLevel,
   getSellQuote,
+  getTickLevel,
   place,
   placeFlip,
   placeFlipSync,
@@ -808,14 +808,14 @@ export declare namespace useOrderbook {
  */
 export function usePriceLevel<
   config extends Config = ResolvedRegister['config'],
-  selectData = getPriceLevel.ReturnValue,
+  selectData = getTickLevel.ReturnValue,
 >(parameters: usePriceLevel.Parameters<config, selectData>) {
   const { query = {} } = parameters
 
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
 
-  const options = getPriceLevel.queryOptions(config, {
+  const options = getTickLevel.queryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
     query: undefined,
@@ -833,17 +833,17 @@ export function usePriceLevel<
 export declare namespace usePriceLevel {
   export type Parameters<
     config extends Config = ResolvedRegister['config'],
-    selectData = getPriceLevel.ReturnValue,
+    selectData = getTickLevel.ReturnValue,
   > = ConfigParameter<config> &
     QueryParameter<
-      getPriceLevel.ReturnValue,
+      getTickLevel.ReturnValue,
       DefaultError,
       selectData,
-      getPriceLevel.QueryKey<config>
+      getTickLevel.QueryKey<config>
     > &
-    Omit<getPriceLevel.queryOptions.Parameters<config, selectData>, 'query'>
+    Omit<getTickLevel.queryOptions.Parameters<config, selectData>, 'query'>
 
-  export type ReturnValue<selectData = getPriceLevel.ReturnValue> =
+  export type ReturnValue<selectData = getTickLevel.ReturnValue> =
     UseQueryReturnType<selectData, Error>
 }