viem 2.0.0-beta.6 → 2.0.0-beta.9

package/chains/celo/serializers.ts

@@ -27,13 +27,9 @@ import { isCIP42, isCIP64, isEmpty, isPresent } from './utils.js'
 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 serializers = {
@@ -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/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,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 1 // mainnet
+
 export const base = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 8453,
@@ -23,5 +25,12 @@ export const base = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 5022,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x49048044D57e1C92A77f79988d21Fa8fAF74E97e',
+        blockCreated: 17482143,
+      },
+    },
   },
+  sourceId,
 })

package/chains/definitions/baseGoerli.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 5 // goerli
+
 export const baseGoerli = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 84531,
@@ -21,7 +23,12 @@ export const baseGoerli = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1376988,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA',
+      },
+    },
   },
   testnet: true,
-  sourceId: 5, // goerli
+  sourceId,
 })

package/chains/definitions/baseSepolia.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 11_155_111 // sepolia
+
 export const baseSepolia = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 84532,
@@ -25,7 +27,15 @@ export const baseSepolia = /*#__PURE__*/ defineChain({
       url: 'https://base-sepolia.blockscout.com',
     },
   },
-  contracts: { ...chainConfig.contracts },
+  contracts: {
+    ...chainConfig.contracts,
+    portal: {
+      [sourceId]: {
+        address: '0x49f53e41452c74589e85ca1677426ba426459e85',
+        blockCreated: 4446677,
+      },
+    },
+  },
   testnet: true,
-  sourceId: 11155111, // sepolia
+  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/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/optimism.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 1 // mainnet
+
 export const optimism = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 10,
@@ -23,5 +25,11 @@ export const optimism = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 4286263,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xbEb5Fc579115071764c7423A4f12eDde41f106Ed',
+      },
+    },
   },
+  sourceId,
 })

package/chains/definitions/optimismGoerli.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 5 // goerli
+
 export const optimismGoerli = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 420,
@@ -23,6 +25,12 @@ export const optimismGoerli = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 49461,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383',
+      },
+    },
   },
   testnet: true,
+  sourceId,
 })

package/chains/definitions/optimismSepolia.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 11_155_111 // sepolia
+
 export const optimismSepolia = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 11155420,
@@ -23,6 +25,12 @@ export const optimismSepolia = /*#__PURE__*/ defineChain({
       address: '0xca11bde05977b3631167028862be2a173976ca11',
       blockCreated: 1620204,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x16Fc5058F25648194471939df75CF27A2fdC48BC',
+      },
+    },
   },
   testnet: true,
+  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,
+})

package/chains/definitions/pgnTestnet.ts

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

package/chains/definitions/rootstock.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const rootstock = /*#__PURE__*/ defineChain({
+  id: 30,
+  name: 'Rootstock Mainnet',
+  network: 'rootstock',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Rootstock Bitcoin',
+    symbol: 'RBTC',
+  },
+  rpcUrls: {
+    public: { http: ['https://public-node.rsk.co'] },
+    default: { http: ['https://public-node.rsk.co'] },
+  },
+  blockExplorers: {
+    blockscout: { name: 'Blockscout', url: 'https://rootstock.blockscout.com' },
+    default: { name: 'RSK Explorer', url: 'https://explorer.rsk.co' },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 4249540,
+    },
+  },
+})

package/chains/definitions/sapphire.ts

@@ -0,0 +1,30 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const sapphire = /*#__PURE__*/ defineChain({
+  id: 23294,
+  name: 'Oasis Sapphire',
+  network: 'sapphire',
+  nativeCurrency: { name: 'Sapphire Rose', symbol: 'ROSE', decimals: 18 },
+  rpcUrls: {
+    default: {
+      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: {
+      name: 'Oasis Sapphire Explorer',
+      url: 'https://explorer.sapphire.oasis.io',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 734531,
+    },
+  },
+})

package/chains/definitions/sapphireTestnet.ts

@@ -0,0 +1,25 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const sapphireTestnet = /*#__PURE__*/ defineChain({
+  id: 23295,
+  name: 'Oasis Sapphire Testnet',
+  network: 'sapphire-testnet',
+  nativeCurrency: { name: 'Sapphire Test Rose', symbol: 'TEST', decimals: 18 },
+  rpcUrls: {
+    default: {
+      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: {
+      name: 'Oasis Sapphire Testnet Explorer',
+      url: 'https://testnet.explorer.sapphire.oasis.dev',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/shibarium.ts

@@ -0,0 +1,32 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const shibarium = /*#__PURE__*/ defineChain({
+  id: 109,
+  name: 'Shibarium',
+  network: 'shibarium',
+  nativeCurrency: { name: 'Bone', symbol: 'BONE', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.shibrpc.com'],
+    },
+    public: {
+      http: ['https://rpc.shibrpc.com'],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: 'Blockscout',
+      url: 'https://shibariumscan.io',
+    },
+    default: {
+      name: 'Blockscout',
+      url: 'https://shibariumscan.io',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0x864Bf681ADD6052395188A89101A1B37d3B4C961',
+      blockCreated: 265900,
+    },
+  },
+})

package/chains/definitions/shimmer.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const shimmer = /*#__PURE__*/ defineChain({
+  id: 148,
+  name: 'Shimmer',
+  network: 'shimmer',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Shimmer',
+    symbol: 'SMR',
+  },
+  rpcUrls: {
+    public: {
+      http: ['https://json-rpc.evm.shimmer.network'],
+    },
+    default: {
+      http: ['https://json-rpc.evm.shimmer.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Shimmer Network Explorer',
+      url: 'https://explorer.evm.shimmer.network',
+    },
+  },
+})

package/chains/definitions/shimmerTestnet.ts

@@ -0,0 +1,27 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const shimmerTestnet = /*#__PURE__*/ defineChain({
+  id: 1073,
+  name: 'Shimmer Testnet',
+  network: 'shimmer-testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Shimmer',
+    symbol: 'SMR',
+  },
+  rpcUrls: {
+    public: {
+      http: ['https://json-rpc.evm.testnet.shimmer.network'],
+    },
+    default: {
+      http: ['https://json-rpc.evm.testnet.shimmer.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Shimmer Network Explorer',
+      url: 'https://explorer.evm.testnet.shimmer.network',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/zora.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 1 // mainnet
+
 export const zora = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 7777777,
@@ -25,5 +27,11 @@ export const zora = /*#__PURE__*/ defineChain({
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 5882,
     },
+    portal: {
+      [sourceId]: {
+        address: '0x1a0ad011913A150f69f6A19DF447A0CfD9551054',
+      },
+    },
   },
+  sourceId,
 })

package/chains/definitions/zoraSepolia.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 11_155_111 // sepolia
+
 export const zoraSepolia = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 999999999,
@@ -33,6 +35,12 @@ export const zoraSepolia = /*#__PURE__*/ defineChain({
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 83160,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xeffE2C6cA9Ab797D418f0D91eA60807713f3536f',
+      },
+    },
   },
+  sourceId,
   testnet: true,
 })

package/chains/definitions/zoraTestnet.ts

@@ -1,6 +1,8 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../opStack/chainConfig.js'
 
+const sourceId = 5 // goerli
+
 export const zoraTestnet = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 999,
@@ -28,6 +30,12 @@ export const zoraTestnet = /*#__PURE__*/ defineChain({
       address: '0xcA11bde05977b3631167028862bE2a173976CA11',
       blockCreated: 189123,
     },
+    portal: {
+      [sourceId]: {
+        address: '0xDb9F51790365e7dc196e7D072728df39Be958ACe',
+      },
+    },
   },
+  sourceId,
   testnet: true,
 })