tx: fix example types (ethereumjs#3992)

* tx: fix example types

* chore: undo refactor

* util: properly refactor isHexString

* chore: remove typeast

* chore: revert to hex starts with

* util: string instead of PrefixedHexString

Author: gabrocheleau

packages/tx/examples/accessListTx.ts

@@ -1,10 +1,11 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
+import type { AccessList2930TxData } from '@ethereumjs/tx'
 import { createAccessList2930Tx } from '@ethereumjs/tx'
 import { bytesToHex } from '@ethereumjs/util'
 
 const common = new Common({ chain: Mainnet, hardfork: Hardfork.Berlin })
 
-const txData = {
+const txData: AccessList2930TxData = {
   data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
   gasLimit: '0x02625a00',
   gasPrice: '0x01',

packages/tx/examples/blobTx.ts

@@ -1,4 +1,5 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
+import type { BlobEIP4844TxData } from '@ethereumjs/tx'
 import { createBlob4844Tx } from '@ethereumjs/tx'
 import { bytesToHex } from '@ethereumjs/util'
 import { trustedSetup } from '@paulmillr/trusted-setups/fast.js'
@@ -13,12 +14,12 @@ const main = async () => {
     customCrypto: { kzg },
   })
 
-  const txData = {
+  const txData: BlobEIP4844TxData = {
     data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
     gasLimit: '0x02625a00',
     maxPriorityFeePerGas: '0x01',
     maxFeePerGas: '0xff',
-    maxFeePerDataGas: '0xfff',
+    maxFeePerBlobGas: '0xfff',
     nonce: '0x00',
     to: '0xcccccccccccccccccccccccccccccccccccccccc',
     value: '0x0186a0',

packages/tx/examples/legacyTx.ts

@@ -1,8 +1,9 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
+import type { LegacyTxData } from '@ethereumjs/tx'
 import { createLegacyTx } from '@ethereumjs/tx'
 import { bytesToHex, hexToBytes } from '@ethereumjs/util'
 
-const txParams = {
+const txData: LegacyTxData = {
   nonce: '0x0',
   gasPrice: '0x09184e72a000',
   gasLimit: '0x2710',
@@ -12,7 +13,7 @@ const txParams = {
 }
 
 const common = new Common({ chain: Mainnet, hardfork: Hardfork.Istanbul })
-const tx = createLegacyTx(txParams, { common })
+const tx = createLegacyTx(txData, { common })
 
 const privateKey = hexToBytes('0xe331b6d69882b4cb4ea581d88e0b604039a3de5967688d3dcffdd2270c0fd109')
 

packages/tx/examples/londonTx.ts

@@ -1,10 +1,11 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
+import type { FeeMarketEIP1559TxData } from '@ethereumjs/tx'
 import { createFeeMarket1559Tx } from '@ethereumjs/tx'
 import { bytesToHex } from '@ethereumjs/util'
 
 const common = new Common({ chain: Mainnet, hardfork: Hardfork.London })
 
-const txData = {
+const txData: FeeMarketEIP1559TxData = {
   data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
   gasLimit: '0x02625a00',
   maxPriorityFeePerGas: '0x01',

packages/tx/examples/transactions.ts

@@ -3,7 +3,8 @@
 // Install the dependencies and run `npx tsx examples/transactions.ts`
 
 import { createLegacyTx, createLegacyTxFromBytesArray } from '@ethereumjs/tx'
-import { bytesToHex, hexToBytes, toBytes } from '@ethereumjs/util'
+import type { PrefixedHexString } from '@ethereumjs/util'
+import { bytesToHex, hexToBytes } from '@ethereumjs/util'
 
 // We create an unsigned transaction.
 // Notice we don't set the `to` field because we are creating a new contract.
@@ -38,7 +39,7 @@ console.log('--------------------')
 // If you got it directly from the network it will be rlp encoded.
 // You can decode it with the rlp module.
 // After that you should have something like:
-const rawTx = [
+const rawTx: PrefixedHexString[] = [
   '0x',
   '0x09184e72a000',
   '0x2710',
@@ -50,7 +51,7 @@ const rawTx = [
   '0x5bd428537f05f9830e93792f90ea6a3e2d1ee84952dd96edbae9f658f831ab13',
 ]
 
-const tx2 = createLegacyTxFromBytesArray(rawTx.map(toBytes)) // This is also a mainnet transaction
+const tx2 = createLegacyTxFromBytesArray(rawTx.map(hexToBytes)) // This is also a mainnet transaction
 
 // So assuming that you were able to parse the transaction, we will now get the sender's address.
 

packages/util/src/bytes.ts

@@ -24,20 +24,20 @@ export const bytesToUnprefixedHex = _bytesToUnprefixedHex
  * @returns {Uint8Array} The converted bytes
  * @throws If the input is not a valid 0x-prefixed hex string
  */
-export const hexToBytes = (hex: string) => {
+export const hexToBytes = (hex: string): Uint8Array => {
   if (!hex.startsWith('0x')) throw EthereumJSErrorWithoutCode('input string must be 0x prefixed')
   return nobleH2B(padToEven(stripHexPrefix(hex)))
 }
 
-export const unprefixedHexToBytes = (hex: string) => {
+export const unprefixedHexToBytes = (hex: string): Uint8Array => {
   if (hex.startsWith('0x')) throw EthereumJSErrorWithoutCode('input string cannot be 0x prefixed')
   return nobleH2B(padToEven(hex))
 }
 
 export const bytesToHex = (bytes: Uint8Array): PrefixedHexString => {
   if (bytes === undefined || bytes.length === 0) return '0x'
   const unprefixedHex = bytesToUnprefixedHex(bytes)
-  return ('0x' + unprefixedHex) as PrefixedHexString
+  return `0x${unprefixedHex}`
 }
 
 // BigInt cache for the numbers 0 - 256*256-1 (two-byte bytes)