Skip to content

feat: correct conf_remaining calculation #2541

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

Merged
mergify merged 2 commits into from
May 5, 2022
Merged

feat: correct conf_remaining calculation #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f865c5e
feat: add go packages to package.json
cfromknecht May 5, 2022
7fb8624
feat: correct conf_remaining calculation
cfromknecht May 5, 2022
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
5 changes: 5 additions & 0 deletions .changeset/hungry-turkeys-repeat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/teleportr': patch
---

Fix confs_remaining calculation to prevent underflow
12 changes: 9 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
"workspaces": {
"packages": [
"packages/*",
"l2geth",
"batch-submitter",
"bss-core",
"gas-oracle",
"indexer",
"integration-tests",
"go/*",
"l2geth-exporter",
"l2geth",
"ops/docker/rpc-proxy",
"ops/docker/hardhat",
"ops/docker/go-builder",
"ops/docker/js-builder"
"ops/docker/js-builder",
"proxyd",
"teleportr"
],
"nohoist": [
"**/typechain",
Expand Down
4 changes: 2 additions & 2 deletions teleportr/api/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ func (s *Server) HandleTrack(

var confsRemaining uint64
if teleport.Deposit.BlockNumber+s.numConfirmations > blockNumber+1 {
confsRemaining = blockNumber + 1 -
(teleport.Deposit.BlockNumber + s.numConfirmations)
confsRemaining = teleport.Deposit.BlockNumber + s.numConfirmations -
(blockNumber + 1)
Copy link
Contributor

@roninjin10 roninjin10 May 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wierd thing is I was reading this code and in my head it looked correct to me at the time

Copy link
Contributor Author

@cfromknecht cfromknecht May 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha well it looked correct to me as well when i wrote the first time 😅

}

resp := TrackResponse{
Expand Down