viem 2.0.0-alpha.16 → 2.0.0-alpha.18

package/chains/celo/parsers.ts

@@ -11,12 +11,17 @@ import {
   parseTransaction,
   toTransactionArray,
 } from '../../utils/transaction/parseTransaction.js'
-import { assertTransactionCIP42 } from './serializers.js'
+import {
+  assertTransactionCIP42,
+  assertTransactionCIP64,
+} from './serializers.js'
 import type {
   CeloTransactionSerialized,
   CeloTransactionType,
   TransactionSerializableCIP42,
+  TransactionSerializableCIP64,
   TransactionSerializedCIP42,
+  TransactionSerializedCIP64,
 } from './types.js'
 
 export type ParseTransactionCeloReturnType<
@@ -38,6 +43,11 @@ export function parseTransactionCelo<
       serializedTransaction as TransactionSerializedCIP42,
     ) as ParseTransactionCeloReturnType<TSerialized>
 
+  if (serializedType === '0x7b')
+    return parseTransactionCIP64(
+      serializedTransaction as TransactionSerializedCIP64,
+    ) as ParseTransactionCeloReturnType<TSerialized>
+
   return parseTransaction(
     serializedTransaction,
   ) as ParseTransactionCeloReturnType<TSerialized>
@@ -121,3 +131,74 @@ function parseTransactionCIP42(
 
   return transaction as TransactionSerializableCIP42
 }
+
+function parseTransactionCIP64(
+  serializedTransaction: TransactionSerializedCIP64,
+): TransactionSerializableCIP64 {
+  const transactionArray = toTransactionArray(serializedTransaction)
+
+  const [
+    chainId,
+    nonce,
+    maxPriorityFeePerGas,
+    maxFeePerGas,
+    gas,
+    to,
+    value,
+    data,
+    accessList,
+    feeCurrency,
+    v,
+    r,
+    s,
+  ] = transactionArray
+
+  if (transactionArray.length !== 13 && transactionArray.length !== 10) {
+    throw new InvalidSerializedTransactionError({
+      attributes: {
+        chainId,
+        nonce,
+        maxPriorityFeePerGas,
+        maxFeePerGas,
+        gas,
+        to,
+        value,
+        data,
+        accessList,
+        feeCurrency,
+        ...(transactionArray.length > 10
+          ? {
+              v,
+              r,
+              s,
+            }
+          : {}),
+      },
+      serializedTransaction,
+      type: 'cip64',
+    })
+  }
+
+  const transaction: Partial<TransactionSerializableCIP64> = {
+    chainId: hexToNumber(chainId as Hex),
+    type: 'cip64',
+  }
+
+  if (isHex(to) && to !== '0x') transaction.to = to
+  if (isHex(gas) && gas !== '0x') transaction.gas = hexToBigInt(gas)
+  if (isHex(data) && data !== '0x') transaction.data = data
+  if (isHex(nonce) && nonce !== '0x') transaction.nonce = hexToNumber(nonce)
+  if (isHex(value) && value !== '0x') transaction.value = hexToBigInt(value)
+  if (isHex(feeCurrency) && feeCurrency !== '0x')
+    transaction.feeCurrency = feeCurrency
+  if (isHex(maxFeePerGas) && maxFeePerGas !== '0x')
+    transaction.maxFeePerGas = hexToBigInt(maxFeePerGas)
+  if (isHex(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
+    transaction.maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGas)
+  if (accessList.length !== 0 && accessList !== '0x')
+    transaction.accessList = parseAccessList(accessList as RecursiveArray<Hex>)
+
+  assertTransactionCIP64(transaction as TransactionSerializableCIP64)
+
+  return transaction as TransactionSerializableCIP64
+}

package/chains/celo/serializers.ts

@@ -18,21 +18,27 @@ import {
 import type {
   CeloTransactionSerializable,
   TransactionSerializableCIP42,
+  TransactionSerializableCIP64,
   TransactionSerializedCIP42,
+  TransactionSerializedCIP64,
 } from './types.js'
 
 export const serializeTransactionCelo: SerializeTransactionFn<
   CeloTransactionSerializable
 > = (tx, signature) => {
-  // Handle CIP-42 transactions
-  if (isCIP42(tx))
+  if (isCIP64(tx)) {
+    return serializeTransactionCIP64(
+      tx as TransactionSerializableCIP64,
+      signature,
+    )
+  } else if (isCIP42(tx)) {
     return serializeTransactionCIP42(
       tx as TransactionSerializableCIP42,
       signature,
     )
-
-  // Handle other transaction types
-  return serializeTransaction(tx as TransactionSerializable, signature)
+  } else {
+    return serializeTransaction(tx as TransactionSerializable, signature)
+  }
 }
 
 export const serializersCelo = {
@@ -43,6 +49,7 @@ export const serializersCelo = {
 // Serializers
 
 export type SerializeTransactionCIP42ReturnType = TransactionSerializedCIP42
+export type SerializeTransactionCIP64ReturnType = TransactionSerializedCIP64
 
 // There shall be a typed transaction with the code 0x7c that has the following format:
 // 0x7c || rlp([chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, feecurrency, gatewayFeeRecipient, gatewayfee, destination, amount, data, access_list, signature_y_parity, signature_r, signature_s]).
@@ -96,20 +103,83 @@ function serializeTransactionCIP42(
   ]) as SerializeTransactionCIP42ReturnType
 }
 
+function serializeTransactionCIP64(
+  transaction: TransactionSerializableCIP64,
+  signature?: Signature,
+): SerializeTransactionCIP64ReturnType {
+  assertTransactionCIP64(transaction)
+  const {
+    chainId,
+    gas,
+    nonce,
+    to,
+    value,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    accessList,
+    feeCurrency,
+    data,
+  } = transaction
+
+  const serializedTransaction = [
+    toHex(chainId),
+    nonce ? toHex(nonce) : '0x',
+    maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
+    maxFeePerGas ? toHex(maxFeePerGas) : '0x',
+    gas ? toHex(gas) : '0x',
+    to ?? '0x',
+    value ? toHex(value) : '0x',
+    data ?? '0x',
+    serializeAccessList(accessList),
+    feeCurrency ?? '0x',
+  ]
+
+  if (signature) {
+    serializedTransaction.push(
+      signature.v === 27n ? '0x' : toHex(1), // yParity
+      trim(signature.r),
+      trim(signature.s),
+    )
+  }
+
+  return concatHex([
+    '0x7b',
+    toRlp(serializedTransaction),
+  ]) 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) {
-  if (
+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)
   )
-    return true
-  return false
+}
+
+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
@@ -167,3 +237,45 @@ export function assertTransactionCIP42(
     )
   }
 }
+
+export function assertTransactionCIP64(
+  transaction: TransactionSerializableCIP64,
+) {
+  const {
+    chainId,
+    maxPriorityFeePerGas,
+    gasPrice,
+    maxFeePerGas,
+    to,
+    feeCurrency,
+  } = transaction
+
+  if (chainId <= 0) throw new InvalidChainIdError({ chainId })
+  if (to && !isAddress(to)) throw new InvalidAddressError({ address: to })
+
+  if (gasPrice)
+    throw new BaseError(
+      '`gasPrice` is not a valid CIP-64 Transaction attribute.',
+    )
+
+  if (maxFeePerGas && maxFeePerGas > MAX_MAX_FEE_PER_GAS)
+    throw new FeeCapTooHighError({ maxFeePerGas })
+  if (
+    maxPriorityFeePerGas &&
+    maxFeePerGas &&
+    maxPriorityFeePerGas > maxFeePerGas
+  )
+    throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas })
+
+  if (feeCurrency && !feeCurrency?.startsWith('0x')) {
+    throw new BaseError(
+      '`feeCurrency` MUST be a token address for CIP-64 transactions.',
+    )
+  }
+
+  if (!feeCurrency) {
+    throw new BaseError(
+      '`feeCurrency` must be provided for CIP-64 transactions.',
+    )
+  }
+}

package/chains/celo/types.ts

@@ -75,6 +75,7 @@ export type CeloRpcBlock<
 export type CeloRpcTransaction<TPending extends boolean = boolean> =
   | RpcTransaction<TPending>
   | RpcTransactionCIP42<TPending>
+  | RpcTransactionCIP64<TPending>
 
 export type CeloRpcTransactionReceiptOverrides = {
   feeCurrency: Address | null
@@ -87,10 +88,12 @@ export type CeloRpcTransactionReceipt = RpcTransactionReceipt &
 export type CeloRpcTransactionRequest =
   | RpcTransactionRequest
   | RpcTransactionRequestCIP42
+  | RpcTransactionRequestCIP64
 
 export type CeloTransaction<TPending extends boolean = boolean> =
   | Transaction<TPending>
   | TransactionCIP42<TPending>
+  | TransactionCIP64<TPending>
 
 export type CeloTransactionReceiptOverrides = {
   feeCurrency: Address | null
@@ -103,16 +106,21 @@ export type CeloTransactionReceipt = TransactionReceipt &
 export type CeloTransactionRequest =
   | TransactionRequest
   | TransactionRequestCIP42
+  | TransactionRequestCIP64
 
 export type CeloTransactionSerializable =
   | TransactionSerializableCIP42
+  | TransactionSerializableCIP64
   | TransactionSerializable
 
 export type CeloTransactionSerialized<
   TType extends CeloTransactionType = 'legacy',
-> = TransactionSerialized<TType> | TransactionSerializedCIP42
+> =
+  | TransactionSerialized<TType>
+  | TransactionSerializedCIP42
+  | TransactionSerializedCIP64
 
-export type CeloTransactionType = TransactionType | 'cip42'
+export type CeloTransactionType = TransactionType | 'cip42' | 'cip64'
 
 type RpcTransaction<TPending extends boolean = boolean> =
   RpcTransaction_<TPending> & {
@@ -136,6 +144,13 @@ export type RpcTransactionCIP42<TPending extends boolean = boolean> =
       type: '0x7c'
     }
 
+export type RpcTransactionCIP64<TPending extends boolean = boolean> =
+  TransactionBase<Quantity, Index, TPending> &
+    FeeValuesEIP1559<Quantity> & {
+      feeCurrency: Address | null
+      type: '0x7b'
+    }
+
 export type RpcTransactionRequestCIP42 = TransactionRequestBase<
   Quantity,
   Index
@@ -148,6 +163,18 @@ export type RpcTransactionRequestCIP42 = TransactionRequestBase<
     type?: '0x7c'
   }
 
+export type RpcTransactionRequestCIP64 = TransactionRequestBase<
+  Quantity,
+  Index
+> &
+  Partial<FeeValuesEIP1559<Quantity>> & {
+    accessList?: AccessList
+    feeCurrency?: Address
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
+    type?: '0x7b'
+  }
+
 type Transaction<TPending extends boolean = boolean> = Transaction_<
   bigint,
   number,
@@ -167,6 +194,15 @@ export type TransactionCIP42<TPending extends boolean = boolean> =
       type: 'cip42'
     }
 
+export type TransactionCIP64<TPending extends boolean = boolean> =
+  TransactionBase<bigint, number, TPending> &
+    FeeValuesEIP1559 & {
+      feeCurrency: Address | null
+      gatewayFee?: undefined
+      gatewayFeeRecipient?: undefined
+      type: 'cip64'
+    }
+
 type TransactionRequest = TransactionRequest_ & {
   feeCurrency?: Address
   gatewayFee?: bigint
@@ -182,6 +218,15 @@ export type TransactionRequestCIP42 = TransactionRequestBase &
     type?: 'cip42'
   }
 
+export type TransactionRequestCIP64 = TransactionRequestBase &
+  Partial<FeeValuesEIP1559> & {
+    accessList?: AccessList
+    feeCurrency?: Address
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
+    type?: 'cip64'
+  }
+
 export type TransactionSerializableCIP42<
   TQuantity = bigint,
   TIndex = number,
@@ -196,4 +241,17 @@ export type TransactionSerializableCIP42<
     type?: 'cip42'
   }
 
+export type TransactionSerializableCIP64<
+  TQuantity = bigint,
+  TIndex = number,
+> = TransactionSerializableBase<TQuantity, TIndex> &
+  FeeValuesEIP1559<TQuantity> & {
+    accessList?: AccessList
+    gasPrice?: never
+    feeCurrency?: Address
+    chainId: number
+    type?: 'cip64'
+  }
+
 export type TransactionSerializedCIP42 = `0x7c${string}`
+export type TransactionSerializedCIP64 = `0x7b${string}`

package/chains/definitions/arbitrum.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const arbitrum = /*#__PURE__*/ defineChain({
   id: 42_161,

package/chains/definitions/arbitrumGoerli.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const arbitrumGoerli = /*#__PURE__*/ defineChain({
   id: 421_613,
@@ -14,7 +14,8 @@ export const arbitrumGoerli = /*#__PURE__*/ defineChain({
     },
   },
   blockExplorers: {
-    default: { name: 'Arbiscan', url: 'https://goerli.arbiscan.io/' },
+    etherscan: { name: 'Arbiscan', url: 'https://goerli.arbiscan.io' },
+    default: { name: 'Arbiscan', url: 'https://goerli.arbiscan.io' },
   },
   contracts: {
     multicall3: {

package/chains/definitions/arbitrumNova.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const arbitrumNova = /*#__PURE__*/ defineChain({
   id: 42_170,

package/chains/definitions/arbitrumSepolia.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const arbitrumSepolia = /*#__PURE__*/ defineChain({
   id: 421_614,

package/chains/definitions/astarZkatana.ts

@@ -0,0 +1,39 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const astarZkatana = /*#__PURE__*/ defineChain({
+  id: 1_261_120,
+  name: 'Astar zkEVM Testnet zKatana',
+  network: 'zKatana',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: [
+        'https://rpc.zkatana.gelato.digital',
+        'https://rpc.startale.com/zkatana',
+      ],
+    },
+    public: {
+      http: [
+        'https://rpc.zkatana.gelato.digital',
+        'https://rpc.startale.com/zkatana',
+      ],
+    },
+  },
+  blockExplorers: {
+    blockscout: {
+      name: 'Blockscout zKatana chain explorer',
+      url: 'https://zkatana.blockscout.com',
+    },
+    default: {
+      name: 'zKatana Explorer',
+      url: 'https://zkatana.explorer.startale.com',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xca11bde05977b3631167028862be2a173976ca11',
+      blockCreated: 31317,
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/aurora.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const aurora = /*#__PURE__*/ defineChain({
   id: 1313161554,

package/chains/definitions/auroraTestnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const auroraTestnet = /*#__PURE__*/ defineChain({
   id: 1313161555,

package/chains/definitions/avalanche.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const avalanche = /*#__PURE__*/ defineChain({
   id: 43_114,

package/chains/definitions/avalancheFuji.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const avalancheFuji = /*#__PURE__*/ defineChain({
   id: 43_113,

package/chains/definitions/base.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const base = /*#__PURE__*/ defineChain(

package/chains/definitions/baseGoerli.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 import { formattersOptimism } from '../optimism/formatters.js'
 
 export const baseGoerli = /*#__PURE__*/ defineChain(

package/chains/definitions/baseSepolia.ts

@@ -0,0 +1,34 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+import { formattersOptimism } from '../optimism/formatters.js'
+
+export const baseSepolia = /*#__PURE__*/ defineChain(
+  {
+    id: 84532,
+    network: 'base-sepolia',
+    name: 'Base Sepolia',
+    nativeCurrency: { name: 'Sepolia Ether', symbol: 'ETH', decimals: 18 },
+    rpcUrls: {
+      default: {
+        http: ['https://sepolia.base.org'],
+      },
+      public: {
+        http: ['https://sepolia.base.org'],
+      },
+    },
+    blockExplorers: {
+      blockscout: {
+        name: 'Blockscout',
+        url: 'https://base-sepolia.blockscout.com',
+      },
+      default: {
+        name: 'Blockscout',
+        url: 'https://base-sepolia.blockscout.com',
+      },
+    },
+    testnet: true,
+    sourceId: 11155111, // sepolia
+  },
+  {
+    formatters: formattersOptimism,
+  },
+)

package/chains/definitions/bearNetworkChainMainnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bearNetworkChainMainnet = /*#__PURE__*/ defineChain({
   id: 641230,

package/chains/definitions/bearNetworkChainTestnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bearNetworkChainTestnet = /*#__PURE__*/ defineChain({
   id: 751230,

package/chains/definitions/boba.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const boba = /*#__PURE__*/ defineChain({
   id: 288,

package/chains/definitions/bronos.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bronos = /*#__PURE__*/ defineChain({
   id: 1039,

package/chains/definitions/bronosTestnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bronosTestnet = /*#__PURE__*/ defineChain({
   id: 1038,

package/chains/definitions/bsc.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bsc = /*#__PURE__*/ defineChain({
   id: 56,

package/chains/definitions/bscTestnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bscTestnet = /*#__PURE__*/ defineChain({
   id: 97,

package/chains/definitions/bxn.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bxn = /*#__PURE__*/ defineChain({
   id: 4999,

package/chains/definitions/bxnTestnet.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const bxnTestnet = /*#__PURE__*/ defineChain({
   id: 4777,

package/chains/definitions/canto.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const canto = /*#__PURE__*/ defineChain({
   id: 7_700,

package/chains/definitions/celo.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 import { formattersCelo } from '../celo/formatters.js'
 import { serializersCelo } from '../celo/serializers.js'
 

package/chains/definitions/celoAlfajores.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 import { formattersCelo } from '../celo/formatters.js'
 import { serializersCelo } from '../celo/serializers.js'
 

package/chains/definitions/celoCannoli.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 import { formattersCelo } from '../celo/formatters.js'
 import { serializersCelo } from '../celo/serializers.js'
 

package/chains/definitions/classic.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const classic = /*#__PURE__*/ defineChain({
   id: 61,

package/chains/definitions/confluxESpace.ts

@@ -1,4 +1,4 @@
-import { defineChain } from '../../utils/chain.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const confluxESpace = /*#__PURE__*/ defineChain({
   id: 1_030,