diff --git a/consensus/system_contract/consensus.go b/consensus/system_contract/consensus.go index 797297870d..c01bec805a 100644 --- a/consensus/system_contract/consensus.go +++ b/consensus/system_contract/consensus.go @@ -130,7 +130,7 @@ func (s *SystemContract) verifyHeader(chain consensus.ChainHeaderReader, header return errInvalidNonce } // Check that the BlockSignature contains signature if block is not requested - if !header.Requested && header.Number.Cmp(big.NewInt(0)) != 0 && len(header.BlockSignature) != extraSeal { + if header.Number.Cmp(big.NewInt(0)) != 0 && len(header.BlockSignature) != extraSeal { return errMissingSignature } // Ensure that the mix digest is zero @@ -197,20 +197,17 @@ func (s *SystemContract) verifyCascadingFields(chain consensus.ChainHeaderReader return err } - // only if block header has NOT been requested, then verify the signature against the current signer - if !header.Requested { - signer, err := ecrecover(header) - if err != nil { - return err - } + signer, err := ecrecover(header) + if err != nil { + return err + } - s.lock.RLock() - defer s.lock.RUnlock() + s.lock.RLock() + defer s.lock.RUnlock() - if signer != s.signerAddressL1 { - log.Error("Unauthorized signer", "Got", signer, "Expected:", s.signerAddressL1) - return ErrUnauthorizedSigner - } + if signer != s.signerAddressL1 { + log.Error("Unauthorized signer", "Got", signer, "Expected:", s.signerAddressL1) + return ErrUnauthorizedSigner } return nil diff --git a/params/version.go b/params/version.go index c3e76c74e6..e663a587e8 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release - VersionPatch = 41 // Patch version component of the current release + VersionPatch = 42 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )