Skip to content

fix: make Log2Floor and Log2Ceil return 0 for input 0 instead of panicking #3652

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
wants to merge 16 commits into
base: master
Choose a base branch
from
+368 −262
Open

fix: make Log2Floor and Log2Ceil return 0 for input 0 instead of panicking #3652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
96a2468
Update intlog2.go
oooLowNeoNooo Sep 17, 2025
eabd240
Update intlog2_test.go
oooLowNeoNooo Sep 17, 2025
d2d9aa9
Merge branch 'master' into fix/log2-zero-handling-consistency
eljobe Sep 26, 2025
e561ebd
Merge branch 'OffchainLabs:master' into fix/log2-zero-handling-consis…
oooLowNeoNooo Oct 1, 2025
ae3e7a3
Update math.go
oooLowNeoNooo Oct 1, 2025
b0cc6cd
Update math_test.go
oooLowNeoNooo Oct 1, 2025
72d7d76
Update history_commitment.go
oooLowNeoNooo Oct 1, 2025
5c2fc2b
Update tracker.go
oooLowNeoNooo Oct 1, 2025
680b29e
Update ancestors.go
oooLowNeoNooo Oct 1, 2025
beb2939
Delete bold/math/intlog2.go
oooLowNeoNooo Oct 1, 2025
c3e35b8
Delete bold/math/intlog2_test.go
oooLowNeoNooo Oct 1, 2025
4b5164b
Delete bold/math/math.go
oooLowNeoNooo Oct 1, 2025
cec3369
Delete bold/math/math_test.go
oooLowNeoNooo Oct 1, 2025
08b5b23
Update math.go
oooLowNeoNooo Oct 1, 2025
e7dc7a4
Update math_fuzz_test.go
oooLowNeoNooo Oct 1, 2025
3718ff1
Create math_bench_test.go
oooLowNeoNooo Oct 1, 2025
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
6 changes: 3 additions & 3 deletions bold/challenge-manager/challenge-tree/ancestors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/pkg/errors"

"github.com/offchainlabs/nitro/bold/chain-abstraction"
protocol "github.com/offchainlabs/nitro/bold/chain-abstraction"
"github.com/offchainlabs/nitro/bold/containers"
"github.com/offchainlabs/nitro/bold/containers/threadsafe"
"github.com/offchainlabs/nitro/bold/math"
"github.com/offchainlabs/nitro/util/arbmath"
)

var (
Expand Down Expand Up @@ -169,7 +169,7 @@ func (ht *RoyalChallengeTree) findHonestAncestorsWithinChallengeLevel(

currStart, _ := cursor.StartCommitment()
currEnd, _ := cursor.EndCommitment()
bisectTo, err := math.Bisect(uint64(currStart), uint64(currEnd))
bisectTo, err := arbmath.Bisect(uint64(currStart), uint64(currEnd))
if err != nil {
return nil, nil, errors.Wrapf(err, "could not bisect start=%d, end=%d", currStart, currEnd)
}
Expand Down
10 changes: 5 additions & 5 deletions bold/challenge-manager/edge-tracker/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"

"github.com/offchainlabs/nitro/bold/chain-abstraction"
"github.com/offchainlabs/nitro/bold/challenge-manager/challenge-tree"
protocol "github.com/offchainlabs/nitro/bold/chain-abstraction"
challengetree "github.com/offchainlabs/nitro/bold/challenge-manager/challenge-tree"
"github.com/offchainlabs/nitro/bold/containers"
"github.com/offchainlabs/nitro/bold/containers/events"
"github.com/offchainlabs/nitro/bold/containers/fsm"
"github.com/offchainlabs/nitro/bold/containers/option"
"github.com/offchainlabs/nitro/bold/layer2-state-provider"
"github.com/offchainlabs/nitro/bold/math"
l2stateprovider "github.com/offchainlabs/nitro/bold/layer2-state-provider"
"github.com/offchainlabs/nitro/bold/state-commitments/history"
utilTime "github.com/offchainlabs/nitro/bold/time"
"github.com/offchainlabs/nitro/util/arbmath"
)

var (
Expand Down Expand Up @@ -530,7 +530,7 @@ func (et *Tracker) DetermineBisectionHistoryWithProof(
) (history.History, []byte, error) {
startHeight, _ := et.edge.StartCommitment()
endHeight, _ := et.edge.EndCommitment()
bisectTo, err := math.Bisect(uint64(startHeight), uint64(endHeight))
bisectTo, err := arbmath.Bisect(uint64(startHeight), uint64(endHeight))
if err != nil {
return history.History{}, nil, errors.Wrapf(err, "determining bisection point errored for %d and %d", startHeight, endHeight)
}
Expand Down
28 changes: 0 additions & 28 deletions bold/math/intlog2.go
View file
Open in desktop

This file was deleted.

141 changes: 0 additions & 141 deletions bold/math/intlog2_test.go
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions bold/math/math.go
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions bold/math/math_test.go
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions bold/state-commitments/history/history_commitment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"

"github.com/offchainlabs/nitro/bold/math"
"github.com/offchainlabs/nitro/util/arbmath"
)

var (
Expand Down Expand Up @@ -237,11 +237,11 @@ func (h *historyCommitter) computeRoot(leaves []common.Hash, virtual uint64) (co
}
hashed := h.hashLeaves(leaves)
limit := nextPowerOf2(virtual)
depth, err := safecast.ToUint(math.Log2Floor(limit))
depth, err := safecast.ToUint(arbmath.Log2Floor(limit))
if err != nil {
return emptyHash, err
}
n, err := safecast.ToUint(math.Log2Ceil(virtual))
n, err := safecast.ToUint(arbmath.Log2Ceil(virtual))
if err != nil {
return emptyHash, err
}
Expand Down Expand Up @@ -313,7 +313,7 @@ func (h *historyCommitter) partialRoot(leaves []common.Hash, virtual, limit uint
if limit < virtual {
return emptyHash, fmt.Errorf("limit %d should be >= virtual %d", limit, virtual)
}
minFillers := math.Log2Ceil(uint64(virtual))
minFillers := arbmath.Log2Ceil(uint64(virtual))
if len(h.fillers) < minFillers {
return emptyHash, fmt.Errorf("insufficient fillers, want %d, got %d", minFillers, len(h.fillers))
}
Expand Down Expand Up @@ -360,7 +360,7 @@ func (h *historyCommitter) partialRoot(leaves []common.Hash, virtual, limit uint
// made purely of virtual nodes, and it is a complete tree.
// So, the root of the subtree will be the precomputed filler
// at the current layer.
right = h.fillers[math.Log2Floor(uint64(mid))]
right = h.fillers[arbmath.Log2Floor(uint64(mid))]
h.handle(right)
} else {
var rLeaves []common.Hash
Expand Down Expand Up @@ -524,7 +524,7 @@ func (h *historyCommitter) prefixAndProof(index uint64, leaves []common.Hash, vi
if index+1 > virtual {
return nil, nil, fmt.Errorf("index %d + 1 should be <= virtual %d", index, virtual)
}
logVirtual, err := safecast.ToUint(math.Log2Floor(virtual) + 1)
logVirtual, err := safecast.ToUint(arbmath.Log2Floor(virtual) + 1)
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -574,7 +574,7 @@ func lastLeafProofPositions(virtual uint64) ([]treePosition, error) {
return []treePosition{}, nil
}
limit := nextPowerOf2(uint64(virtual))
depth := math.Log2Floor(limit)
depth := arbmath.Log2Floor(limit)
positions := make([]treePosition, depth)
idx := uint64(virtual) - 1
for l := range positions {
Expand Down
Loading
Loading