viem 2.0.0-beta.9 → 2.0.0-rc.1

package/actions/wallet/prepareTransactionRequest.ts

@@ -43,11 +43,16 @@ import type {
 import { assertRequest } from '../../utils/transaction/assertRequest.js'
 import { getTransactionType } from '../../utils/transaction/getTransactionType.js'
 
-export type ParameterType = 'fees' | 'gas' | 'nonce' | 'type'
-type ParameterTypeToParameters<TParameterType extends ParameterType> =
-  TParameterType extends 'fees'
-    ? 'maxFeePerGas' | 'maxPriorityFeePerGas' | 'gasPrice'
-    : TParameterType
+export type PrepareTransactionRequestParameterType =
+  | 'fees'
+  | 'gas'
+  | 'nonce'
+  | 'type'
+type ParameterTypeToParameters<
+  TParameterType extends PrepareTransactionRequestParameterType,
+> = TParameterType extends 'fees'
+  ? 'maxFeePerGas' | 'maxPriorityFeePerGas' | 'gasPrice'
+  : TParameterType
 
 export type PrepareTransactionRequestParameters<
   TChain extends Chain | undefined = Chain | undefined,
@@ -57,7 +62,8 @@ export type PrepareTransactionRequestParameters<
     | Account
     | Address
     | undefined,
-  TParameterType extends ParameterType = ParameterType,
+  TParameterType extends
+    PrepareTransactionRequestParameterType = PrepareTransactionRequestParameterType,
   ///
   derivedChain extends Chain | undefined = DeriveChain<TChain, TChainOverride>,
 > = UnionOmit<FormattedTransactionRequest<derivedChain>, 'from'> &
@@ -74,9 +80,10 @@ export type PrepareTransactionRequestReturnType<
     | Account
     | Address
     | undefined,
-  TParameterType extends ParameterType = ParameterType,
+  TParameterType extends
+    PrepareTransactionRequestParameterType = PrepareTransactionRequestParameterType,
   ///
-  derivedAccount extends Account | undefined = DeriveAccount<
+  derivedAccount extends Account | Address | undefined = DeriveAccount<
     TAccount,
     TAccountOverride
   >,
@@ -142,7 +149,7 @@ export type PrepareTransactionRequestErrorType =
 export async function prepareTransactionRequest<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
-  TParameterType extends ParameterType,
+  TParameterType extends PrepareTransactionRequestParameterType,
   TAccountOverride extends Account | Address | undefined = undefined,
   TChainOverride extends Chain | undefined = undefined,
 >(

package/chains/celo/formatters.ts

@@ -8,15 +8,12 @@ import {
   defineTransaction,
   formatTransaction,
 } from '../../utils/formatters/transaction.js'
-import { defineTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
 import { defineTransactionRequest } from '../../utils/formatters/transactionRequest.js'
 import type {
   CeloBlockOverrides,
   CeloRpcTransaction,
-  CeloRpcTransactionReceiptOverrides,
   CeloRpcTransactionRequest,
   CeloTransaction,
-  CeloTransactionReceiptOverrides,
   CeloTransactionRequest,
 } from './types.js'
 import { isCIP42, isCIP64 } from './utils.js'
@@ -69,17 +66,6 @@ export const formatters = {
       return transaction
     },
   }),
-  transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
-    format(
-      args: CeloRpcTransactionReceiptOverrides,
-    ): CeloTransactionReceiptOverrides {
-      return {
-        feeCurrency: args.feeCurrency,
-        gatewayFee: args.gatewayFee ? hexToBigInt(args.gatewayFee) : null,
-        gatewayFeeRecipient: args.gatewayFeeRecipient,
-      }
-    },
-  }),
 
   transactionRequest: /*#__PURE__*/ defineTransactionRequest({
     format(args: CeloTransactionRequest): CeloRpcTransactionRequest {

package/chains/celo/index.ts

@@ -10,12 +10,8 @@ export type {
   CeloRpcBlock,
   CeloRpcBlockOverrides,
   CeloRpcTransaction,
-  CeloRpcTransactionReceipt,
-  CeloRpcTransactionReceiptOverrides,
   CeloRpcTransactionRequest,
   CeloTransaction,
-  CeloTransactionReceipt,
-  CeloTransactionReceiptOverrides,
   CeloTransactionRequest,
   CeloTransactionSerializable,
   CeloTransactionSerialized,

package/chains/celo/types.ts

@@ -8,7 +8,6 @@ import type {
   Quantity,
   RpcBlock,
   RpcTransaction as RpcTransaction_,
-  RpcTransactionReceipt,
   RpcTransactionRequest as RpcTransactionRequest_,
   TransactionType,
 } from '../../types/rpc.js'
@@ -16,7 +15,6 @@ import type {
   AccessList,
   Transaction as Transaction_,
   TransactionBase,
-  TransactionReceipt,
   TransactionRequest as TransactionRequest_,
   TransactionRequestBase,
   TransactionSerializable,
@@ -76,14 +74,6 @@ export type CeloRpcTransaction<TPending extends boolean = boolean> =
   | RpcTransactionCIP42<TPending>
   | RpcTransactionCIP64<TPending>
 
-export type CeloRpcTransactionReceiptOverrides = {
-  feeCurrency: Address | null
-  gatewayFee: Hex | null
-  gatewayFeeRecipient: Address | null
-}
-export type CeloRpcTransactionReceipt = RpcTransactionReceipt &
-  CeloRpcTransactionReceiptOverrides
-
 export type CeloRpcTransactionRequest =
   | RpcTransactionRequest
   | RpcTransactionRequestCIP42
@@ -94,14 +84,6 @@ export type CeloTransaction<TPending extends boolean = boolean> =
   | TransactionCIP42<TPending>
   | TransactionCIP64<TPending>
 
-export type CeloTransactionReceiptOverrides = {
-  feeCurrency: Address | null
-  gatewayFee: bigint | null
-  gatewayFeeRecipient: Address | null
-}
-export type CeloTransactionReceipt = TransactionReceipt &
-  CeloTransactionReceiptOverrides
-
 export type CeloTransactionRequest =
   | TransactionRequest
   | TransactionRequestCIP42

package/chains/definitions/arbitrumSepolia.ts

@@ -9,6 +9,10 @@ export const arbitrumSepolia = /*#__PURE__*/ defineChain({
     decimals: 18,
   },
   rpcUrls: {
+    alchemy: {
+      http: ['https://arb-sepolia.g.alchemy.com/v2'],
+      webSocket: ['wss://arb-sepolia.g.alchemy.com/v2'],
+    },
     default: {
       http: ['https://sepolia-rollup.arbitrum.io/rpc'],
     },

package/chains/definitions/astar.ts

@@ -10,7 +10,6 @@ export const astar = /*#__PURE__*/ defineChain({
     decimals: 18,
   },
   rpcUrls: {
-    public: { http: ['https://astar.api.onfinality.io/public'] },
     default: { http: ['https://astar.api.onfinality.io/public'] },
   },
   blockExplorers: {

package/chains/definitions/astarZkatana.ts

@@ -12,12 +12,6 @@ export const astarZkatana = /*#__PURE__*/ defineChain({
         'https://rpc.startale.com/zkatana',
       ],
     },
-    public: {
-      http: [
-        'https://rpc.zkatana.gelato.digital',
-        'https://rpc.startale.com/zkatana',
-      ],
-    },
   },
   blockExplorers: {
     blockscout: {

package/chains/definitions/base.ts

@@ -21,6 +21,11 @@ export const base = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x56315b90c40730925ec5485cf004d835058518A0',
+      },
+    },
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 5022,

package/chains/definitions/baseGoerli.ts

@@ -19,6 +19,11 @@ export const baseGoerli = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x2A35891ff30313CcFa6CE88dcf3858bb075A2298',
+      },
+    },
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1376988,

package/chains/definitions/baseSepolia.ts

@@ -13,9 +13,6 @@ export const baseSepolia = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://sepolia.base.org'],
     },
-    public: {
-      http: ['https://sepolia.base.org'],
-    },
   },
   blockExplorers: {
     blockscout: {
@@ -29,6 +26,11 @@ export const baseSepolia = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x84457ca9D0163FbC4bbfe4Dfbb20ba46e48DF254',
+      },
+    },
     portal: {
       [sourceId]: {
         address: '0x49f53e41452c74589e85ca1677426ba426459e85',

package/chains/definitions/bscTestnet.ts

@@ -10,7 +10,6 @@ export const bscTestnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     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/confluxESpaceTestnet.ts

@@ -11,10 +11,6 @@ export const confluxESpaceTestnet = /*#__PURE__*/ defineChain({
       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: {

package/chains/definitions/fantomSonicTestnet.ts

@@ -0,0 +1,22 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const fantomSonicTestnet = /*#__PURE__*/ defineChain({
+  id: 64_240,
+  name: 'Fantom Sonic Open Testnet',
+  network: 'fantom-sonic-testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Fantom',
+    symbol: 'FTM',
+  },
+  rpcUrls: {
+    default: { http: ['https://rpcapi.sonic.fantom.network'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Fantom Sonic Open Testnet Explorer',
+      url: 'https://public-sonic.fantom.network',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/kava.ts

@@ -10,7 +10,6 @@ export const kava = /*#__PURE__*/ defineChain({
     decimals: 18,
   },
   rpcUrls: {
-    public: { http: ['https://evm.kava.io'] },
     default: { http: ['https://evm.kava.io'] },
   },
   blockExplorers: {

package/chains/definitions/kavaTestnet.ts

@@ -10,7 +10,6 @@ export const kavaTestnet = /*#__PURE__*/ defineChain({
     decimals: 18,
   },
   rpcUrls: {
-    public: { http: ['https://evm.testnet.kava.io'] },
     default: { http: ['https://evm.testnet.kava.io'] },
   },
   blockExplorers: {

package/chains/definitions/klaytnBaobab.ts

@@ -11,7 +11,6 @@ export const klaytnBaobab = /*#__PURE__*/ defineChain({
   },
   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' },

package/chains/definitions/lukso.ts

@@ -14,10 +14,6 @@ export const lukso = /*#__PURE__*/ defineChain({
       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: {

package/chains/definitions/manta.ts

@@ -11,7 +11,6 @@ export const manta = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://pacific-rpc.manta.network/http'] },
-    public: { http: ['https://pacific-rpc.manta.network/http'] },
   },
   blockExplorers: {
     etherscan: {

package/chains/definitions/mantaTestnet.ts

@@ -11,7 +11,6 @@ export const mantaTestnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://manta-testnet.calderachain.xyz/http'] },
-    public: { http: ['https://manta-testnet.calderachain.xyz/http'] },
   },
   blockExplorers: {
     etherscan: {

package/chains/definitions/neonMainnet.ts

@@ -9,9 +9,6 @@ export const neonMainnet = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://neon-proxy-mainnet.solana.p2p.org'],
     },
-    public: {
-      http: ['https://neon-proxy-mainnet.solana.p2p.org'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/optimism.ts

@@ -21,6 +21,11 @@ export const optimism = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0xdfe97868233d1aa22e815a266982f2cf17685a27',
+      },
+    },
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 4286263,

package/chains/definitions/optimismGoerli.ts

@@ -21,6 +21,11 @@ export const optimismGoerli = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0xE6Dfba0953616Bacab0c9A8ecb3a9BBa77FC15c0',
+      },
+    },
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 49461,

package/chains/definitions/optimismSepolia.ts

@@ -21,6 +21,11 @@ export const optimismSepolia = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x90E9c4f8a994a250F6aEfd61CAFb4F2e895D458F',
+      },
+    },
     multicall3: {
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1620204,

package/chains/definitions/pgn.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { formatters } from '../opStack/formatters.js'
 
+const sourceId = 1 // mainnet
+
 export const pgn = /*#__PURE__*/ defineChain({
   id: 424,
   network: 'pgn',
@@ -10,9 +12,6 @@ export const pgn = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://rpc.publicgoods.network'],
     },
-    public: {
-      http: ['https://rpc.publicgoods.network'],
-    },
   },
   blockExplorers: {
     default: {
@@ -25,10 +24,21 @@ export const pgn = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x9E6204F750cD866b299594e2aC9eA824E2e5f95c',
+      },
+    },
     multicall3: {
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 3380209,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xb26Fd985c5959bBB382BAFdD0b879E149e48116c',
+      },
+    },
   },
   formatters,
+  sourceId,
 })

package/chains/definitions/pgnTestnet.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { formatters } from '../opStack/formatters.js'
 
+const sourceId = 11_155_111 // sepolia
+
 export const pgnTestnet = /*#__PURE__*/ defineChain({
   id: 58008,
   network: 'pgn-testnet',
@@ -10,9 +12,6 @@ export const pgnTestnet = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://sepolia.publicgoods.network'],
     },
-    public: {
-      http: ['https://sepolia.publicgoods.network'],
-    },
   },
   blockExplorers: {
     default: {
@@ -25,11 +24,17 @@ export const pgnTestnet = /*#__PURE__*/ defineChain({
     },
   },
   contracts: {
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0xD5bAc3152ffC25318F848B3DD5dA6C85171BaEEe',
+      },
+    },
     multicall3: {
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 3754925,
     },
   },
   formatters,
+  sourceId,
   testnet: true,
 })

package/chains/definitions/rootstock.ts

@@ -10,7 +10,6 @@ export const rootstock = /*#__PURE__*/ defineChain({
     symbol: 'RBTC',
   },
   rpcUrls: {
-    public: { http: ['https://public-node.rsk.co'] },
     default: { http: ['https://public-node.rsk.co'] },
   },
   blockExplorers: {

package/chains/definitions/sapphire.ts

@@ -10,10 +10,6 @@ export const sapphire = /*#__PURE__*/ defineChain({
       http: ['https://sapphire.oasis.io'],
       webSocket: ['wss://sapphire.oasis.io/ws'],
     },
-    public: {
-      http: ['https://sapphire.oasis.io'],
-      webSocket: ['wss://sapphire.oasis.io/ws'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/sapphireTestnet.ts

@@ -10,10 +10,6 @@ export const sapphireTestnet = /*#__PURE__*/ defineChain({
       http: ['https://testnet.sapphire.oasis.dev'],
       webSocket: ['wss://testnet.sapphire.oasis.dev/ws'],
     },
-    public: {
-      http: ['https://testnet.sapphire.oasis.dev'],
-      webSocket: ['wss://testnet.sapphire.oasis.dev/ws'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/shibarium.ts

@@ -9,9 +9,6 @@ export const shibarium = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://rpc.shibrpc.com'],
     },
-    public: {
-      http: ['https://rpc.shibrpc.com'],
-    },
   },
   blockExplorers: {
     etherscan: {

package/chains/definitions/shimmer.ts

@@ -10,9 +10,6 @@ export const shimmer = /*#__PURE__*/ defineChain({
     symbol: 'SMR',
   },
   rpcUrls: {
-    public: {
-      http: ['https://json-rpc.evm.shimmer.network'],
-    },
     default: {
       http: ['https://json-rpc.evm.shimmer.network'],
     },

package/chains/definitions/shimmerTestnet.ts

@@ -10,9 +10,6 @@ export const shimmerTestnet = /*#__PURE__*/ defineChain({
     symbol: 'SMR',
   },
   rpcUrls: {
-    public: {
-      http: ['https://json-rpc.evm.testnet.shimmer.network'],
-    },
     default: {
       http: ['https://json-rpc.evm.testnet.shimmer.network'],
     },

package/chains/definitions/taikoJolnir.ts

@@ -2,11 +2,11 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const taikoJolnir = /*#__PURE__*/ defineChain({
   id: 167007,
-  name: 'Taiko Jolnir L2',
+  name: 'Taiko Jolnir (Alpha-5 Testnet)',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
   rpcUrls: {
     default: {
-      http: ['https://jolnir.taiko.xyz'],
+      http: ['https://rpc.jolnir.taiko.xyz'],
     },
   },
   blockExplorers: {

package/chains/definitions/tenet.ts

@@ -10,7 +10,6 @@ export const tenet = /*#__PURE__*/ defineChain({
     decimals: 18,
   },
   rpcUrls: {
-    public: { http: ['https://rpc.tenet.org'] },
     default: { http: ['https://rpc.tenet.org'] },
   },
   blockExplorers: {

package/chains/definitions/zilliqa.ts

@@ -0,0 +1,20 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const zilliqa = /*#__PURE__*/ defineChain({
+  id: 32769,
+  name: 'Zilliqa',
+  network: 'zilliqa',
+  nativeCurrency: { name: 'Zilliqa', symbol: 'ZIL', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://api.zilliqa.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Ethernal',
+      url: 'https://evmx.zilliqa.com',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/zilliqaTestnet.ts

@@ -0,0 +1,20 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const zilliqaTestnet = /*#__PURE__*/ defineChain({
+  id: 33101,
+  name: 'Zilliqa Testnet',
+  network: 'zilliqa-testnet',
+  nativeCurrency: { name: 'Zilliqa', symbol: 'ZIL', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://dev-api.zilliqa.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Ethernal',
+      url: 'https://evmx.testnet.zilliqa.com',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/zkSyncSepoliaTestnet.ts

@@ -0,0 +1,28 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+import { chainConfig } from '../zksync/chainConfig.js'
+
+export const zkSyncSepoliaTestnet = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 300,
+  name: 'zkSync Sepolia Testnet',
+  network: 'zksync-sepolia-testnet',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://sepolia.era.zksync.dev'],
+      webSocket: ['wss://sepolia.era.zksync.dev/ws'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'zkExplorer',
+      url: 'https://sepolia.explorer.zksync.io/',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xF9cda624FBC7e059355ce98a31693d299FACd963',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/zkSyncTestnet.ts

@@ -1,6 +1,7 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../zksync/chainConfig.js'
 
+/** @deprecated Use `zkSyncSepoliaTestnet` */
 export const zkSyncTestnet = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 280,

package/chains/definitions/zora.ts

@@ -23,6 +23,11 @@ export const zora = /*#__PURE__*/ defineChain({
   },
   contracts: {
     ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x9E6204F750cD866b299594e2aC9eA824E2e5f95c',
+      },
+    },
     multicall3: {
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 5882,