Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support "safe" param for eth_getBlockByNumber for 30 blocks #12110

Merged
merged 6 commits into from
Jun 21, 2024
Merged

feat: support "safe" param for eth_getBlockByNumber for 30 blocks #12110

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f15c2ef
add support for eth_getBlockByNumber to accept the term safe which we…
snissn Jun 18, 2024
c1eb71a
fix lint catch of unnecessary cast
snissn Jun 18, 2024
3404bb8
add finalized to get block by number
snissn Jun 20, 2024
bde6ad7
Update chain/types/ethtypes/eth_types.go
snissn Jun 20, 2024
fca5823
add test for eth get block by number to accept latest and safe and fi…
snissn Jun 21, 2024
84199c2
Merge branch 'mikers/safeEthGetBlockByNumber' of github.com:filecoin-…
snissn Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gateway/proxy_eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ func (gw *Node) checkBlkParam(ctx context.Context, blkParam string, lookback eth
break
}
num = ethtypes.EthUint64(head.Height()) - lookback
case "safe":
safeEpochDelay := 30 // https://github.com/filecoin-project/FIPs/blob/master/FRCs/frc-0089.md
rvagg marked this conversation as resolved.
Show resolved Hide resolved
num = ethtypes.EthUint64(head.Height()) - lookback - ethtypes.EthUint64(safeEpochDelay)
default:
if err := num.UnmarshalJSON([]byte(`"` + blkParam + `"`)); err != nil {
return fmt.Errorf("cannot parse block number: %v", err)
Expand Down
9 changes: 9 additions & 0 deletions node/impl/full/eth_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ func getTipsetByBlockNumber(ctx context.Context, chain *store.ChainStore, blkPar
return nil, fmt.Errorf("cannot get parent tipset")
}
return parent, nil
case "safe":
safeEpochDelay := abi.ChainEpoch(30) // https://github.com/filecoin-project/FIPs/blob/master/FRCs/frc-0089.md
latestHeight := head.Height() - 1
safeHeight := latestHeight - safeEpochDelay
ts, err := chain.GetTipsetByHeight(ctx, safeHeight, head, true)
if err != nil {
return nil, fmt.Errorf("cannot get tipset at height: %v", safeHeight)
}
return ts, nil
default:
var num ethtypes.EthUint64
err := num.UnmarshalJSON([]byte(`"` + blkParam + `"`))
Expand Down