tx -> EIP-2930: added generic sign(), getSenderAddress(), getSenderPublicKey(), verifySignature() tests

Author: holgerd77

packages/tx/test/api.spec.ts

@@ -1,6 +1,6 @@
 import tape from 'tape'
 import { Buffer } from 'buffer'
-import { BN, rlp, privateToPublic, toBuffer, bufferToHex, unpadBuffer } from 'ethereumjs-util'
+import { BN, rlp, toBuffer, bufferToHex, unpadBuffer } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { LegacyTransaction, TxData } from '../src'
 import { TxsJsonEntry, VitaliksTestsDataEntry } from './types'
@@ -80,51 +80,6 @@ tape('[Transaction]', function (t) {
     st.end()
   })
 
-  t.test('sign()', function (st) {
-    transactions.forEach(function (tx, i) {
-      const { privateKey } = txFixtures[i]
-      if (privateKey) {
-        st.ok(tx.sign(Buffer.from(privateKey, 'hex')), 'should sign tx')
-      }
-    })
-    st.end()
-  })
-
-  t.test("should get sender's address after signing it", function (st) {
-    transactions.forEach(function (tx, i) {
-      const { privateKey, sendersAddress } = txFixtures[i]
-      if (privateKey) {
-        const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
-        st.equals(signedTx.getSenderAddress().toString(), '0x' + sendersAddress)
-      }
-    })
-    st.end()
-  })
-
-  t.test("should get sender's public key after signing it", function (st) {
-    transactions.forEach(function (tx, i) {
-      const { privateKey } = txFixtures[i]
-      if (privateKey) {
-        const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
-        const txPubKey = signedTx.getSenderPublicKey()
-        const pubKeyFromPriv = privateToPublic(Buffer.from(privateKey, 'hex'))
-        st.ok(txPubKey.equals(pubKeyFromPriv))
-      }
-    })
-    st.end()
-  })
-
-  t.test('should verify signing it', function (st) {
-    transactions.forEach(function (tx, i) {
-      const { privateKey } = txFixtures[i]
-      if (privateKey) {
-        const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
-        st.ok(signedTx.verifySignature())
-      }
-    })
-    st.end()
-  })
-
   t.test('should validate with string option', function (st) {
     transactions.forEach(function (tx) {
       st.ok(typeof tx.validate(true)[0] === 'string')

packages/tx/test/base.spec.ts

@@ -3,6 +3,7 @@ import Common from '@ethereumjs/common'
 import { LegacyTransaction, EIP2930Transaction } from '../src'
 import { TxsJsonEntry } from './types'
 import { BaseTransaction } from '../src/baseTransaction'
+import { privateToPublic } from 'ethereumjs-util'
 
 tape('[BaseTransaction]', function (t) {
   const legacyFixtures: TxsJsonEntry[] = require('./json/txs.json')
@@ -144,7 +145,66 @@ tape('[BaseTransaction]', function (t) {
         st.notOk(tx.validate(), `${txType.name}: should not validate correctly`)
       })
     }
+    st.end()
+  })
+
+  t.test('sign()', function (st) {
+    for (const txType of txTypes) {
+      txType.txs.forEach(function (tx: any, i: number) {
+        const { privateKey } = txType.fixtures[i]
+        if (privateKey) {
+          st.ok(tx.sign(Buffer.from(privateKey, 'hex')), `${txType.name}: should sign tx`)
+        }
+      })
+    }
+    st.end()
+  })
+
+  t.test('getSenderAddress()', function (st) {
+    for (const txType of txTypes) {
+      txType.txs.forEach(function (tx: any, i: number) {
+        const { privateKey, sendersAddress } = txType.fixtures[i]
+        if (privateKey) {
+          const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
+          st.equals(
+            signedTx.getSenderAddress().toString(),
+            `0x${sendersAddress}`,
+            `${txType.name}: should get sender's address after signing it`
+          )
+        }
+      })
+    }
+    st.end()
+  })
+
+  t.test('getSenderPublicKey()', function (st) {
+    for (const txType of txTypes) {
+      txType.txs.forEach(function (tx: any, i: number) {
+        const { privateKey } = txType.fixtures[i]
+        if (privateKey) {
+          const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
+          const txPubKey = signedTx.getSenderPublicKey()
+          const pubKeyFromPriv = privateToPublic(Buffer.from(privateKey, 'hex'))
+          st.ok(
+            txPubKey.equals(pubKeyFromPriv),
+            `${txType.name}: should get sender's public key after signing it`
+          )
+        }
+      })
+    }
+    st.end()
+  })
 
+  t.test('verifySignature()', function (st) {
+    for (const txType of txTypes) {
+      txType.txs.forEach(function (tx: any, i: number) {
+        const { privateKey } = txType.fixtures[i]
+        if (privateKey) {
+          const signedTx = tx.sign(Buffer.from(privateKey, 'hex'))
+          st.ok(signedTx.verifySignature(), `${txType.name}: should verify signing it`)
+        }
+      })
+    }
     st.end()
   })
 })