tx: used BN as yParity and chainId input in getSenderPublicKey()

holgerd77 · holgerd77 · commit 59eacbf710d2 · 2021-03-05T11:38:10.000+01:00
diff --git a/packages/tx/src/eip2930Transaction.ts b/packages/tx/src/eip2930Transaction.ts
@@ -351,7 +351,7 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti
     try {
       return ecrecover(
         msgHash,
-        yParity.toNumber() + 27, // Recover the 27 which was stripped from ecsign
+        yParity.addn(27), // Recover the 27 which was stripped from ecsign
         bnToRlp(r),
         bnToRlp(s)
       )
diff --git a/packages/tx/src/legacyTransaction.ts b/packages/tx/src/legacyTransaction.ts
@@ -258,7 +258,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction
         v,
         bnToRlp(r),
         bnToRlp(s),
-        this._signedTxImplementsEIP155() ? this.getChainId() : undefined
+        this._signedTxImplementsEIP155() ? new BN(this.getChainId().toString()) : undefined
       )
     } catch (e) {
       throw new Error('Invalid Signature')

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ export default class EIP2930Transaction extends BaseTransaction<EIP2930Transacti`
`351`	`351`	`try {`
`352`	`352`	`return ecrecover(`
`353`	`353`	`msgHash,`
`354`		`- yParity.toNumber() + 27, // Recover the 27 which was stripped from ecsign`
	`354`	`+ yParity.addn(27), // Recover the 27 which was stripped from ecsign`
`355`	`355`	`bnToRlp(r),`
`356`	`356`	`bnToRlp(s)`
`357`	`357`	`)`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ export default class LegacyTransaction extends BaseTransaction<LegacyTransaction`
`258`	`258`	`v,`
`259`	`259`	`bnToRlp(r),`
`260`	`260`	`bnToRlp(s),`
`261`		`- this._signedTxImplementsEIP155() ? this.getChainId() : undefined`
	`261`	`+ this._signedTxImplementsEIP155() ? new BN(this.getChainId().toString()) : undefined`
`262`	`262`	`)`
`263`	`263`	`} catch (e) {`
`264`	`264`	`throw new Error('Invalid Signature')`