viem 2.0.0-rc.3 → 2.0.0

package/actions/getContract.ts

@@ -72,10 +72,15 @@ type KeyedClient<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
-> = {
-  publicClient: Client<TTransport, TChain>
-  walletClient: Client<TTransport, TChain, TAccount>
-}
+> =
+  | {
+      public?: Client<TTransport, TChain>
+      wallet: Client<TTransport, TChain, TAccount>
+    }
+  | {
+      public: Client<TTransport, TChain>
+      wallet?: Client<TTransport, TChain, TAccount>
+    }
 
 export type GetContractParameters<
   TTransport extends Transport = Transport,
@@ -84,8 +89,9 @@ export type GetContractParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
   TClient extends
     | Client<TTransport, TChain, TAccount>
-    | KeyedClient<TTransport, TChain, TAccount>
-    | unknown = unknown,
+    | KeyedClient<TTransport, TChain, TAccount> =
+    | Client<TTransport, TChain, TAccount>
+    | KeyedClient<TTransport, TChain, TAccount>,
   TAddress extends Address = Address,
 > = {
   /** Contract ABI */
@@ -113,7 +119,7 @@ export type GetContractParameters<
 
 export type GetContractReturnType<
   TAbi extends Abi | readonly unknown[] = Abi,
-  TClient extends Client | KeyedClient | unknown = unknown,
+  TClient extends Client | KeyedClient = Client | KeyedClient,
   TAddress extends Address = Address,
   _EventNames extends string = TAbi extends Abi
     ? Abi extends TAbi
@@ -132,14 +138,14 @@ export type GetContractReturnType<
     : string,
   _Narrowable extends boolean = IsNarrowable<TAbi, Abi>,
   _PublicClient extends Client | unknown = TClient extends {
-    publicClient: Client
+    public: Client
   }
-    ? TClient['publicClient']
+    ? TClient['public']
     : TClient,
   _WalletClient extends Client | unknown = TClient extends {
-    walletClient: Client
+    wallet: Client
   }
-    ? TClient['walletClient']
+    ? TClient['wallet']
     : TClient,
 > = Prettify<
   Prettify<
@@ -471,15 +477,11 @@ export function getContract<
   TTransport extends Transport,
   TAddress extends Address,
   const TAbi extends Abi | readonly unknown[],
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
   const TClient extends
     | Client<TTransport, TChain, TAccount>
-    | KeyedClient<TTransport, TChain, TAccount>
-    | unknown =
-    | Client<TTransport, TChain, TAccount>
-    | KeyedClient<TTransport, TChain, TAccount>
-    | unknown,
+    | KeyedClient<TTransport, TChain, TAccount>,
+  TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
 >({
   abi,
   address,
@@ -498,12 +500,10 @@ export function getContract<
 
   const [publicClient, walletClient] = (() => {
     if (!client) return [undefined, undefined]
-    if ('publicClient' in client && 'walletClient' in client)
-      return [client.publicClient as Client, client.walletClient as Client]
-    if ('publicClient' in client)
-      return [client.publicClient as Client, undefined]
-    if ('walletClient' in client)
-      return [undefined, client.walletClient as Client]
+    if ('public' in client && 'wallet' in client)
+      return [client.public as Client, client.wallet as Client]
+    if ('public' in client) return [client.public as Client, undefined]
+    if ('wallet' in client) return [undefined, client.wallet as Client]
     return [client, client]
   })()
 

package/chains/definitions/acala.ts

@@ -0,0 +1,29 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const acala = /*#__PURE__*/ defineChain({
+  id: 787,
+  name: 'Acala',
+  network: 'acala',
+  nativeCurrency: {
+    name: 'Acala',
+    symbol: 'ACA',
+    decimals: 18,
+  },
+  rpcUrls: {
+    public: {
+      http: ['https://eth-rpc-acala.aca-api.network'],
+      webSocket: ['wss://eth-rpc-acala.aca-api.network'],
+    },
+    default: {
+      http: ['https://eth-rpc-acala.aca-api.network'],
+      webSocket: ['wss://eth-rpc-acala.aca-api.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Acala Blockscout',
+      url: 'https://blockscout.acala.network',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/bahamut.ts

@@ -0,0 +1,40 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const bahamut = /*#__PURE__*/ defineChain({
+  id: 5165,
+  network: 'bahamut',
+  name: 'Bahamut',
+  nativeCurrency: { name: 'Fasttoken', symbol: 'FTN', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: [
+        'https://rpc1.bahamut.io',
+        'https://bahamut.publicnode.com',
+        'https://rpc2.bahamut.io',
+      ],
+      webSocket: [
+        'wss://ws1.sahara.bahamutchain.com',
+        'wss://bahamut.publicnode.com',
+        'wss://ws2.sahara.bahamutchain.com',
+      ],
+    },
+    public: {
+      http: [
+        'https://rpc1.bahamut.io',
+        'https://bahamut.publicnode.com',
+        'https://rpc2.bahamut.io',
+      ],
+      webSocket: [
+        'wss://ws1.sahara.bahamutchain.com',
+        'wss://bahamut.publicnode.com',
+        'wss://ws2.sahara.bahamutchain.com',
+      ],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Ftnscan',
+      url: 'https://www.ftnscan.com',
+    },
+  },
+})

package/chains/definitions/defichainEvm.ts

@@ -0,0 +1,36 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const defichainEvm = /*#__PURE__*/ defineChain({
+  id: 1130,
+  network: 'defichain-evm',
+  name: 'DeFiChain EVM Mainnet',
+  nativeCurrency: {
+    name: 'DeFiChain',
+    symbol: 'DFI',
+    decimals: 8,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://eth.mainnet.ocean.jellyfishsdk.com'],
+    },
+    public: {
+      http: ['https://eth.mainnet.ocean.jellyfishsdk.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'DeFiScan',
+      url: 'https://meta.defiscan.live',
+    },
+    blockscout: {
+      name: 'Blockscout',
+      url: 'https://blockscout.mainnet.ocean.jellyfishsdk.com',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 137852,
+    },
+  },
+})

package/chains/definitions/defichainEvmTestnet.ts

@@ -0,0 +1,37 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const defichainEvmTestnet = /*#__PURE__*/ defineChain({
+  id: 1131,
+  network: 'defichain-evm-testnet',
+  name: 'DeFiChain EVM Testnet',
+  nativeCurrency: {
+    name: 'DeFiChain',
+    symbol: 'DFI',
+    decimals: 8,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://eth.testnet.ocean.jellyfishsdk.com'],
+    },
+    public: {
+      http: ['https://eth.testnet.ocean.jellyfishsdk.com'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'DeFiScan',
+      url: 'https://meta.defiscan.live/?network=TestNet',
+    },
+    blockscout: {
+      name: 'Blockscout',
+      url: 'https://blockscout.testnet.ocean.jellyfishsdk.com',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 156462,
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/karura.ts

@@ -0,0 +1,29 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const karura = /*#__PURE__*/ defineChain({
+  id: 686,
+  name: 'Karura',
+  network: 'karura',
+  nativeCurrency: {
+    name: 'Karura',
+    symbol: 'KAR',
+    decimals: 18,
+  },
+  rpcUrls: {
+    public: {
+      http: ['https://eth-rpc-karura.aca-api.network'],
+      webSocket: ['wss://eth-rpc-karura.aca-api.network'],
+    },
+    default: {
+      http: ['https://eth-rpc-karura.aca-api.network'],
+      webSocket: ['wss://eth-rpc-karura.aca-api.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Karura Blockscout',
+      url: 'https://blockscout.karura.network',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/klaytn.ts

@@ -9,7 +9,7 @@ export const klaytn = /*#__PURE__*/ defineChain({
     symbol: 'KLAY',
   },
   rpcUrls: {
-    default: { http: ['https://cypress.fautor.app/archive'] },
+    default: { http: ['https://public-en-cypress.klaytn.net'] },
   },
   blockExplorers: {
     default: { name: 'KlaytnScope', url: 'https://scope.klaytn.com' },

package/chains/definitions/mandala.ts

@@ -0,0 +1,29 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const mandala = /*#__PURE__*/ defineChain({
+  id: 595,
+  name: 'Mandala TC9',
+  network: 'mandala',
+  nativeCurrency: {
+    name: 'Mandala',
+    symbol: 'mACA',
+    decimals: 18,
+  },
+  rpcUrls: {
+    public: {
+      http: ['https://eth-rpc-tc9.aca-staging.network'],
+      webSocket: ['wss://eth-rpc-tc9.aca-staging.network'],
+    },
+    default: {
+      http: ['https://eth-rpc-tc9.aca-staging.network'],
+      webSocket: ['wss://eth-rpc-tc9.aca-staging.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Mandala Blockscout',
+      url: 'https://blockscout.mandala.aca-staging.network',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/oasisTestnet.ts

@@ -0,0 +1,19 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const oasisTestnet = /*#__PURE__*/ defineChain({
+  id: 4090,
+  network: 'oasis-testnet',
+  name: 'Oasis Testnet',
+  nativeCurrency: { name: 'Fasttoken', symbol: 'FTN', decimals: 18 },
+  rpcUrls: {
+    default: { http: ['https://rpc1.oasis.bahamutchain.com'] },
+    public: { http: ['https://rpc1.oasis.bahamutchain.com'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Ftnscan',
+      url: 'https://oasis.ftnscan.com',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/opBNBTestnet.ts

@@ -12,7 +12,7 @@ export const opBNBTestnet = /*#__PURE__*/ defineChain({
     default: { http: ['https://opbnb-testnet-rpc.bnbchain.org'] },
   },
   blockExplorers: {
-    default: { name: 'opbnbscan', url: 'https://opbnbscan.com' },
+    default: { name: 'opbnbscan', url: 'https://testnet.opbnbscan.com' },
   },
   contracts: {
     multicall3: {

package/chains/definitions/zkFair.ts

@@ -0,0 +1,27 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const zkFair = /*#__PURE__*/ defineChain({
+  id: 42766,
+  name: 'ZKFair Mainnet',
+  network: 'zkfair-mainnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'USD Coin',
+    symbol: 'USDC',
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.zkfair.io'],
+    },
+    public: {
+      http: ['https://rpc.zkfair.io'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'zkFair Explorer',
+      url: 'https://scan.zkfair.io',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/zkFairTestnet.ts

@@ -0,0 +1,27 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const zkFairTestnet = /*#__PURE__*/ defineChain({
+  id: 43851,
+  name: 'ZKFair Testnet',
+  network: 'zkfair-testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'USD Coin',
+    symbol: 'USDC',
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://testnet-rpc.zkfair.io'],
+    },
+    public: {
+      http: ['https://testnet-rpc.zkfair.io'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'zkFair Explorer',
+      url: 'https://testnet-scan.zkfair.io',
+    },
+  },
+  testnet: true,
+})

package/chains/index.ts

@@ -1,5 +1,6 @@
 export type { Chain } from '../types/chain.js'
 
+export { acala } from './definitions/acala.js'
 export { arbitrum } from './definitions/arbitrum.js'
 export { arbitrumGoerli } from './definitions/arbitrumGoerli.js'
 export { arbitrumNova } from './definitions/arbitrumNova.js'
@@ -10,6 +11,7 @@ export { aurora } from './definitions/aurora.js'
 export { auroraTestnet } from './definitions/auroraTestnet.js'
 export { avalanche } from './definitions/avalanche.js'
 export { avalancheFuji } from './definitions/avalancheFuji.js'
+export { bahamut } from './definitions/bahamut.js'
 export { base } from './definitions/base.js'
 export { baseGoerli } from './definitions/baseGoerli.js'
 export { baseSepolia } from './definitions/baseSepolia.js'
@@ -36,6 +38,8 @@ export { coreDao } from './definitions/coreDao.js'
 export { cronos } from './definitions/cronos.js'
 export { cronosTestnet } from './definitions/cronosTestnet.js'
 export { crossbell } from './definitions/crossbell.js'
+export { defichainEvm } from './definitions/defichainEvm.js'
+export { defichainEvmTestnet } from './definitions/defichainEvmTestnet.js'
 export { dfk } from './definitions/dfk.js'
 export { dogechain } from './definitions/dogechain.js'
 export { edgeware } from './definitions/edgeware.js'
@@ -61,6 +65,7 @@ export { fuseSparknet } from './definitions/fuseSparknet.js'
 export { iotex } from './definitions/iotex.js'
 export { iotexTestnet } from './definitions/iotexTestnet.js'
 export { jbc } from './definitions/jbc.js'
+export { karura } from './definitions/karura.js'
 export { gobi } from './definitions/gobi.js'
 export { goerli } from './definitions/goerli.js'
 export { gnosis } from './definitions/gnosis.js'
@@ -81,6 +86,7 @@ export { lineaTestnet } from './definitions/lineaTestnet.js'
 export { localhost } from './definitions/localhost.js'
 export { lukso } from './definitions/lukso.js'
 export { mainnet } from './definitions/mainnet.js'
+export { mandala } from './definitions/mandala.js'
 export { manta } from './definitions/manta.js'
 export { mantaTestnet } from './definitions/mantaTestnet.js'
 export { mantle } from './definitions/mantle.js'
@@ -101,6 +107,7 @@ export { neonMainnet } from './definitions/neonMainnet.js'
 export { nexi } from './definitions/nexi.js'
 export { nexilix } from './definitions/nexilix.js'
 export { oasys } from './definitions/oasys.js'
+export { oasisTestnet } from './definitions/oasisTestnet.js'
 export { okc } from './definitions/okc.js'
 export { optimism } from './definitions/optimism.js'
 export { optimismGoerli } from './definitions/optimismGoerli.js'
@@ -169,6 +176,8 @@ export { wemixTestnet } from './definitions/wemixTestnet.js'
 export { xdc } from './definitions/xdc.js'
 export { xdcTestnet } from './definitions/xdcTestnet.js'
 export { zhejiang } from './definitions/zhejiang.js'
+export { zkFair } from './definitions/zkFair.js'
+export { zkFairTestnet } from './definitions/zkFairTestnet.js'
 export { zkSync } from './definitions/zkSync.js'
 export { zkSyncTestnet } from './definitions/zkSyncTestnet.js'
 export { zkSyncSepoliaTestnet } from './definitions/zkSyncSepoliaTestnet.js'

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-rc.3'
+export const version = '2.0.0'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",