viem 0.0.0-main.20240103T193024 → 0.0.0-main.20240103T195854

package/actions/wallet/writeContract.ts

@@ -5,11 +5,19 @@ 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 } from '../../types/chain.js'
-import type { GetChain } from '../../types/chain.js'
-import type { ContractFunctionConfig, GetValue } from '../../types/contract.js'
+import type {
+  Chain,
+  DeriveChain,
+  GetChainParameter,
+} from '../../types/chain.js'
+import type {
+  ContractFunctionArgs,
+  ContractFunctionName,
+  ContractFunctionParameters,
+  GetValue,
+} from '../../types/contract.js'
 import type { Hex } from '../../types/misc.js'
-import type { UnionOmit } from '../../types/utils.js'
+import type { Prettify, UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import {
   type EncodeFunctionDataErrorType,
   type EncodeFunctionDataParameters,
@@ -19,36 +27,52 @@ import type { FormattedTransactionRequest } from '../../utils/formatters/transac
 import { getAction } from '../../utils/getAction.js'
 import {
   type SendTransactionErrorType,
-  type SendTransactionParameters,
   type SendTransactionReturnType,
   sendTransaction,
 } from './sendTransaction.js'
 
 export type WriteContractParameters<
-  TAbi extends Abi | readonly unknown[] = Abi,
-  TFunctionName extends string = string,
-  TChain extends Chain | undefined = Chain,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends Chain | undefined = Chain | undefined,
-> = ContractFunctionConfig<TAbi, TFunctionName, 'payable' | 'nonpayable'> &
-  GetAccountParameter<TAccount> &
-  GetChain<TChain, TChainOverride> &
-  UnionOmit<
-    FormattedTransactionRequest<
-      TChainOverride extends Chain ? TChainOverride : TChain
-    >,
-    'from' | 'to' | 'data' | 'value'
+  abi extends Abi | readonly unknown[] = Abi,
+  functionName extends ContractFunctionName<
+    abi,
+    'nonpayable' | 'payable'
+  > = ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+  args extends ContractFunctionArgs<
+    abi,
+    'nonpayable' | 'payable',
+    functionName
+  > = ContractFunctionArgs<abi, 'nonpayable' | 'payable', functionName>,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+  ///
+  allFunctionNames = ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+  derivedChain extends Chain | undefined = DeriveChain<chain, chainOverride>,
+> = ContractFunctionParameters<
+  abi,
+  'nonpayable' | 'payable',
+  functionName,
+  args,
+  allFunctionNames
+> &
+  GetChainParameter<chain, chainOverride> &
+  Prettify<
+    GetAccountParameter<account> &
+      GetValue<
+        abi,
+        functionName,
+        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
+      }
   > &
-  GetValue<
-    TAbi,
-    TFunctionName,
-    FormattedTransactionRequest<
-      TChainOverride extends Chain ? TChainOverride : TChain
-    >['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
-  }
+  UnionEvaluate<
+    UnionOmit<
+      FormattedTransactionRequest<derivedChain>,
+      'data' | 'from' | 'to' | 'value'
+    >
+  >
 
 export type WriteContractReturnType = SendTransactionReturnType
 
@@ -108,34 +132,31 @@ export type WriteContractErrorType =
  * const hash = await writeContract(client, request)
  */
 export async function writeContract<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
-  const TAbi extends Abi | readonly unknown[],
-  TFunctionName extends string,
-  TChainOverride extends Chain | undefined = undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
+  const abi extends Abi | readonly unknown[],
+  functionName extends ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+  args extends ContractFunctionArgs<abi, 'pure' | 'view', functionName>,
+  chainOverride extends Chain | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  {
+  client: Client<Transport, chain, account>,
+  parameters: WriteContractParameters<
     abi,
-    address,
-    args,
-    dataSuffix,
     functionName,
-    ...request
-  }: WriteContractParameters<
-    TAbi,
-    TFunctionName,
-    TChain,
-    TAccount,
-    TChainOverride
+    args,
+    chain,
+    account,
+    chainOverride
   >,
 ): Promise<WriteContractReturnType> {
+  const { abi, address, args, dataSuffix, functionName, ...request } =
+    parameters as WriteContractParameters
   const data = encodeFunctionData({
     abi,
     args,
     functionName,
-  } as unknown as EncodeFunctionDataParameters<TAbi, TFunctionName>)
-  const hash = await getAction(
+  } as EncodeFunctionDataParameters)
+  return getAction(
     client,
     sendTransaction,
     'sendTransaction',
@@ -143,6 +164,5 @@ export async function writeContract<
     data: `${data}${dataSuffix ? dataSuffix.replace('0x', '') : ''}`,
     to: address,
     ...request,
-  } as unknown as SendTransactionParameters<TChain, TAccount, TChainOverride>)
-  return hash
+  })
 }

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

@@ -18,7 +18,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(
@@ -33,7 +33,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,31 @@
+export { chainConfig } from './chainConfig.js'
+
+export { parseTransaction } from './parsers.js'
+
+export { serializeTransaction } from './serializers.js'
+
+export type {
+  CeloBlock,
+  CeloBlockOverrides,
+  CeloRpcBlock,
+  CeloRpcBlockOverrides,
+  CeloRpcTransaction,
+  CeloRpcTransactionRequest,
+  CeloTransaction,
+  CeloTransactionRequest,
+  CeloTransactionSerializable,
+  CeloTransactionSerialized,
+  CeloTransactionType,
+  RpcTransactionCIP42,
+  RpcTransactionCIP64,
+  RpcTransactionRequestCIP42,
+  RpcTransactionRequestCIP64,
+  TransactionCIP42,
+  TransactionCIP64,
+  TransactionRequestCIP42,
+  TransactionRequestCIP64,
+  TransactionSerializableCIP42,
+  TransactionSerializableCIP64,
+  TransactionSerializedCIP42,
+  TransactionSerializedCIP64,
+} from './types.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,16 +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)
   if (isCIP42(tx)) return serializeTransactionCIP42(tx, signature)
-  return serializeTransaction(tx as TransactionSerializable, signature)
+  return serializeTransaction_(tx as TransactionSerializable, signature)
 }
 
-export const serializersCelo = {
-  transaction: serializeTransactionCelo,
+export const serializers = {
+  transaction: serializeTransaction,
 } as const satisfies ChainSerializers
 
 //////////////////////////////////////////////////////////////////////////////

package/chains/celo/types.ts

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

package/chains/definitions/arbitrum.ts

@@ -3,26 +3,13 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const arbitrum = /*#__PURE__*/ defineChain({
   id: 42_161,
   name: 'Arbitrum One',
-  network: 'arbitrum',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
   rpcUrls: {
-    alchemy: {
-      http: ['https://arb-mainnet.g.alchemy.com/v2'],
-      webSocket: ['wss://arb-mainnet.g.alchemy.com/v2'],
-    },
-    infura: {
-      http: ['https://arbitrum-mainnet.infura.io/v3'],
-      webSocket: ['wss://arbitrum-mainnet.infura.io/ws/v3'],
-    },
     default: {
       http: ['https://arb1.arbitrum.io/rpc'],
     },
-    public: {
-      http: ['https://arb1.arbitrum.io/rpc'],
-    },
   },
   blockExplorers: {
-    etherscan: { name: 'Arbiscan', url: 'https://arbiscan.io' },
     default: { name: 'Arbiscan', url: 'https://arbiscan.io' },
   },
   contracts: {

package/chains/definitions/arbitrumGoerli.ts

@@ -3,27 +3,15 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const arbitrumGoerli = /*#__PURE__*/ defineChain({
   id: 421_613,
   name: 'Arbitrum Goerli',
-  network: 'arbitrum-goerli',
   nativeCurrency: {
     name: 'Arbitrum Goerli Ether',
     symbol: 'ETH',
     decimals: 18,
   },
   rpcUrls: {
-    alchemy: {
-      http: ['https://arb-goerli.g.alchemy.com/v2'],
-      webSocket: ['wss://arb-goerli.g.alchemy.com/v2'],
-    },
-    infura: {
-      http: ['https://arbitrum-goerli.infura.io/v3'],
-      webSocket: ['wss://arbitrum-goerli.infura.io/ws/v3'],
-    },
     default: {
       http: ['https://goerli-rollup.arbitrum.io/rpc'],
     },
-    public: {
-      http: ['https://goerli-rollup.arbitrum.io/rpc'],
-    },
   },
   blockExplorers: {
     etherscan: { name: 'Arbiscan', url: 'https://goerli.arbiscan.io' },

package/chains/definitions/arbitrumNova.ts

@@ -3,26 +3,13 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const arbitrumNova = /*#__PURE__*/ defineChain({
   id: 42_170,
   name: 'Arbitrum Nova',
-  network: 'arbitrum-nova',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
   rpcUrls: {
-    blast: {
-      http: ['https://arbitrum-nova.public.blastapi.io'],
-      webSocket: ['wss://arbitrum-nova.public.blastapi.io'],
-    },
     default: {
       http: ['https://nova.arbitrum.io/rpc'],
     },
-    public: {
-      http: ['https://nova.arbitrum.io/rpc'],
-    },
   },
   blockExplorers: {
-    etherscan: { name: 'Arbiscan', url: 'https://nova.arbiscan.io' },
-    blockScout: {
-      name: 'BlockScout',
-      url: 'https://nova-explorer.arbitrum.io/',
-    },
     default: { name: 'Arbiscan', url: 'https://nova.arbiscan.io' },
   },
   contracts: {

package/chains/definitions/arbitrumSepolia.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const arbitrumSepolia = /*#__PURE__*/ defineChain({
   id: 421_614,
   name: 'Arbitrum Sepolia',
-  network: 'arbitrum-sepolia',
   nativeCurrency: {
     name: 'Arbitrum Sepolia Ether',
     symbol: 'ETH',
@@ -17,9 +16,6 @@ export const arbitrumSepolia = /*#__PURE__*/ defineChain({
     default: {
       http: ['https://sepolia-rollup.arbitrum.io/rpc'],
     },
-    public: {
-      http: ['https://sepolia-rollup.arbitrum.io/rpc'],
-    },
   },
   blockExplorers: {
     etherscan: { name: 'Arbiscan', url: 'https://sepolia.arbiscan.io' },

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/aurora.ts

@@ -3,19 +3,15 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const aurora = /*#__PURE__*/ defineChain({
   id: 1313161554,
   name: 'Aurora',
-  network: 'aurora',
   nativeCurrency: {
     decimals: 18,
     name: 'Ether',
     symbol: 'ETH',
   },
   rpcUrls: {
-    infura: { http: ['https://aurora-mainnet.infura.io/v3'] },
     default: { http: ['https://mainnet.aurora.dev'] },
-    public: { http: ['https://mainnet.aurora.dev'] },
   },
   blockExplorers: {
-    etherscan: { name: 'Aurorascan', url: 'https://aurorascan.dev' },
     default: { name: 'Aurorascan', url: 'https://aurorascan.dev' },
   },
   contracts: {

package/chains/definitions/auroraTestnet.ts

@@ -3,19 +3,15 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const auroraTestnet = /*#__PURE__*/ defineChain({
   id: 1313161555,
   name: 'Aurora Testnet',
-  network: 'aurora-testnet',
   nativeCurrency: {
     decimals: 18,
     name: 'Ether',
     symbol: 'ETH',
   },
   rpcUrls: {
-    infura: { http: ['https://aurora-testnet.infura.io/v3'] },
     default: { http: ['https://testnet.aurora.dev'] },
-    public: { http: ['https://testnet.aurora.dev'] },
   },
   blockExplorers: {
-    etherscan: { name: 'Aurorascan', url: 'https://testnet.aurorascan.dev' },
     default: { name: 'Aurorascan', url: 'https://testnet.aurorascan.dev' },
   },
   testnet: true,

package/chains/definitions/avalanche.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const avalanche = /*#__PURE__*/ defineChain({
   id: 43_114,
   name: 'Avalanche',
-  network: 'avalanche',
   nativeCurrency: {
     decimals: 18,
     name: 'Avalanche',
@@ -11,10 +10,8 @@ export const avalanche = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://api.avax.network/ext/bc/C/rpc'] },
-    public: { http: ['https://api.avax.network/ext/bc/C/rpc'] },
   },
   blockExplorers: {
-    etherscan: { name: 'SnowTrace', url: 'https://snowtrace.io' },
     default: { name: 'SnowTrace', url: 'https://snowtrace.io' },
   },
   contracts: {

package/chains/definitions/avalancheFuji.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 export const avalancheFuji = /*#__PURE__*/ defineChain({
   id: 43_113,
   name: 'Avalanche Fuji',
-  network: 'avalanche-fuji',
   nativeCurrency: {
     decimals: 18,
     name: 'Avalanche Fuji',
@@ -11,10 +10,8 @@ export const avalancheFuji = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://api.avax-test.network/ext/bc/C/rpc'] },
-    public: { http: ['https://api.avax-test.network/ext/bc/C/rpc'] },
   },
   blockExplorers: {
-    etherscan: { name: 'SnowTrace', url: 'https://testnet.snowtrace.io' },
     default: { name: 'SnowTrace', url: 'https://testnet.snowtrace.io' },
   },
   contracts: {

package/chains/definitions/base.ts

@@ -1,50 +1,41 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
-import { formattersOptimism } from '../optimism/formatters.js'
+import { chainConfig } from '../opStack/chainConfig.js'
 
-export const base = /*#__PURE__*/ defineChain(
-  {
-    id: 8453,
-    network: 'base',
-    name: 'Base',
-    nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
-    rpcUrls: {
-      alchemy: {
-        http: ['https://base-mainnet.g.alchemy.com/v2'],
-        webSocket: ['wss://base-mainnet.g.alchemy.com/v2'],
-      },
-      infura: {
-        http: ['https://base-mainnet.infura.io/v3'],
-        webSocket: ['wss://base-mainnet.infura.io/ws/v3'],
-      },
-      default: {
-        http: ['https://mainnet.base.org'],
-      },
-      public: {
-        http: ['https://mainnet.base.org'],
-      },
+const sourceId = 1 // mainnet
+
+export const base = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 8453,
+  name: 'Base',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://mainnet.base.org'],
     },
-    blockExplorers: {
-      blockscout: {
-        name: 'Basescout',
-        url: 'https://base.blockscout.com',
-      },
-      default: {
-        name: 'Basescan',
-        url: 'https://basescan.org',
-      },
-      etherscan: {
-        name: 'Basescan',
-        url: 'https://basescan.org',
+  },
+  blockExplorers: {
+    default: {
+      name: 'Basescan',
+      url: 'https://basescan.org',
+    },
+  },
+  contracts: {
+    ...chainConfig.contracts,
+    l2OutputOracle: {
+      [sourceId]: {
+        address: '0x56315b90c40730925ec5485cf004d835058518A0',
       },
     },
-    contracts: {
-      multicall3: {
-        address: '0xca11bde05977b3631167028862be2a173976ca11',
-        blockCreated: 5022,
+    multicall3: {
+      address: '0xca11bde05977b3631167028862be2a173976ca11',
+      blockCreated: 5022,
+    },
+    portal: {
+      [sourceId]: {
+        address: '0x49048044D57e1C92A77f79988d21Fa8fAF74E97e',
+        blockCreated: 17482143,
       },
     },
   },
-  {
-    formatters: formattersOptimism,
-  },
-)
+  sourceId,
+})