viem 0.0.0-main.20230620T232415 → 0.0.0-main.20230621T005231

package/package.json

@@ -15,7 +15,7 @@
   "peerDependencies": {
     "typescript": ">=5.0.4"
   },
-  "version": "0.0.0-main.20230620T232415",
+  "version": "0.0.0-main.20230621T005231",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",
@@ -52,9 +52,9 @@
       "default": "./dist/cjs/accounts/index.js"
     },
     "./chains": {
-      "types": "./dist/types/chains.d.ts",
-      "import": "./dist/esm/chains.js",
-      "default": "./dist/cjs/chains.js"
+      "types": "./dist/types/chains/index.d.ts",
+      "import": "./dist/esm/chains/index.js",
+      "default": "./dist/cjs/chains/index.js"
     },
     "./contract": {
       "types": "./dist/types/contract.d.ts",
@@ -106,7 +106,7 @@
         "./dist/types/accounts/index.d.ts"
       ],
       "chains": [
-        "./dist/types/chains.d.ts"
+        "./dist/types/chains/index.d.ts"
       ],
       "contract": [
         "./dist/types/contract.d.ts"

package/src/actions/public/call.ts

@@ -14,35 +14,29 @@ import {
 import { RawContractError } from '../../errors/contract.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
-import type { Formatter } from '../../types/formatter.js'
 import type { Hex } from '../../types/misc.js'
 import type { RpcTransactionRequest } from '../../types/rpc.js'
 import type { TransactionRequest } from '../../types/transaction.js'
-import type { MergeIntersectionProperties } from '../../types/utils.js'
 import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js'
 import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import { getChainContractAddress } from '../../utils/chain.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 import { getCallError } from '../../utils/errors/getCallError.js'
 import { extract } from '../../utils/formatters/extract.js'
-import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  type TransactionRequestFormatter,
+  type FormattedTransactionRequest,
   formatTransactionRequest,
 } from '../../utils/formatters/transactionRequest.js'
 import { createBatchScheduler } from '../../utils/promise/createBatchScheduler.js'
 import { assertRequest } from '../../utils/transaction/assertRequest.js'
 
 export type FormattedCall<
-  TFormatter extends Formatter | undefined = Formatter,
-> = MergeIntersectionProperties<
-  Omit<Formatted<TFormatter, TransactionRequest, true>, 'from'>,
-  TransactionRequest
->
+  TChain extends Chain | undefined = Chain | undefined,
+> = FormattedTransactionRequest<TChain>
 
 export type CallParameters<
   TChain extends Chain | undefined = Chain | undefined,
-> = FormattedCall<TransactionRequestFormatter<TChain>> & {
+> = Omit<FormattedCall<TChain>, 'from'> & {
   account?: Account | Address
   batch?: boolean
 } & (
@@ -116,26 +110,22 @@ export async function call<TChain extends Chain | undefined>(
     const blockNumberHex = blockNumber ? numberToHex(blockNumber) : undefined
     const block = blockNumberHex || blockTag
 
-    const formatter = client.chain?.formatters?.transactionRequest
-    const request = format(
-      {
-        from: account?.address,
-        accessList,
-        data,
-        gas,
-        gasPrice,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce,
-        to,
-        value,
-        // Pick out extra data that might exist on the chain's transaction request type.
-        ...extract(rest, { formatter }),
-      } as TransactionRequest,
-      {
-        formatter: formatter || formatTransactionRequest,
-      },
-    ) as TransactionRequest
+    const format =
+      client.chain?.formatters?.transactionRequest || formatTransactionRequest
+    const request = format({
+      // Pick out extra data that might exist on the chain's transaction request type.
+      ...extract(rest, { formatter: format }),
+      from: account?.address,
+      accessList,
+      data,
+      gas,
+      gasPrice,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      nonce,
+      to,
+      value,
+    } as TransactionRequest) as TransactionRequest
 
     if (batch && shouldPerformMulticall({ request })) {
       try {

package/src/actions/public/estimateContractGas.ts

@@ -23,7 +23,13 @@ export type EstimateContractGasParameters<
   TAccount extends Account | undefined = undefined,
 > = ContractFunctionConfig<TAbi, TFunctionName, 'payable' | 'nonpayable'> &
   Omit<EstimateGasParameters<TChain, TAccount>, 'data' | 'to' | 'value'> &
-  GetValue<TAbi, TFunctionName, EstimateGasParameters<TChain>['value']>
+  GetValue<
+    TAbi,
+    TFunctionName,
+    EstimateGasParameters<TChain> extends EstimateGasParameters
+      ? EstimateGasParameters<TChain>['value']
+      : undefined
+  >
 
 export type EstimateContractGasReturnType = bigint
 

package/src/actions/public/estimateGas.ts

@@ -8,31 +8,25 @@ import type { BaseError } from '../../errors/base.js'
 import type { GetAccountParameter } from '../../types/account.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
-import type { Formatter } from '../../types/formatter.js'
 import type { TransactionRequest } from '../../types/transaction.js'
-import type { MergeIntersectionProperties } from '../../types/utils.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 import { getEstimateGasError } from '../../utils/errors/getEstimateGasError.js'
 import { extract } from '../../utils/formatters/extract.js'
-import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  type TransactionRequestFormatter,
+  type FormattedTransactionRequest,
   formatTransactionRequest,
 } from '../../utils/formatters/transactionRequest.js'
 import { assertRequest } from '../../utils/transaction/assertRequest.js'
 import { prepareRequest } from '../../utils/transaction/prepareRequest.js'
 
 export type FormattedEstimateGas<
-  TFormatter extends Formatter | undefined = Formatter,
-> = MergeIntersectionProperties<
-  Omit<Formatted<TFormatter, TransactionRequest, true>, 'from'>,
-  TransactionRequest
->
+  TChain extends Chain | undefined = Chain | undefined,
+> = FormattedTransactionRequest<TChain>
 
 export type EstimateGasParameters<
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = undefined,
-> = FormattedEstimateGas<TransactionRequestFormatter<TChain>> &
+> = Omit<FormattedEstimateGas<TChain>, 'from'> &
   GetAccountParameter<TAccount> &
   (
     | {
@@ -114,26 +108,22 @@ export async function estimateGas<
 
     assertRequest(args)
 
-    const formatter = client.chain?.formatters?.transactionRequest
-    const request = format(
-      {
-        from: account.address,
-        accessList,
-        data,
-        gas,
-        gasPrice,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce,
-        to,
-        value,
-        // Pick out extra data that might exist on the chain's transaction request type.
-        ...extract(rest, { formatter }),
-      } as TransactionRequest,
-      {
-        formatter: formatter || formatTransactionRequest,
-      },
-    )
+    const format =
+      client.chain?.formatters?.transactionRequest || formatTransactionRequest
+    const request = format({
+      // Pick out extra data that might exist on the chain's transaction request type.
+      ...extract(rest, { formatter: format }),
+      from: account.address,
+      accessList,
+      data,
+      gas,
+      gasPrice,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      nonce,
+      to,
+      value,
+    } as TransactionRequest)
 
     const balance = await (client as PublicClient).request({
       method: 'eth_estimateGas',

package/src/actions/public/getBlock.ts

@@ -9,11 +9,9 @@ import type { Hash } from '../../types/misc.js'
 import type { RpcBlock } from '../../types/rpc.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 import {
-  type BlockFormatter,
   type FormattedBlock,
   formatBlock,
 } from '../../utils/formatters/block.js'
-import { format } from '../../utils/formatters/format.js'
 
 export type GetBlockParameters = {
   /** Whether or not to include transaction data in the response. */
@@ -44,7 +42,7 @@ export type GetBlockParameters = {
 
 export type GetBlockReturnType<
   TChain extends Chain | undefined = Chain | undefined,
-> = FormattedBlock<BlockFormatter<TChain>>
+> = FormattedBlock<TChain>
 
 /**
  * Returns information about a block at a block number, hash, or tag.
@@ -102,7 +100,6 @@ export async function getBlock<
 
   if (!block) throw new BlockNotFoundError({ blockHash, blockNumber })
 
-  return format(block, {
-    formatter: client.chain?.formatters?.block || formatBlock,
-  })
+  const format = client.chain?.formatters?.block || formatBlock
+  return format(block)
 }

package/src/actions/public/getTransaction.ts

@@ -6,10 +6,8 @@ import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
 import type { RpcTransaction } from '../../types/rpc.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
-import { format } from '../../utils/formatters/format.js'
 import {
   type FormattedTransaction,
-  type TransactionFormatter,
   formatTransaction,
 } from '../../utils/formatters/transaction.js'
 
@@ -51,7 +49,7 @@ export type GetTransactionParameters =
     }
 
 export type GetTransactionReturnType<TChain extends Chain | undefined = Chain> =
-  FormattedTransaction<TransactionFormatter<TChain>>
+  FormattedTransaction<TChain>
 
 /**
  * Returns information about a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) given a hash or block identifier.
@@ -117,7 +115,6 @@ export async function getTransaction<TChain extends Chain | undefined>(
       index,
     })
 
-  return format(transaction, {
-    formatter: client.chain?.formatters?.transaction || formatTransaction,
-  })
+  const format = client.chain?.formatters?.transaction || formatTransaction
+  return format(transaction)
 }

package/src/actions/public/getTransactionConfirmations.ts

@@ -2,10 +2,7 @@ import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
-import type {
-  FormattedTransactionReceipt,
-  TransactionReceiptFormatter,
-} from '../../utils/formatters/transactionReceipt.js'
+import type { FormattedTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
 
 import { getBlockNumber } from './getBlockNumber.js'
 import { getTransaction } from './getTransaction.js'
@@ -21,9 +18,7 @@ export type GetTransactionConfirmationsParameters<
   | {
       hash?: never
       /** The transaction receipt. */
-      transactionReceipt: FormattedTransactionReceipt<
-        TransactionReceiptFormatter<TChain>
-      >
+      transactionReceipt: FormattedTransactionReceipt<TChain>
     }
 
 export type GetTransactionConfirmationsReturnType = bigint

package/src/actions/public/getTransactionReceipt.ts

@@ -3,10 +3,8 @@ import type { Transport } from '../../clients/transports/createTransport.js'
 import { TransactionReceiptNotFoundError } from '../../errors/transaction.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
-import { format } from '../../utils/formatters/format.js'
 import {
   type FormattedTransactionReceipt,
-  type TransactionReceiptFormatter,
   formatTransactionReceipt,
 } from '../../utils/formatters/transactionReceipt.js'
 
@@ -17,7 +15,7 @@ export type GetTransactionReceiptParameters = {
 
 export type GetTransactionReceiptReturnType<
   TChain extends Chain | undefined = Chain | undefined,
-> = FormattedTransactionReceipt<TransactionReceiptFormatter<TChain>>
+> = FormattedTransactionReceipt<TChain>
 
 /**
  * Returns the [Transaction Receipt](https://viem.sh/docs/glossary/terms.html#transaction-receipt) given a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) hash.
@@ -54,8 +52,7 @@ export async function getTransactionReceipt<TChain extends Chain | undefined>(
 
   if (!receipt) throw new TransactionReceiptNotFoundError({ hash })
 
-  return format(receipt, {
-    formatter:
-      client.chain?.formatters?.transactionReceipt || formatTransactionReceipt,
-  }) as GetTransactionReceiptReturnType<TChain>
+  const format =
+    client.chain?.formatters?.transactionReceipt || formatTransactionReceipt
+  return format(receipt) as GetTransactionReceiptReturnType<TChain>
 }

package/src/actions/public/simulateContract.ts

@@ -38,7 +38,13 @@ export type SimulateContractParameters<
     CallParameters<TChainOverride extends Chain ? TChainOverride : TChain>,
     'batch' | 'to' | 'data' | 'value'
   > &
-  GetValue<TAbi, TFunctionName, CallParameters<TChain>['value']>
+  GetValue<
+    TAbi,
+    TFunctionName,
+    CallParameters<TChain> extends CallParameters
+      ? CallParameters<TChain>['value']
+      : undefined
+  >
 
 export type SimulateContractReturnType<
   TAbi extends Abi | readonly unknown[] = Abi,

package/src/actions/public/verifyHash.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { Chain } from '../../chains.js'
+import type { Chain } from '../../chains/index.js'
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { universalSignatureValidatorAbi } from '../../constants/abis.js'

package/src/actions/public/verifyMessage.ts

@@ -1,4 +1,4 @@
-import type { Chain } from '../../chains.js'
+import type { Chain } from '../../chains/index.js'
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js'

package/src/actions/public/verifyTypedData.ts

@@ -1,4 +1,4 @@
-import type { Chain } from '../../chains.js'
+import type { Chain } from '../../chains/index.js'
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ByteArray, Hex } from '../../types/misc.js'

package/src/actions/public/watchBlocks.ts

@@ -4,7 +4,6 @@ import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type { GetTransportConfig } from '../../types/transport.js'
 import { formatBlock } from '../../utils/formatters/block.js'
-import { format } from '../../utils/formatters/format.js'
 import { observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
 import { stringify } from '../../utils/stringify.js'
@@ -172,9 +171,8 @@ export function watchBlocks<
           params: ['newHeads'],
           onData(data: any) {
             if (!active) return
-            const block = format(data.result, {
-              formatter: client.chain?.formatters?.block || formatBlock,
-            })
+            const format = client.chain?.formatters?.block || formatBlock
+            const block = format(data.result)
             onBlock(block, prevBlock)
             prevBlock = block
           },

package/src/actions/test/sendUnsignedTransaction.ts

@@ -4,27 +4,17 @@ import type {
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
-import type { Formatter } from '../../types/formatter.js'
 import type { Hash } from '../../types/misc.js'
 import type { TransactionRequest } from '../../types/transaction.js'
-import type { MergeIntersectionProperties } from '../../types/utils.js'
 import { extract } from '../../utils/formatters/extract.js'
-import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  type TransactionRequestFormatter,
+  type FormattedTransactionRequest,
   formatTransactionRequest,
 } from '../../utils/formatters/transactionRequest.js'
 
-type FormattedTransactionRequest<
-  TFormatter extends Formatter | undefined = Formatter,
-> = MergeIntersectionProperties<
-  Formatted<TFormatter, TransactionRequest, true>,
-  TransactionRequest
->
-
 export type SendUnsignedTransactionParameters<
   TChain extends Chain | undefined = Chain | undefined,
-> = FormattedTransactionRequest<TransactionRequestFormatter<TChain>>
+> = FormattedTransactionRequest<TChain>
 
 export type SendUnsignedTransactionReturnType = Hash
 
@@ -73,26 +63,22 @@ export async function sendUnsignedTransaction<
     ...rest
   } = args
 
-  const formatter = client.chain?.formatters?.transactionRequest
-  const request = format(
-    {
-      accessList,
-      data,
-      from,
-      gas,
-      gasPrice,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      nonce,
-      to,
-      value,
-      // Pick out extra data that might exist on the chain's transaction request type.
-      ...extract(rest, { formatter }),
-    } as TransactionRequest,
-    {
-      formatter: formatter || formatTransactionRequest,
-    },
-  )
+  const format =
+    client.chain?.formatters?.transactionRequest || formatTransactionRequest
+  const request = format({
+    // Pick out extra data that might exist on the chain's transaction request type.
+    ...extract(rest, { formatter: format }),
+    accessList,
+    data,
+    from,
+    gas,
+    gasPrice,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    nonce,
+    to,
+    value,
+  } as TransactionRequest)
   const hash = await client.request({
     method: 'eth_sendUnsignedTransaction',
     params: [request],

package/src/actions/wallet/sendTransaction.ts

@@ -6,37 +6,27 @@ import { AccountNotFoundError } from '../../errors/account.js'
 import type { BaseError } from '../../errors/base.js'
 import type { GetAccountParameter } from '../../types/account.js'
 import type { Chain, GetChain } from '../../types/chain.js'
-import type { Formatter } from '../../types/formatter.js'
 import type { Hash } from '../../types/misc.js'
 import type {
   TransactionRequest,
   TransactionSerializable,
 } from '../../types/transaction.js'
-import type { MergeIntersectionProperties } from '../../types/utils.js'
 import { assertCurrentChain } from '../../utils/chain.js'
 import { getTransactionError } from '../../utils/errors/getTransactionError.js'
 import { extract } from '../../utils/formatters/extract.js'
-import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  type TransactionRequestFormatter,
+  type FormattedTransactionRequest,
   formatTransactionRequest,
 } from '../../utils/formatters/transactionRequest.js'
 import { assertRequest } from '../../utils/transaction/assertRequest.js'
 import { prepareRequest } from '../../utils/transaction/prepareRequest.js'
 import { getChainId } from '../public/getChainId.js'
 
-export type FormattedTransactionRequest<
-  TFormatter extends Formatter | undefined = Formatter,
-> = MergeIntersectionProperties<
-  Omit<Formatted<TFormatter, TransactionRequest, true>, 'from'>,
-  TransactionRequest
->
-
 export type SendTransactionParameters<
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
   TChainOverride extends Chain | undefined = Chain,
-> = FormattedTransactionRequest<TransactionRequestFormatter<TChainOverride>> &
+> = Omit<FormattedTransactionRequest<TChainOverride>, 'from'> &
   GetAccountParameter<TAccount> &
   GetChain<TChain, TChainOverride>
 
@@ -161,26 +151,22 @@ export async function sendTransaction<
       })
     }
 
-    const formatter = chain?.formatters?.transactionRequest
-    const request = format(
-      {
-        accessList,
-        data,
-        from: account.address,
-        gas,
-        gasPrice,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce,
-        to,
-        value,
-        // Pick out extra data that might exist on the chain's transaction request type.
-        ...extract(rest, { formatter }),
-      } as TransactionRequest,
-      {
-        formatter: formatter || formatTransactionRequest,
-      },
-    )
+    const format =
+      chain?.formatters?.transactionRequest || formatTransactionRequest
+    const request = format({
+      // Pick out extra data that might exist on the chain's transaction request type.
+      ...extract(rest, { formatter: format }),
+      accessList,
+      data,
+      from: account.address,
+      gas,
+      gasPrice,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      nonce,
+      to,
+      value,
+    } as TransactionRequest)
     return await client.request({
       method: 'eth_sendTransaction',
       params: [request],

package/src/chains/formatters/celo.ts

@@ -0,0 +1,102 @@
+import type { Address } from 'abitype'
+
+import type { Hash, Hex } from '../../types/misc.js'
+import type { RpcTransaction } from '../../types/rpc.js'
+import type { Transaction } from '../../types/transaction.js'
+import { hexToBigInt } from '../../utils/encoding/fromHex.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import { defineBlock } from '../../utils/formatters/block.js'
+import {
+  defineTransaction,
+  formatTransaction,
+} from '../../utils/formatters/transaction.js'
+import { defineTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
+import { defineTransactionRequest } from '../../utils/formatters/transactionRequest.js'
+
+export type CeloOverrides = {
+  RpcBlock: {
+    randomness: {
+      committed: Hex
+      revealed: Hex
+    }
+    transactions:
+      | Hash[]
+      | (RpcTransaction & {
+          feeCurrency: Address | null
+          gatewayFee: Hex | null
+          gatewayFeeRecipient: Address | null
+        })[]
+  }
+  RpcTransaction: {
+    feeCurrency: Address | null
+    gatewayFee: Hex | null
+    gatewayFeeRecipient: Address | null
+  }
+  RpcTransactionReceipt: {
+    feeCurrency: Address | null
+    gatewayFee: Hex | null
+    gatewayFeeRecipient: Address | null
+  }
+  TransactionRequest: {
+    feeCurrency?: Address
+    gatewayFee?: bigint
+    gatewayFeeRecipient?: Address
+  }
+  Transaction: {
+    feeCurrency: Address | null
+    gatewayFee: bigint | null
+    gatewayFeeRecipient: Address | null
+  }
+}
+export const celoFormatters = {
+  block: /*#__PURE__*/ defineBlock({
+    exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
+    format(args: CeloOverrides['RpcBlock']) {
+      const transactions = args.transactions?.map((transaction) => {
+        if (typeof transaction === 'string') return transaction
+        return {
+          ...formatTransaction(transaction),
+          feeCurrency: transaction.feeCurrency,
+          gatewayFee: transaction.gatewayFee
+            ? hexToBigInt(transaction.gatewayFee)
+            : null,
+          gatewayFeeRecipient: transaction.gatewayFeeRecipient,
+        }
+      }) as Hash[] | (Transaction & CeloOverrides['Transaction'])[]
+      return {
+        randomness: args.randomness,
+        transactions,
+      }
+    },
+  }),
+  transaction: /*#__PURE__*/ defineTransaction({
+    format(args: CeloOverrides['RpcTransaction']) {
+      return {
+        feeCurrency: args.feeCurrency,
+        gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
+        gatewayFeeRecipient: args.gatewayFeeRecipient,
+      }
+    },
+  }),
+  transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
+    format(args: CeloOverrides['RpcTransactionReceipt']) {
+      return {
+        feeCurrency: args.feeCurrency,
+        gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
+        gatewayFeeRecipient: args.gatewayFeeRecipient,
+      }
+    },
+  }),
+  transactionRequest: /*#__PURE__*/ defineTransactionRequest({
+    format(args: CeloOverrides['TransactionRequest']) {
+      return {
+        feeCurrency: args.feeCurrency,
+        gatewayFee:
+          typeof args.gatewayFee !== 'undefined'
+            ? numberToHex(args.gatewayFee)
+            : undefined,
+        gatewayFeeRecipient: args.gatewayFeeRecipient,
+      }
+    },
+  }),
+} as const