Fix integration tests after ChainID move (#7734)

Post-fix after PR #7732
ledgerwatch · Jun 14, 2023 · 4a2a199 · 4a2a199
1 parent 2dd7df9
commit 4a2a199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go
@@ -457,6 +457,10 @@ func (tx DynamicFeeTransaction) RawSignatureValues() (*uint256.Int, *uint256.Int
 	return &tx.V, &tx.R, &tx.S
 }
 
+func (tx DynamicFeeTransaction) GetChainID() *uint256.Int {
+	return tx.ChainID
+}
+
 func (tx *DynamicFeeTransaction) Sender(signer Signer) (libcommon.Address, error) {
 	if sc := tx.from.Load(); sc != nil {
 		return sc.(libcommon.Address), nil

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
@@ -336,9 +336,6 @@ func DeriveChainId(v *uint256.Int) *uint256.Int {
 		if v == 27 || v == 28 {
 			return new(uint256.Int)
 		}
-		if v < 35 {
-			return nil
-		}
 		return new(uint256.Int).SetUint64((v - 35) / 2)
 	}
 	r := new(uint256.Int).Sub(v, u256.Num35)