From 4d6ba54e2f9221bf69b2cd7adf8d711a2fcaa0a8 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Wed, 14 Jun 2023 13:00:48 +0200 Subject: [PATCH] Fix integration tests after ChainID move --- core/types/dynamic_fee_tx.go | 4 ++++ core/types/transaction_signing.go | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index ab5160c2d0c..04c2b4cd37d 100644 --- 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 index 899bc9fb6cd..e21d2e2ef49 100644 --- 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)