viem 2.0.0-beta.0 → 2.0.0-beta.10

package/actions/wallet/writeContract.ts

@@ -5,7 +5,11 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { GetAccountParameter } from '../../types/account.js'
-import type { Chain, GetChain } from '../../types/chain.js'
+import type {
+  Chain,
+  DeriveChain,
+  GetChainParameter,
+} from '../../types/chain.js'
 import type {
   ContractFunctionArgs,
   ContractFunctionName,
@@ -16,6 +20,7 @@ import type { Hex } from '../../types/misc.js'
 import type { Prettify, UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import {
   type EncodeFunctionDataErrorType,
+  type EncodeFunctionDataParameters,
   encodeFunctionData,
 } from '../../utils/abi/encodeFunctionData.js'
 import type { FormattedTransactionRequest } from '../../utils/formatters/transactionRequest.js'
@@ -42,6 +47,7 @@ export type WriteContractParameters<
   chainOverride extends Chain | undefined = Chain | undefined,
   ///
   allFunctionNames = ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+  derivedChain extends Chain | undefined = DeriveChain<chain, chainOverride>,
 > = ContractFunctionParameters<
   abi,
   'nonpayable' | 'payable',
@@ -49,15 +55,13 @@ export type WriteContractParameters<
   args,
   allFunctionNames
 > &
-  GetChain<chain, chainOverride> &
+  GetChainParameter<chain, chainOverride> &
   Prettify<
     GetAccountParameter<account> &
       GetValue<
         abi,
         functionName,
-        FormattedTransactionRequest<
-          chainOverride extends Chain ? chainOverride : chain
-        >['value']
+        FormattedTransactionRequest<derivedChain>['value']
       > & {
         /** Data to append to the end of the calldata. Useful for adding a ["domain" tag](https://opensea.notion.site/opensea/Seaport-Order-Attributions-ec2d69bf455041a5baa490941aad307f). */
         dataSuffix?: Hex
@@ -65,9 +69,7 @@ export type WriteContractParameters<
   > &
   UnionEvaluate<
     UnionOmit<
-      FormattedTransactionRequest<
-        chainOverride extends Chain ? chainOverride : chain
-      >,
+      FormattedTransactionRequest<derivedChain>,
       'data' | 'from' | 'to' | 'value'
     >
   >
@@ -83,7 +85,7 @@ export type WriteContractErrorType =
  * Executes a write function on a contract.
  *
  * - Docs: https://viem.sh/docs/contract/writeContract.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/writing-to-contracts
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/contracts/writing-to-contracts
  *
  * A "write" function on a Solidity contract modifies the state of the blockchain. These types of functions require gas to be executed, and hence a [Transaction](https://viem.sh/docs/glossary/terms.html) is needed to be broadcast in order to change the state.
  *
@@ -149,9 +151,16 @@ export async function writeContract<
 ): Promise<WriteContractReturnType> {
   const { abi, address, args, dataSuffix, functionName, ...request } =
     parameters as WriteContractParameters
-  const data = encodeFunctionData({ abi, args, functionName })
-  const action = getAction(client, sendTransaction)
-  return action({
+  const data = encodeFunctionData({
+    abi,
+    args,
+    functionName,
+  } as EncodeFunctionDataParameters)
+  return getAction(
+    client,
+    sendTransaction,
+    'sendTransaction',
+  )({
     data: `${data}${dataSuffix ? dataSuffix.replace('0x', '') : ''}`,
     to: address,
     ...request,

package/chains/celo/chainConfig.ts

@@ -0,0 +1,7 @@
+import { formatters } from './formatters.js'
+import { serializers } from './serializers.js'
+
+export const chainConfig = {
+  formatters,
+  serializers,
+} as const

package/chains/celo/formatters.ts

@@ -19,24 +19,9 @@ import type {
   CeloTransactionReceiptOverrides,
   CeloTransactionRequest,
 } from './types.js'
+import { isCIP42, isCIP64 } from './utils.js'
 
-function isTransactionRequestCIP64(args: CeloTransactionRequest): boolean {
-  if (args.type === 'cip64') return true
-  if (args.type) return false
-  return (
-    'feeCurrency' in args &&
-    args.gatewayFee === undefined &&
-    args.gatewayFeeRecipient === undefined
-  )
-}
-
-function isTransactionRequestCIP42(args: CeloTransactionRequest): boolean {
-  if (args.type === 'cip42') return true
-  if (args.type) return false
-  return args.gatewayFee !== undefined || args.gatewayFeeRecipient !== undefined
-}
-
-export const formattersCelo = {
+export const formatters = {
   block: /*#__PURE__*/ defineBlock({
     exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
     format(
@@ -51,7 +36,6 @@ export const formattersCelo = {
         return {
           ...formatTransaction(transaction as RpcTransaction),
           feeCurrency: transaction.feeCurrency,
-
           ...(transaction.type !== '0x7b'
             ? {
                 gatewayFee: transaction.gatewayFee
@@ -70,15 +54,19 @@ export const formattersCelo = {
   }),
   transaction: /*#__PURE__*/ defineTransaction({
     format(args: CeloRpcTransaction): CeloTransaction {
-      if (args.type === '0x7b')
-        return {
-          feeCurrency: args.feeCurrency,
-        } as CeloTransaction
-      return {
-        feeCurrency: args.feeCurrency,
-        gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
-        gatewayFeeRecipient: args.gatewayFeeRecipient,
-      } as CeloTransaction
+      const transaction = { feeCurrency: args.feeCurrency } as CeloTransaction
+
+      if (args.type === '0x7b') transaction.type = 'cip64'
+      else {
+        if (args.type === '0x7c') transaction.type = 'cip42'
+
+        transaction.gatewayFee = args.gatewayFee
+          ? hexToBigInt(args.gatewayFee)
+          : null
+        transaction.gatewayFeeRecipient = args.gatewayFeeRecipient
+      }
+
+      return transaction
     },
   }),
   transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
@@ -95,22 +83,20 @@ export const formattersCelo = {
 
   transactionRequest: /*#__PURE__*/ defineTransactionRequest({
     format(args: CeloTransactionRequest): CeloRpcTransactionRequest {
-      if (isTransactionRequestCIP64(args))
-        return {
-          type: '0x7b',
-          feeCurrency: args.feeCurrency,
-        } as CeloRpcTransactionRequest
-
       const request = {
         feeCurrency: args.feeCurrency,
-        gatewayFee:
-          typeof args.gatewayFee !== 'undefined'
-            ? numberToHex(args.gatewayFee)
-            : undefined,
-        gatewayFeeRecipient: args.gatewayFeeRecipient,
       } as CeloRpcTransactionRequest
 
-      if (isTransactionRequestCIP42(args)) request.type = '0x7c'
+      if (isCIP64(args)) request.type = '0x7b'
+      else {
+        if (isCIP42(args)) request.type = '0x7c'
+
+        request.gatewayFee =
+          typeof args.gatewayFee !== 'undefined'
+            ? numberToHex(args.gatewayFee)
+            : undefined
+        request.gatewayFeeRecipient = args.gatewayFeeRecipient
+      }
 
       return request
     },

package/chains/celo/index.ts

@@ -0,0 +1,35 @@
+export { chainConfig } from './chainConfig.js'
+
+export { parseTransaction } from './parsers.js'
+
+export { serializeTransaction } from './serializers.js'
+
+export type {
+  CeloBlock,
+  CeloBlockOverrides,
+  CeloRpcBlock,
+  CeloRpcBlockOverrides,
+  CeloRpcTransaction,
+  CeloRpcTransactionReceipt,
+  CeloRpcTransactionReceiptOverrides,
+  CeloRpcTransactionRequest,
+  CeloTransaction,
+  CeloTransactionReceipt,
+  CeloTransactionReceiptOverrides,
+  CeloTransactionRequest,
+  CeloTransactionSerializable,
+  CeloTransactionSerialized,
+  CeloTransactionType,
+  RpcTransactionCIP42,
+  RpcTransactionCIP64,
+  RpcTransactionRequestCIP42,
+  RpcTransactionRequestCIP64,
+  TransactionCIP42,
+  TransactionCIP64,
+  TransactionRequestCIP42,
+  TransactionRequestCIP64,
+  TransactionSerializableCIP42,
+  TransactionSerializableCIP64,
+  TransactionSerializedCIP42,
+  TransactionSerializedCIP64,
+} from './types.js'

package/chains/celo/package.json

@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "types": "../../_types/chains/celo/index.d.ts",
+  "module": "../../_esm/chains/celo/index.js",
+  "main": "../../_cjs/chains/celo/index.js"
+}

package/chains/celo/parsers.ts

@@ -6,9 +6,9 @@ import { hexToBigInt, hexToNumber } from '../../utils/encoding/fromHex.js'
 import type { RecursiveArray } from '../../utils/encoding/toRlp.js'
 import type { GetSerializedTransactionType } from '../../utils/transaction/getSerializedTransactionType.js'
 import {
-  type ParseTransactionReturnType,
+  type ParseTransactionReturnType as ParseTransactionReturnType_,
   parseAccessList,
-  parseTransaction,
+  parseTransaction as parseTransaction_,
   toTransactionArray,
 } from '../../utils/transaction/parseTransaction.js'
 import {
@@ -24,33 +24,31 @@ import type {
   TransactionSerializedCIP64,
 } from './types.js'
 
-export type ParseTransactionCeloReturnType<
+export type ParseTransactionReturnType<
   TSerialized extends CeloTransactionSerialized = CeloTransactionSerialized,
   TType extends CeloTransactionType = GetSerializedTransactionType<TSerialized>,
 > = TSerialized extends TransactionSerializedCIP42
   ? TransactionSerializableCIP42
-  : ParseTransactionReturnType<TSerialized, TType>
+  : ParseTransactionReturnType_<TSerialized, TType>
 
-export function parseTransactionCelo<
-  TSerialized extends CeloTransactionSerialized,
->(
+export function parseTransaction<TSerialized extends CeloTransactionSerialized>(
   serializedTransaction: TSerialized,
-): ParseTransactionCeloReturnType<TSerialized> {
+): ParseTransactionReturnType<TSerialized> {
   const serializedType = sliceHex(serializedTransaction, 0, 1)
 
   if (serializedType === '0x7c')
     return parseTransactionCIP42(
       serializedTransaction as TransactionSerializedCIP42,
-    ) as ParseTransactionCeloReturnType<TSerialized>
+    ) as ParseTransactionReturnType<TSerialized>
 
   if (serializedType === '0x7b')
     return parseTransactionCIP64(
       serializedTransaction as TransactionSerializedCIP64,
-    ) as ParseTransactionCeloReturnType<TSerialized>
+    ) as ParseTransactionReturnType<TSerialized>
 
-  return parseTransaction(
+  return parseTransaction_(
     serializedTransaction,
-  ) as ParseTransactionCeloReturnType<TSerialized>
+  ) as ParseTransactionReturnType<TSerialized>
 }
 
 function parseTransactionCIP42(

package/chains/celo/serializers.ts

@@ -13,7 +13,7 @@ import { toRlp } from '../../utils/encoding/toRlp.js'
 import { serializeAccessList } from '../../utils/transaction/serializeAccessList.js'
 import {
   type SerializeTransactionFn,
-  serializeTransaction,
+  serializeTransaction as serializeTransaction_,
 } from '../../utils/transaction/serializeTransaction.js'
 import type {
   CeloTransactionSerializable,
@@ -22,27 +22,18 @@ import type {
   TransactionSerializedCIP42,
   TransactionSerializedCIP64,
 } from './types.js'
+import { isCIP42, isCIP64, isEmpty, isPresent } from './utils.js'
 
-export const serializeTransactionCelo: SerializeTransactionFn<
-  CeloTransactionSerializable
+export const serializeTransaction: SerializeTransactionFn<
+  CeloTransactionSerializable | TransactionSerializable
 > = (tx, signature) => {
-  if (isCIP64(tx)) {
-    return serializeTransactionCIP64(
-      tx as TransactionSerializableCIP64,
-      signature,
-    )
-  } else if (isCIP42(tx)) {
-    return serializeTransactionCIP42(
-      tx as TransactionSerializableCIP42,
-      signature,
-    )
-  } else {
-    return serializeTransaction(tx as TransactionSerializable, signature)
-  }
+  if (isCIP64(tx)) return serializeTransactionCIP64(tx, signature)
+  if (isCIP42(tx)) return serializeTransactionCIP42(tx, signature)
+  return serializeTransaction_(tx as TransactionSerializable, signature)
 }
 
-export const serializersCelo = {
-  transaction: serializeTransactionCelo,
+export const serializers = {
+  transaction: serializeTransaction,
 } as const satisfies ChainSerializers
 
 //////////////////////////////////////////////////////////////////////////////
@@ -131,7 +122,7 @@ function serializeTransactionCIP64(
     value ? toHex(value) : '0x',
     data ?? '0x',
     serializeAccessList(accessList),
-    feeCurrency ?? '0x',
+    feeCurrency!,
   ]
 
   if (signature) {
@@ -148,43 +139,8 @@ function serializeTransactionCIP64(
   ]) as SerializeTransactionCIP64ReturnType
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Utilities
-
-// process as CIP42 if any of these fields are present. realistically gatewayfee is not used but is part of spec
-function isCIP42(transaction: CeloTransactionSerializable): boolean {
-  if (transaction.type === 'cip42') return true
-  // if the type is defined as anything else, assume it is *not* cip42
-  if (transaction.type) return false
-
-  // if the type is undefined, check if the fields match the expectations for cip42
-  return (
-    'maxFeePerGas' in transaction &&
-    'maxPriorityFeePerGas' in transaction &&
-    ('feeCurrency' in transaction ||
-      'gatewayFee' in transaction ||
-      'gatewayFeeRecipient' in transaction)
-  )
-}
-
-function isCIP64(transaction: CeloTransactionSerializable): boolean {
-  if (transaction.type === 'cip64') return true
-  // if the type is defined as anything else, assume it is *not* cip64
-  if (transaction.type) return false
-
-  // if the type is undefined, check if the fields match the expectations for cip64
-  return (
-    'maxFeePerGas' in transaction &&
-    'maxPriorityFeePerGas' in transaction &&
-    'feeCurrency' in transaction &&
-    !('gatewayFee' in transaction) &&
-    !('gatewayFeeRecipient' in transaction)
-  )
-}
-
-// maxFeePerGas must be less than 2^256 - 1: however writing like that caused exceptions to be raised
-const MAX_MAX_FEE_PER_GAS =
-  115792089237316195423570985008687907853269984665640564039457584007913129639935n
+// maxFeePerGas must be less than 2^256 - 1
+const MAX_MAX_FEE_PER_GAS = 2n ** 256n - 1n
 
 export function assertTransactionCIP42(
   transaction: TransactionSerializableCIP42,
@@ -206,32 +162,36 @@ export function assertTransactionCIP42(
       '`gasPrice` is not a valid CIP-42 Transaction attribute.',
     )
 
-  if (maxFeePerGas && maxFeePerGas > MAX_MAX_FEE_PER_GAS)
+  if (isPresent(maxFeePerGas) && maxFeePerGas > MAX_MAX_FEE_PER_GAS)
     throw new FeeCapTooHighError({ maxFeePerGas })
 
   if (
-    maxPriorityFeePerGas &&
-    maxFeePerGas &&
+    isPresent(maxPriorityFeePerGas) &&
+    isPresent(maxFeePerGas) &&
     maxPriorityFeePerGas > maxFeePerGas
   )
     throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas })
 
   if (
-    (gatewayFee && !gatewayFeeRecipient) ||
-    (gatewayFeeRecipient && !gatewayFee)
+    (isPresent(gatewayFee) && isEmpty(gatewayFeeRecipient)) ||
+    (isPresent(gatewayFeeRecipient) && isEmpty(gatewayFee))
   ) {
     throw new BaseError(
       '`gatewayFee` and `gatewayFeeRecipient` must be provided together.',
     )
   }
 
-  if (feeCurrency && !feeCurrency?.startsWith('0x')) {
+  if (isPresent(feeCurrency) && !isAddress(feeCurrency)) {
     throw new BaseError(
       '`feeCurrency` MUST be a token address for CIP-42 transactions.',
     )
   }
 
-  if (!feeCurrency && !gatewayFeeRecipient) {
+  if (isPresent(gatewayFeeRecipient) && !isAddress(gatewayFeeRecipient)) {
+    throw new InvalidAddressError(gatewayFeeRecipient)
+  }
+
+  if (isEmpty(feeCurrency) && isEmpty(gatewayFeeRecipient)) {
     throw new BaseError(
       'Either `feeCurrency` or `gatewayFeeRecipient` must be provided for CIP-42 transactions.',
     )
@@ -258,22 +218,22 @@ export function assertTransactionCIP64(
       '`gasPrice` is not a valid CIP-64 Transaction attribute.',
     )
 
-  if (maxFeePerGas && maxFeePerGas > MAX_MAX_FEE_PER_GAS)
+  if (isPresent(maxFeePerGas) && maxFeePerGas > MAX_MAX_FEE_PER_GAS)
     throw new FeeCapTooHighError({ maxFeePerGas })
   if (
-    maxPriorityFeePerGas &&
-    maxFeePerGas &&
+    isPresent(maxPriorityFeePerGas) &&
+    isPresent(maxFeePerGas) &&
     maxPriorityFeePerGas > maxFeePerGas
   )
     throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas })
 
-  if (feeCurrency && !feeCurrency?.startsWith('0x')) {
+  if (isPresent(feeCurrency) && !isAddress(feeCurrency)) {
     throw new BaseError(
       '`feeCurrency` MUST be a token address for CIP-64 transactions.',
     )
   }
 
-  if (!feeCurrency) {
+  if (isEmpty(feeCurrency)) {
     throw new BaseError(
       '`feeCurrency` must be provided for CIP-64 transactions.',
     )

package/chains/celo/types.ts

@@ -24,7 +24,6 @@ import type {
   TransactionSerialized,
 } from '../../types/transaction.js'
 import type { NeverBy } from '../../types/utils.js'
-import type { OptimismRpcTransaction } from '../optimism/types.js'
 
 type CeloBlockExclude =
   | 'difficulty'
@@ -66,7 +65,7 @@ export type CeloRpcBlock<
   RpcBlock<
     TBlockTag,
     TIncludeTransactions,
-    OptimismRpcTransaction<TBlockTag extends 'pending' ? true : false>
+    RpcTransaction<TBlockTag extends 'pending' ? true : false>
   >,
   CeloBlockExclude
 > &
@@ -111,7 +110,7 @@ export type CeloTransactionRequest =
 export type CeloTransactionSerializable =
   | TransactionSerializableCIP42
   | TransactionSerializableCIP64
-  | TransactionSerializable
+  | CeloTransactionSerializableBase
 
 export type CeloTransactionSerialized<
   TType extends CeloTransactionType = 'legacy',
@@ -135,21 +134,27 @@ type RpcTransactionRequest = RpcTransactionRequest_ & {
   gatewayFeeRecipient?: Address
 }
 
-export type RpcTransactionCIP42<TPending extends boolean = boolean> =
-  TransactionBase<Quantity, Index, TPending> &
-    FeeValuesEIP1559<Quantity> & {
-      feeCurrency: Address | null
-      gatewayFee: Hex | null
-      gatewayFeeRecipient: Address | null
-      type: '0x7c'
-    }
+export type RpcTransactionCIP42<TPending extends boolean = boolean> = Omit<
+  TransactionBase<Quantity, Index, TPending>,
+  'typeHex'
+> &
+  FeeValuesEIP1559<Quantity> & {
+    feeCurrency: Address | null
+    gatewayFee: Hex | null
+    gatewayFeeRecipient: Address | null
+    type: '0x7c'
+  }
 
-export type RpcTransactionCIP64<TPending extends boolean = boolean> =
-  TransactionBase<Quantity, Index, TPending> &
-    FeeValuesEIP1559<Quantity> & {
-      feeCurrency: Address | null
-      type: '0x7b'
-    }
+export type RpcTransactionCIP64<TPending extends boolean = boolean> = Omit<
+  TransactionBase<Quantity, Index, TPending>,
+  'typeHex'
+> &
+  FeeValuesEIP1559<Quantity> & {
+    feeCurrency: Address | null
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
+    type: '0x7b'
+  }
 
 export type RpcTransactionRequestCIP42 = TransactionRequestBase<
   Quantity,
@@ -231,9 +236,8 @@ export type TransactionSerializableCIP42<
   TQuantity = bigint,
   TIndex = number,
 > = TransactionSerializableBase<TQuantity, TIndex> &
-  FeeValuesEIP1559<TQuantity> & {
+  Partial<FeeValuesEIP1559<TQuantity>> & {
     accessList?: AccessList
-    gasPrice?: never
     feeCurrency?: Address
     gatewayFeeRecipient?: Address
     gatewayFee?: TQuantity
@@ -245,13 +249,20 @@ export type TransactionSerializableCIP64<
   TQuantity = bigint,
   TIndex = number,
 > = TransactionSerializableBase<TQuantity, TIndex> &
-  FeeValuesEIP1559<TQuantity> & {
+  Partial<FeeValuesEIP1559<TQuantity>> & {
     accessList?: AccessList
-    gasPrice?: never
     feeCurrency?: Address
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
     chainId: number
     type?: 'cip64'
   }
 
+export type CeloTransactionSerializableBase = TransactionSerializable & {
+  feeCurrency?: undefined
+  gatewayFee?: undefined
+  gatewayFeeRecipient?: undefined
+}
+
 export type TransactionSerializedCIP42 = `0x7c${string}`
 export type TransactionSerializedCIP64 = `0x7b${string}`

package/chains/celo/utils.ts

@@ -0,0 +1,81 @@
+import type { Address } from 'abitype'
+import { trim } from '../../utils/data/trim.js'
+import type {
+  CeloTransactionRequest,
+  CeloTransactionSerializable,
+  TransactionSerializableCIP42,
+  TransactionSerializableCIP64,
+} from './types.js'
+
+export function isEmpty(
+  value: string | undefined | number | BigInt,
+): value is undefined {
+  return (
+    value === 0 ||
+    value === 0n ||
+    value === undefined ||
+    value === null ||
+    value === '0' ||
+    value === '' ||
+    (typeof value === 'string' &&
+      (trim(value as Address).toLowerCase() === '0x' ||
+        trim(value as Address).toLowerCase() === '0x00'))
+  )
+}
+
+export function isPresent(
+  value: string | undefined | number | BigInt,
+): value is string | number | BigInt {
+  return !isEmpty(value)
+}
+
+export function isEIP1559(
+  transaction: CeloTransactionSerializable | CeloTransactionRequest,
+): boolean {
+  return (
+    isPresent(transaction.maxFeePerGas) &&
+    isPresent(transaction.maxPriorityFeePerGas)
+  )
+}
+
+// process as CIP42 if any of these fields are present. realistically gatewayfee is not used but is part of spec
+export function isCIP42(
+  transaction: CeloTransactionSerializable | CeloTransactionRequest,
+): transaction is TransactionSerializableCIP42 {
+  // Enable end-user to force the tx to be considered as a cip42
+  if (transaction.type === 'cip42') {
+    return true
+  }
+
+  return (
+    isEIP1559(transaction) &&
+    (isPresent(transaction.feeCurrency) ||
+      isPresent(transaction.gatewayFeeRecipient) ||
+      isPresent(transaction.gatewayFee))
+  )
+}
+
+export function isCIP64(
+  transaction: CeloTransactionSerializable | CeloTransactionRequest,
+): transaction is TransactionSerializableCIP64 {
+  /*
+   * Enable end user to force the tx to be considered as a CIP-64.
+   *
+   * The preliminary type will be determined as "eip1559" by src/utils/transaction/getTransactionType.ts
+   * and so we need the logic below to check for the specific value instead of checking if just any
+   * transaction type is provided. If that's anything else than "cip64" then we need to reevaluate the
+   * type based on the transaction fields.
+   *
+   * Modify with caution and according to https://github.com/celo-org/celo-proposals/blob/master/CIPs/cip-0064.md
+   */
+  if (transaction.type === 'cip64') {
+    return true
+  }
+
+  return (
+    isEIP1559(transaction) &&
+    isPresent(transaction.feeCurrency) &&
+    isEmpty(transaction.gatewayFee) &&
+    isEmpty(transaction.gatewayFeeRecipient)
+  )
+}

package/chains/definitions/astar.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const astar = /*#__PURE__*/ defineChain({
+  id: 592,
+  name: 'Astar',
+  network: 'astar-mainnet',
+  nativeCurrency: {
+    name: 'Astar',
+    symbol: 'ASTR',
+    decimals: 18,
+  },
+  rpcUrls: {
+    public: { http: ['https://astar.api.onfinality.io/public'] },
+    default: { http: ['https://astar.api.onfinality.io/public'] },
+  },
+  blockExplorers: {
+    default: { name: 'Astar Subscan', url: 'https://astar.subscan.io' },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xca11bde05977b3631167028862be2a173976ca11',
+      blockCreated: 761794,
+    },
+  },
+  testnet: false,
+})