viem 2.0.0-beta.1 → 2.0.0-beta.10

package/chains/celo/formatters.ts

@@ -21,7 +21,7 @@ import type {
 } from './types.js'
 import { isCIP42, isCIP64 } from './utils.js'
 
-export const formattersCelo = {
+export const formatters = {
   block: /*#__PURE__*/ defineBlock({
     exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
     format(
@@ -36,7 +36,6 @@ export const formattersCelo = {
         return {
           ...formatTransaction(transaction as RpcTransaction),
           feeCurrency: transaction.feeCurrency,
-
           ...(transaction.type !== '0x7b'
             ? {
                 gatewayFee: transaction.gatewayFee

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,
@@ -24,20 +24,16 @@ import type {
 } from './types.js'
 import { isCIP42, isCIP64, isEmpty, isPresent } from './utils.js'
 
-export const serializeTransactionCelo: SerializeTransactionFn<
+export const serializeTransaction: SerializeTransactionFn<
   CeloTransactionSerializable | TransactionSerializable
 > = (tx, signature) => {
-  if (isCIP64(tx)) {
-    return serializeTransactionCIP64(tx, signature)
-  } else if (isCIP42(tx)) {
-    return serializeTransactionCIP42(tx, 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
 
 //////////////////////////////////////////////////////////////////////////////
@@ -231,7 +227,7 @@ export function assertTransactionCIP64(
   )
     throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas })
 
-  if (isPresent(feeCurrency) && !feeCurrency?.startsWith('0x')) {
+  if (isPresent(feeCurrency) && !isAddress(feeCurrency)) {
     throw new BaseError(
       '`feeCurrency` MUST be a token address for CIP-64 transactions.',
     )

package/chains/celo/types.ts

@@ -151,6 +151,8 @@ export type RpcTransactionCIP64<TPending extends boolean = boolean> = Omit<
 > &
   FeeValuesEIP1559<Quantity> & {
     feeCurrency: Address | null
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
     type: '0x7b'
   }
 

package/chains/celo/utils.ts

@@ -43,7 +43,9 @@ 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) return transaction.type === 'cip42'
+  if (transaction.type === 'cip42') {
+    return true
+  }
 
   return (
     isEIP1559(transaction) &&
@@ -56,8 +58,19 @@ export function isCIP42(
 export function isCIP64(
   transaction: CeloTransactionSerializable | CeloTransactionRequest,
 ): transaction is TransactionSerializableCIP64 {
-  // Enable end-user to force the tx to be considered as a cip64
-  if (transaction.type) return transaction.type === 'cip64'
+  /*
+   * 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) &&

package/chains/definitions/aurora.ts

@@ -14,4 +14,10 @@ export const aurora = /*#__PURE__*/ defineChain({
   blockExplorers: {
     default: { name: 'Aurorascan', url: 'https://aurorascan.dev' },
   },
+  contracts: {
+    multicall3: {
+      address: '0xca11bde05977b3631167028862be2a173976ca11',
+      blockCreated: 62907816,
+    },
+  },
 })

package/chains/definitions/base.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 1 // mainnet
 
 export const base = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 8453,
   name: 'Base',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
@@ -17,10 +20,17 @@ export const base = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    ...chainConfig.contracts,
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 5022,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x49048044D57e1C92A77f79988d21Fa8fAF74E97e',
+        blockCreated: 17482143,
+      },
+    },
   },
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/baseGoerli.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 5 // goerli
 
 export const baseGoerli = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 84531,
   name: 'Base Goerli',
   nativeCurrency: { name: 'Goerli Ether', symbol: 'ETH', decimals: 18 },
@@ -15,12 +18,17 @@ export const baseGoerli = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    ...chainConfig.contracts,
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1376988,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA',
+      },
+    },
   },
   testnet: true,
-  sourceId: 5, // goerli
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/baseSepolia.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 11_155_111 // sepolia
 
 export const baseSepolia = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 84532,
   network: 'base-sepolia',
   name: 'Base Sepolia',
@@ -24,7 +27,15 @@ export const baseSepolia = /*#__PURE__*/ defineChain({
       url: 'https://base-sepolia.blockscout.com',
     },
   },
+  contracts: {
+    ...chainConfig.contracts,
+    portal: {
+      [sourceId]: {
+        address: '0x49f53e41452c74589e85ca1677426ba426459e85',
+        blockCreated: 4446677,
+      },
+    },
+  },
   testnet: true,
-  sourceId: 11155111, // sepolia
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/bscTestnet.ts

@@ -9,7 +9,8 @@ export const bscTestnet = /*#__PURE__*/ defineChain({
     symbol: 'tBNB',
   },
   rpcUrls: {
-    default: { http: ['https://data-seed-prebsc-1-s1.binance.org:8545'] },
+    default: { http: ['https://data-seed-prebsc-1-s1.bnbchain.org:8545'] },
+    public: { http: ['https://data-seed-prebsc-1-s1.bnbchain.org:8545'] },
   },
   blockExplorers: {
     default: { name: 'BscScan', url: 'https://testnet.bscscan.com' },

package/chains/definitions/celo.ts

@@ -1,8 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersCelo } from '../celo/formatters.js'
-import { serializersCelo } from '../celo/serializers.js'
+import { chainConfig } from '../celo/chainConfig.js'
 
 export const celo = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 42_220,
   name: 'Celo',
   nativeCurrency: {
@@ -26,6 +26,4 @@ export const celo = /*#__PURE__*/ defineChain({
     },
   },
   testnet: false,
-  formatters: formattersCelo,
-  serializers: serializersCelo,
 })

package/chains/definitions/celoAlfajores.ts

@@ -1,8 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersCelo } from '../celo/formatters.js'
-import { serializersCelo } from '../celo/serializers.js'
+import { chainConfig } from '../celo/chainConfig.js'
 
 export const celoAlfajores = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 44_787,
   name: 'Alfajores',
   nativeCurrency: {
@@ -28,6 +28,4 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({
     },
   },
   testnet: true,
-  formatters: formattersCelo,
-  serializers: serializersCelo,
 })

package/chains/definitions/celoCannoli.ts

@@ -1,8 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersCelo } from '../celo/formatters.js'
-import { serializersCelo } from '../celo/serializers.js'
+import { chainConfig } from '../celo/chainConfig.js'
 
 export const celoCannoli = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 17_323,
   name: 'Cannoli',
   nativeCurrency: {
@@ -28,6 +28,4 @@ export const celoCannoli = /*#__PURE__*/ defineChain({
     },
   },
   testnet: true,
-  formatters: formattersCelo,
-  serializers: serializersCelo,
 })

package/chains/definitions/chiliz.ts

@@ -0,0 +1,23 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const chiliz = /*#__PURE__*/ defineChain({
+  id: 88_888,
+  name: 'Chiliz Chain',
+  network: 'chiliz-chain',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'CHZ',
+    symbol: 'CHZ',
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.ankr.com/chiliz', 'https://chiliz.publicnode.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Chiliz Explorer',
+      url: 'https://scan.chiliz.com',
+    },
+  },
+})

package/chains/definitions/confluxESpace.ts

@@ -7,6 +7,7 @@ export const confluxESpace = /*#__PURE__*/ defineChain({
   rpcUrls: {
     default: {
       http: ['https://evm.confluxrpc.org'],
+      webSocket: ['wss://evm.confluxrpc.org/ws'],
     },
   },
   blockExplorers: {

package/chains/definitions/confluxESpaceTestnet.ts

@@ -0,0 +1,31 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const confluxESpaceTestnet = /*#__PURE__*/ defineChain({
+  id: 71,
+  name: 'Conflux eSpace Testnet',
+  network: 'cfx-espace-testnet',
+  testnet: true,
+  nativeCurrency: { name: 'Conflux', symbol: 'CFX', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://evmtestnet.confluxrpc.org'],
+      webSocket: ['wss://evmtestnet.confluxrpc.org/ws'],
+    },
+    public: {
+      http: ['https://evmtestnet.confluxrpc.org'],
+      webSocket: ['wss://evmtestnet.confluxrpc.org/ws'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'ConfluxScan',
+      url: 'https://evmtestnet.confluxscan.io',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xEFf0078910f638cd81996cc117bccD3eDf2B072F',
+      blockCreated: 117499050,
+    },
+  },
+})

package/chains/definitions/filecoin.ts

@@ -14,4 +14,10 @@ export const filecoin = /*#__PURE__*/ defineChain({
   blockExplorers: {
     default: { name: 'Filfox', url: 'https://filfox.info/en' },
   },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 3328594,
+    },
+  },
 })

package/chains/definitions/klaytn.ts

@@ -14,4 +14,10 @@ export const klaytn = /*#__PURE__*/ defineChain({
   blockExplorers: {
     default: { name: 'KlaytnScope', url: 'https://scope.klaytn.com' },
   },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 96002415,
+    },
+  },
 })

package/chains/definitions/klaytnBaobab.ts

@@ -0,0 +1,27 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const klaytnBaobab = /*#__PURE__*/ defineChain({
+  id: 1_001,
+  name: 'Klaytn Baobab Testnet',
+  network: 'klaytn-baobab',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Baobab Klaytn',
+    symbol: 'KLAY',
+  },
+  rpcUrls: {
+    default: { http: ['https://public-en-baobab.klaytn.net'] },
+    public: { http: ['https://public-en-baobab.klaytn.net'] },
+  },
+  blockExplorers: {
+    etherscan: { name: 'KlaytnScope', url: 'https://baobab.klaytnscope.com' },
+    default: { name: 'KlaytnScope', url: 'https://baobab.klaytnscope.com' },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 123390593,
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/lukso.ts

@@ -0,0 +1,28 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const lukso = /*#__PURE__*/ defineChain({
+  id: 42,
+  network: 'lukso',
+  name: 'LUKSO',
+  nativeCurrency: {
+    name: 'LUKSO',
+    symbol: 'LYX',
+    decimals: 18,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.mainnet.lukso.network'],
+      webSocket: ['wss://ws-rpc.mainnet.lukso.network'],
+    },
+    public: {
+      http: ['https://rpc.mainnet.lukso.network'],
+      webSocket: ['wss://ws-rpc.mainnet.lukso.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'LUKSO Mainnet Explorer',
+      url: 'https://explorer.execution.mainnet.lukso.network',
+    },
+  },
+})

package/chains/definitions/optimism.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 1 // mainnet
 
 export const optimism = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 10,
   name: 'OP Mainnet',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
@@ -17,10 +20,16 @@ export const optimism = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    ...chainConfig.contracts,
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 4286263,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xbEb5Fc579115071764c7423A4f12eDde41f106Ed',
+      },
+    },
   },
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/optimismGoerli.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 5 // goerli
 
 export const optimismGoerli = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 420,
   name: 'Optimism Goerli',
   nativeCurrency: { name: 'Goerli Ether', symbol: 'ETH', decimals: 18 },
@@ -17,11 +20,17 @@ export const optimismGoerli = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    ...chainConfig.contracts,
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 49461,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383',
+      },
+    },
   },
   testnet: true,
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/optimismSepolia.ts

@@ -1,7 +1,10 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
+
+const sourceId = 11_155_111 // sepolia
 
 export const optimismSepolia = /*#__PURE__*/ defineChain({
+  ...chainConfig,
   id: 11155420,
   name: 'Optimism Sepolia',
   nativeCurrency: { name: 'Sepolia Ether', symbol: 'ETH', decimals: 18 },
@@ -17,11 +20,17 @@ export const optimismSepolia = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    ...chainConfig.contracts,
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1620204,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x16Fc5058F25648194471939df75CF27A2fdC48BC',
+      },
+    },
   },
   testnet: true,
-  formatters: formattersOptimism,
+  sourceId,
 })

package/chains/definitions/pgn.ts

@@ -0,0 +1,34 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+import { formatters } from '../opStack/formatters.js'
+
+export const pgn = /*#__PURE__*/ defineChain({
+  id: 424,
+  network: 'pgn',
+  name: 'PGN',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.publicgoods.network'],
+    },
+    public: {
+      http: ['https://rpc.publicgoods.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'PGN Explorer',
+      url: 'https://explorer.publicgoods.network',
+    },
+    blocksout: {
+      name: 'PGN Explorer',
+      url: 'https://explorer.publicgoods.network',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 3380209,
+    },
+  },
+  formatters,
+})