forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into manav/upstream_merge_v1.14.13

Browse source
This commit is contained in:
Manav Darji 2025-05-03 10:25:14 -04:00
commit 7f2319d4ac
No known key found for this signature in database
GPG key ID: A426F0124435F36E
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -300,7 +300,7 @@ jobs:
- name: Upload code and chain data - name: Upload code and chain data
if: always() if: always()
- uses: PaloAltoNetworks/upload-secure-artifact@main uses: PaloAltoNetworks/upload-secure-artifact@main
with: with:
name: code_${{ github.run_id }} name: code_${{ github.run_id }}
path: code.tar.gz path: code.tar.gz

2
core/types/block.go
View file

@ -221,7 +221,7 @@ func (h *Header) ValidateBlockNumberOptionsPIP15(minBlockNumber *big.Int, maxBlo
return nil return nil
} }
// ValidateBlockNumberOptionsPIP15 validates the timestamp range passed as in the options parameter in the conditional transaction (PIP-15) // ValidateTimestampOptionsPIP15 validates the timestamp range passed as in the options parameter in the conditional transaction (PIP-15)
func (h *Header) ValidateTimestampOptionsPIP15(minTimestamp *uint64, maxTimestamp *uint64) error { func (h *Header) ValidateTimestampOptionsPIP15(minTimestamp *uint64, maxTimestamp *uint64) error {
currentBlockTime := h.Time currentBlockTime := h.Time