tx: increase test coverage

Author: jochem-brouwer

packages/tx/src/transactionFactory.ts

@@ -21,9 +21,6 @@ export default class TransactionFactory {
       // Assume LegacyTransaction
       return LegacyTransaction.fromTxData(txData, txOptions)
     } else {
-      if (!common.isActivatedEIP(2718)) {
-        throw new Error('Common support for TypedTransactions (EIP-2718) not activated')
-      }
       const txType = new BN(txData.type).toNumber()
       return TransactionFactory.getTransactionClass(txType, common).fromTxData(txData, txOptions)
     }

packages/tx/test/eip2930.spec.ts

@@ -228,7 +228,7 @@ tape('[EIP2930Transaction]', function (t) {
   // Data from
   // https://github.com/INFURA/go-ethlibs/blob/75b2a52a39d353ed8206cffaf68d09bd1b154aae/eth/transaction_signing_test.go#L87
 
-  t.test('should sign transaction correctly', function (t) {
+  t.test('should sign transaction correctly and return expected JSON', function (t) {
     const address = Buffer.from('0000000000000000000000000000000000001337', 'hex')
     const slot1 = Buffer.from(
       '0000000000000000000000000000000000000000000000000000000000000000',
@@ -291,6 +291,24 @@ tape('[EIP2930Transaction]', function (t) {
     t.ok(expectedSigned.equals(signed.serialize()), 'serialized signed message correct')
     t.ok(expectedHash.equals(signed.hash()), 'hash correct')
 
+    const expectedJSON = {
+      chainId: '0x796f6c6f763378',
+      nonce: '0x0',
+      gasPrice: '0x3b9aca00',
+      gasLimit: '0x62d4',
+      to: '0xdf0a88b2b68c673713a8ec826003676f272e3573',
+      value: '0x1',
+      data: '0x',
+      accessList: [
+        {
+          address: '0x0000000000000000000000000000000000001337',
+          storageKeys: ['0x0000000000000000000000000000000000000000000000000000000000000000'],
+        },
+      ],
+    }
+
+    t.deepEqual(signed.toJSON(), expectedJSON)
+
     t.end()
   })
 })

packages/tx/test/transactionFactory.spec.ts

@@ -13,11 +13,18 @@ const EIP2930Common = new Common({
   hardfork: 'berlin',
 })
 
+const pKey = Buffer.from('4646464646464646464646464646464646464646464646464646464646464646', 'hex')
+
 const simpleUnsignedEIP2930Transaction = EIP2930Transaction.fromTxData(
   { chainId: new BN(1) },
   { common: EIP2930Common }
 )
 
+const simpleUnsignedLegacyTransaction = LegacyTransaction.fromTxData({})
+
+const simpleSignedEIP2930Transaction = simpleUnsignedEIP2930Transaction.sign(pKey)
+const simpleSignedLegacyTransaction = simpleUnsignedLegacyTransaction.sign(pKey)
+
 tape('[TransactionFactory]: Basic functions', function (t) {
   t.test('should return the right type', function (st) {
     const serialized = simpleUnsignedEIP2930Transaction.serialize()
@@ -78,4 +85,38 @@ tape('[TransactionFactory]: Basic functions', function (t) {
     })
     st.end()
   })
+
+  t.test('should decode raw block body data', function (st) {
+    const rawLegacy = simpleSignedLegacyTransaction.raw()
+    const rawEIP2930 = simpleSignedEIP2930Transaction.raw()
+
+    const legacyTx = TransactionFactory.fromBlockBodyData(rawLegacy)
+    const eip2930Tx = TransactionFactory.fromBlockBodyData(rawEIP2930, { common: EIP2930Common })
+
+    st.equals(legacyTx.constructor.name, LegacyTransaction.name)
+    st.equals(eip2930Tx.constructor.name, EIP2930Transaction.name)
+    st.end()
+  })
+
+  t.test('should create the right transaction types from tx data', function (st) {
+    const legacyTx = TransactionFactory.fromTxData({ type: 0 })
+    const legacyTx2 = TransactionFactory.fromTxData({})
+    const eip2930Tx = TransactionFactory.fromTxData({ type: 1 }, { common: EIP2930Common })
+    st.throws(() => {
+      TransactionFactory.fromTxData({ type: 1 })
+    })
+
+    st.equals(legacyTx.constructor.name, LegacyTransaction.name)
+    st.equals(legacyTx2.constructor.name, LegacyTransaction.name)
+    st.equals(eip2930Tx.constructor.name, EIP2930Transaction.name)
+    st.end()
+  })
+
+  t.test('if eip2718 is not activated, always return that the eip is not activated', function (st) {
+    const newCommon = new Common({ chain: 'mainnet', hardfork: 'istanbul' })
+
+    const eip2930Active = TransactionFactory.eipSupport(newCommon, 2930)
+    st.ok(!eip2930Active)
+    st.end()
+  })
 })