continuing various work

packages/account/package.json

@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/account#synopsis",
   "dependencies": {
-    "ethereumjs-util": "^7.0.5",
+    "ethereumjs-util": "^7.0.6",
     "rlp": "^2.2.3",
     "safe-buffer": "^5.1.1"
   },

packages/block/package.json

@@ -42,7 +42,7 @@
     "@ethereumjs/common": "^1.5.1",
     "@ethereumjs/tx": "^2.1.2",
     "@types/bn.js": "^4.11.6",
-    "ethereumjs-util": "^7.0.5",
+    "ethereumjs-util": "^7.0.6",
     "merkle-patricia-tree": "^4.0.0"
   },
   "devDependencies": {

packages/block/src/block.ts

@@ -1,12 +1,12 @@
 import { BaseTrie as Trie } from 'merkle-patricia-tree'
-import { BN, rlp, keccak256, KECCAK256_RLP } from 'ethereumjs-util'
+import { rlp, keccak256, KECCAK256_RLP } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { Transaction, TxOptions } from '@ethereumjs/tx'
 import { BlockHeader } from './header'
-import { BlockData, BlockOptions, JsonBlock, Blockchain } from './types'
+import { BlockData, BlockOptions, JsonBlock, BlockBuffer, Blockchain } from './types'
 
 /**
- * An object that represents the block
+ * An object that represents the block.
  */
 export class Block {
   public readonly header: BlockHeader
@@ -38,13 +38,7 @@ export class Block {
   }
 
   public static fromRLPSerializedBlock(serialized: Buffer, opts: BlockOptions = {}) {
-    const values = (rlp.decode(serialized) as any) as [Buffer[], Buffer[][], Buffer[][]]
-    // Here we cast to silence TS errors,
-    // we know that values is
-    // [ Header: Buffer[],
-    //   Transactions: Buffer[][],
-    //   UncleHeaders: Buffer[][]
-    // ]
+    const values = (rlp.decode(serialized) as any) as BlockBuffer
 
     if (!Array.isArray(values)) {
       throw new Error('Invalid serialized block input. Must be array')
@@ -53,30 +47,25 @@ export class Block {
     return Block.fromValuesArray(values, opts)
   }
 
-  public static fromValuesArray(
-    values: [Buffer[], Buffer[][], Buffer[][]],
-    opts: BlockOptions = {},
-  ) {
+  public static fromValuesArray(values: BlockBuffer, opts: BlockOptions = {}) {
     if (values.length > 3) {
       throw new Error('invalid block. More values than expected were received')
     }
 
-    const headerArray = values[0] || []
-    const txsData = values[1] || []
-    const uncleHeadersData = values[2] || []
+    const [headerData, txsData, uhsData] = values
 
-    const header = BlockHeader.fromValuesArray(headerArray, opts)
+    const header = BlockHeader.fromValuesArray(headerData, opts)
 
     // parse transactions
     const transactions = []
-    for (const txData of txsData) {
-      transactions.push(Transaction.fromValuesArray(txData as Buffer[], opts as TxOptions))
+    for (const txData of txsData || []) {
+      transactions.push(Transaction.fromValuesArray(txData, opts))
     }
 
     // parse uncle headers
     const uncleHeaders = []
-    for (const uncleHeaderData of uncleHeadersData) {
-      uncleHeaders.push(BlockHeader.fromValuesArray(uncleHeaderData as Buffer[], opts))
+    for (const uncleHeaderData of uhsData || []) {
+      uncleHeaders.push(BlockHeader.fromValuesArray(uncleHeaderData, opts))
     }
 
     return new Block(header, transactions, uncleHeaders)
@@ -100,23 +89,26 @@ export class Block {
     Object.freeze(this)
   }
 
-  get raw() {
+  /**
+   *  Returns a Buffer Array of the raw Buffers of this block, in order.
+   */
+  raw(): BlockBuffer {
     return [
       this.header.raw(),
-      this.transactions.map((tx) => tx.serialize()),
+      this.transactions.map((tx) => tx.raw()),
       this.uncleHeaders.map((uh) => uh.raw()),
     ]
   }
 
   /**
-   * Produces a hash the RLP of the block
+   * Produces a hash the RLP of the block.
    */
   hash(): Buffer {
     return this.header.hash()
   }
 
   /**
-   * Determines if this block is the genesis block
+   * Determines if this block is the genesis block.
    */
   isGenesis(): boolean {
     return this.header.isGenesis()
@@ -126,7 +118,7 @@ export class Block {
    * Returns the rlp encoding of the block.
    */
   serialize(): Buffer {
-    return rlp.encode(this.raw)
+    return rlp.encode(this.raw())
   }
 
   /**
@@ -141,7 +133,7 @@ export class Block {
   }
 
   /**
-   * Validates the transaction trie
+   * Validates the transaction trie.
    */
   validateTransactionsTrie(): boolean {
     if (this.transactions.length > 0) {
@@ -152,7 +144,7 @@ export class Block {
   }
 
   /**
-   * Validates the transactions
+   * Validates the transactions.
    *
    * @param stringError - If `true`, a string with the indices of the invalid txs is returned.
    */
@@ -199,7 +191,7 @@ export class Block {
   }
 
   /**
-   * Validates the uncle's hash
+   * Validates the uncle's hash.
    */
   validateUnclesHash(): boolean {
     const raw = rlp.encode(this.uncleHeaders.map((uh) => uh.raw()))
@@ -251,7 +243,7 @@ export class Block {
     // This is not possible in ethereumjs-blockchain since this PR was merged:
     // https://github.com/ethereumjs/ethereumjs-blockchain/pull/47
 
-    const height = new BN(this.header.number)
+    const height = this.header.number
     return uncleHeader.validate(blockchain, height)
   }
 }

packages/block/src/from-rpc.ts

@@ -1,5 +1,5 @@
 import { Transaction, TxData } from '@ethereumjs/tx'
-import { toBuffer, setLengthLeft, Address } from 'ethereumjs-util'
+import { toBuffer, setLengthLeft } from 'ethereumjs-util'
 import { Block, BlockOptions } from './index'
 
 import blockHeaderFromRpc from './header-from-rpc'
@@ -11,46 +11,22 @@ import blockHeaderFromRpc from './header-from-rpc'
  * @param uncles - Optional list of Ethereum JSON RPC of uncles (eth_getUncleByBlockHashAndIndex)
  * @param chainOptions - An object describing the blockchain
  */
-export default function blockFromRpc(blockParams: any, uncles?: any[], options?: BlockOptions) {
-  uncles = uncles || []
-
+export default function blockFromRpc(blockParams: any, uncles: any[] = [], options?: BlockOptions) {
   const header = blockHeaderFromRpc(blockParams, options)
 
-  const transactions: TxData[] = []
-
+  const transactions: Transaction[] = []
   if (blockParams.transactions) {
-    const txOpts = { common: header._common }
-
+    const opts = { common: header._common }
     for (const _txParams of blockParams.transactions) {
       const txParams = normalizeTxParams(_txParams)
-
-      // override from address
-      const fromAddress = txParams.from ? Address.fromString(txParams.from) : Address.zero()
-      delete txParams.from
-
-      const tx = Transaction.fromTxData(txParams as TxData, txOpts)
-      const fakeTx = Object.create(tx)
-
-      // override getSenderAddress
-      fakeTx.getSenderAddress = () => {
-        return fromAddress
-      }
-      // override hash
-      fakeTx.hash = () => {
-        return toBuffer(txParams.hash)
-      }
-
-      transactions.push(fakeTx)
+      const tx = Transaction.fromTxData(txParams as TxData, opts)
+      transactions.push(tx)
     }
   }
 
-  const block = Block.fromBlockData({
-    header,
-    transactions,
-    uncleHeaders: uncles.map((uh) => blockHeaderFromRpc(uh, options)),
-  })
+  const uncleHeaders = uncles.map((uh) => blockHeaderFromRpc(uh, options))
 
-  return block
+  return Block.fromBlockData({ header, transactions, uncleHeaders })
 }
 
 function normalizeTxParams(_txParams: any) {

packages/block/src/header-from-rpc.ts

@@ -1,5 +1,4 @@
 import { BlockHeader } from './header'
-import { KECCAK256_NULL, toBuffer } from 'ethereumjs-util'
 import { BlockOptions } from './types'
 
 /**
@@ -9,31 +8,45 @@ import { BlockOptions } from './types'
  * @param chainOptions - An object describing the blockchain
  */
 export default function blockHeaderFromRpc(blockParams: any, options?: BlockOptions) {
+  const {
+    parentHash,
+    sha3Uncles,
+    miner,
+    stateRoot,
+    transactionsRoot,
+    receiptRoot,
+    receiptsRoot,
+    logsBloom,
+    difficulty,
+    number,
+    gasLimit,
+    gasUsed,
+    timestamp,
+    extraData,
+    mixHash,
+    nonce,
+  } = blockParams
+
   const blockHeader = BlockHeader.fromHeaderData(
     {
-      parentHash: blockParams.parentHash,
-      uncleHash: blockParams.sha3Uncles,
-      coinbase: blockParams.miner,
-      stateRoot: blockParams.stateRoot,
-      transactionsTrie: blockParams.transactionsRoot,
-      receiptTrie: blockParams.receiptRoot || blockParams.receiptsRoot || KECCAK256_NULL,
-      bloom: blockParams.logsBloom,
-      difficulty: blockParams.difficulty,
-      number: blockParams.number,
-      gasLimit: blockParams.gasLimit,
-      gasUsed: blockParams.gasUsed,
-      timestamp: blockParams.timestamp,
-      extraData: blockParams.extraData,
-      mixHash: blockParams.mixHash,
-      nonce: blockParams.nonce,
+      parentHash,
+      uncleHash: sha3Uncles,
+      coinbase: miner,
+      stateRoot,
+      transactionsTrie: transactionsRoot,
+      receiptTrie: receiptRoot || receiptsRoot,
+      bloom: logsBloom,
+      difficulty,
+      number,
+      gasLimit,
+      gasUsed,
+      timestamp,
+      extraData,
+      mixHash,
+      nonce,
     },
     options,
   )
 
-  // override hash in case something was missing TODO: why do we need this?
-  //blockHeader.hash = function () {
-  //  return toBuffer(blockParams.hash)
-  //}
-
   return blockHeader
 }