Skip to content

fix(gravity): clamp batch timeout projection height #1284

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

Open
jamilahmadzai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(gravity): clamp batch timeout projection height #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions x/gravity/keeper/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ func (k Keeper) BuildOutgoingTxBatch(ctx sdk.Context, contractAddress, feeReceiv

// GetBatchTimeoutHeight This gets the batch timeout height in External blocks.
func (k Keeper) GetBatchTimeoutHeight(ctx sdk.Context) (uint64, uint64) {
currentMeHeight := ctx.BlockHeight()
currentMeHeight := uint64(0)
if ctx.BlockHeight() > 0 {
currentMeHeight = uint64(ctx.BlockHeight())
}
params := k.GetParams(ctx)
if params.AverageExternalBlockTime == 0 {
return 0, 0
Expand All @@ -93,8 +96,11 @@ func (k Keeper) GetBatchTimeoutHeight(ctx sdk.Context) (uint64, uint64) {
if heights.ExternalBlockHeight == 0 {
return 0, 0
}
if currentMeHeight < heights.BlockHeight {
currentMeHeight = heights.BlockHeight
}
// we project how long it has been in milliseconds since the last Ethereum block height was observed
projectedMillis := (uint64(currentMeHeight) - heights.BlockHeight) * params.AverageBlockTime
projectedMillis := (currentMeHeight - heights.BlockHeight) * params.AverageBlockTime
// we convert that projection into the current Ethereum height using the average Ethereum block time in millis
projectedCurrentEthereumHeight := (projectedMillis / params.AverageExternalBlockTime) + heights.ExternalBlockHeight
// we convert our target time for block timeouts (lets say 12 hours) into a number of blocks to
Expand Down
16 changes: 16 additions & 0 deletions x/gravity/keeper/batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,22 @@ func (suite *KeeperTestSuite) TestLastPendingBatchRequestByAddr() {
}
}

func (suite *KeeperTestSuite) TestBatchTimeoutHeightDoesNotUnderflowWhenObservedLocalHeightAhead() {
suite.SetupTest()

suite.Ctx = suite.Ctx.WithBlockHeight(1)
suite.Keeper().SetLastObservedBlockHeight(suite.Ctx, 1_000, 100)

params := suite.Keeper().GetParams(suite.Ctx)
expectedBlocksToAdd := params.ExternalBatchTimeout / params.AverageExternalBlockTime

projectedHeight, batchTimeout := suite.Keeper().GetBatchTimeoutHeight(suite.Ctx)

suite.Require().Equal(uint64(1_000), projectedHeight)
suite.Require().Equal(uint64(1_000)+expectedBlocksToAdd, batchTimeout)
suite.Require().Less(batchTimeout, uint64(2_000_000))
}

func (suite *KeeperTestSuite) TestKeeper_DeleteBatchConfirm() {
tokenContract := helpers.GenerateAddress().Hex()
batch := &types.OutgoingTxBatch{
Expand Down
Loading