use type AccessListEIP2930ValuesArray and some tidying up

Author: ryanio

packages/block/src/block.ts

@@ -149,12 +149,14 @@ export class Block {
   }
 
   /**
-   *  Returns a Buffer Array of the raw Buffers of this block, in order.
+   * Returns a Buffer Array of the raw Buffers of this block, in order.
    */
   raw(): BlockBuffer {
     return [
       this.header.raw(),
-      this.transactions.map((tx) => <Buffer[]>tx.raw()),
+      this.transactions.map((tx) =>
+        'transactionType' in tx && tx.transactionType > 0 ? tx.serialize() : tx.raw()
+      ) as Buffer[],
       this.uncleHeaders.map((uh) => uh.raw()),
     ]
   }

packages/block/src/types.ts

@@ -100,7 +100,10 @@ export interface BlockData {
 export type BlockBuffer = [BlockHeaderBuffer, TransactionsBuffer, UncleHeadersBuffer]
 export type BlockHeaderBuffer = Buffer[]
 export type BlockBodyBuffer = [TransactionsBuffer, UncleHeadersBuffer]
-export type TransactionsBuffer = Buffer[][]
+/**
+ * TransactionsBuffer can be an array of serialized txs for Typed Transactions or an array of Buffer Arrays for legacy transactions.
+ */
+export type TransactionsBuffer = Buffer[][] | Buffer[]
 export type UncleHeadersBuffer = Buffer[][]
 
 /**

packages/tx/src/baseTransaction.ts

@@ -8,7 +8,7 @@ import {
   ecsign,
   publicToAddress,
 } from 'ethereumjs-util'
-import { TxData, TxOptions, JsonTx } from './types'
+import { TxData, TxOptions, JsonTx, AccessListEIP2930ValuesArray } from './types'
 
 export abstract class BaseTransaction<TransactionObject> {
   public readonly nonce: BN
@@ -114,7 +114,7 @@ export abstract class BaseTransaction<TransactionObject> {
   /**
    * Returns a Buffer Array of the raw Buffers of this transaction, in order.
    */
-  abstract raw(): Buffer[]
+  abstract raw(): Buffer[] | AccessListEIP2930ValuesArray
 
   /**
    * Returns the encoding of the transaction.

packages/tx/src/eip2930Transaction.ts

@@ -73,11 +73,12 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
     }
 
     const values = rlp.decode(serialized.slice(1))
+
     if (!Array.isArray(values)) {
       throw new Error('Invalid serialized tx input: must be array')
     }
 
-    return AccessListEIP2930Transaction.fromValuesArray(values, opts)
+    return AccessListEIP2930Transaction.fromValuesArray(values as any, opts)
   }
 
   /**
@@ -99,16 +100,15 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
    * The format is:
    * chainId, nonce, gasPrice, gasLimit, to, value, data, access_list, yParity (v), senderR (r), senderS (s)
    */
-  public static fromValuesArray(values: (Buffer | AccessListBuffer)[], opts: TxOptions = {}) {
+  public static fromValuesArray(values: AccessListEIP2930ValuesArray, opts: TxOptions = {}) {
     if (values.length !== 8 && values.length !== 11) {
       throw new Error(
         'Invalid EIP-2930 transaction. Only expecting 8 values (for unsigned tx) or 11 values (for signed tx).'
       )
     }
 
-    const [chainId, nonce, gasPrice, gasLimit, to, value, data, accessList, v, r, s] = <
-      AccessListEIP2930ValuesArray
-    >values
+    const [chainId, nonce, gasPrice, gasLimit, to, value, data, accessList, v, r, s] = values
+
     const emptyBuffer = Buffer.from([])
 
     return new AccessListEIP2930Transaction(
@@ -147,7 +147,6 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
     let usedAccessList
     if (accessList && isAccessList(accessList)) {
       this.AccessListJSON = accessList
-
       const newAccessList: AccessListBuffer = []
 
       for (let i = 0; i < accessList.length; i++) {
@@ -248,7 +247,7 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
    *
    * Use `serialize()` to add to block data for `Block.fromValuesArray()`.
    */
-  raw(): Buffer[] {
+  raw(): AccessListEIP2930ValuesArray {
     return [
       bnToRlp(this.chainId),
       bnToRlp(this.nonce),
@@ -257,7 +256,7 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
       this.to !== undefined ? this.to.buf : Buffer.from([]),
       bnToRlp(this.value),
       this.data,
-      <any>this.accessList,
+      this.accessList,
       this.v !== undefined ? bnToRlp(this.v) : Buffer.from([]),
       this.r !== undefined ? bnToRlp(this.r) : Buffer.from([]),
       this.s !== undefined ? bnToRlp(this.s) : Buffer.from([]),
@@ -268,15 +267,16 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
    * Returns the serialized encoding of the transaction.
    */
   serialize(): Buffer {
-    return Buffer.concat([Buffer.from('01', 'hex'), rlp.encode(this.raw())])
+    const base = this.raw()
+    return Buffer.concat([Buffer.from('01', 'hex'), rlp.encode(base as any)])
   }
 
   /**
    * Computes a sha3-256 hash of the serialized unsigned tx, which is used to sign the transaction.
    */
   getMessageToSign() {
     const base = this.raw().slice(0, 8)
-    return keccak256(Buffer.concat([Buffer.from('01', 'hex'), rlp.encode(base)]))
+    return keccak256(Buffer.concat([Buffer.from('01', 'hex'), rlp.encode(base as any)]))
   }
 
   /**

packages/tx/src/transactionFactory.ts

@@ -81,15 +81,8 @@ export default class TransactionFactory {
     if (Buffer.isBuffer(data)) {
       return this.fromSerializedData(data, txOptions)
     } else if (Array.isArray(data)) {
-      if (data.length === 6 || data.length === 9) {
-        // It is a legacy transaction
-        return Transaction.fromValuesArray(data, txOptions)
-      } else if (data.length === 8 || data.length === 11) {
-        // It is an Access List Transaction
-        return AccessListEIP2930Transaction.fromValuesArray(data, txOptions)
-      } else {
-        throw new Error('Cannot decode transaction: unknown array length')
-      }
+      // It is a legacy transaction
+      return Transaction.fromValuesArray(data, txOptions)
     } else {
       throw new Error('Cannot decode transaction: unknown type input')
     }

packages/tx/src/types.ts

@@ -31,15 +31,21 @@ export interface TxOptions {
   freeze?: boolean
 }
 
+/*
+ * Access List types
+ */
+
 export type AccessListItem = {
   address: string
   storageKeys: string[]
 }
 
+/*
+ * An Access List as a tuple of [address: Buffer, storageKeys: Buffer[]]
+ */
 export type AccessListBufferItem = [Buffer, Buffer[]]
-
-export type AccessList = AccessListItem[]
 export type AccessListBuffer = AccessListBufferItem[]
+export type AccessList = AccessListItem[]
 
 export function isAccessListBuffer(
   input: AccessListBuffer | AccessList

packages/tx/test/base.spec.ts

@@ -89,10 +89,10 @@ tape('[BaseTransaction]', function (t) {
         `${txType.name}: tx should not be frozen when freeze deactivated in options`
       )
 
-      tx = txType.class.fromValuesArray(txType.values, { common })
+      tx = txType.class.fromValuesArray(txType.values as any, { common })
       st.ok(Object.isFrozen(tx), `${txType.name}: tx should be frozen by default`)
 
-      tx = txType.class.fromValuesArray(txType.values, { common, freeze: false })
+      tx = txType.class.fromValuesArray(txType.values as any, { common, freeze: false })
       st.ok(
         !Object.isFrozen(tx),
         `${txType.name}: tx should not be frozen when freeze deactivated in options`