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

fix(contracts): OZ-L10 maxReplayTimes is Not Initialized in L1ScrollMessenger #852

Merged
merged 5 commits into from
Aug 25, 2023
Merged

fix(contracts): OZ-L10 maxReplayTimes is Not Initialized in L1ScrollMessenger #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
020d272
initialize maxReplayTimes on constructor
zimpha Aug 22, 2023
5eb809d
chore: auto version bump [bot]
zimpha Aug 22, 2023
929b3e5
Merge branch 'develop' into fix/maxReplayTimes_is_not_initialized_in_…
HAOYUatHZ Aug 22, 2023
e4df55a
chore: auto version bump [bot]
HAOYUatHZ Aug 22, 2023
402be64
Merge branch 'develop' into fix/maxReplayTimes_is_not_initialized_in_…
HAOYUatHZ Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
)

var tag = "v4.1.106"
var tag = "v4.1.107"

var commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
Expand Down
3 changes: 3 additions & 0 deletions contracts/src/L1/L1ScrollMessenger.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {

rollup = _rollup;
messageQueue = _messageQueue;

maxReplayTimes = 3;
emit UpdateMaxReplayTimes(0, 3);
}

/*****************************
Expand Down
6 changes: 4 additions & 2 deletions contracts/src/test/L1ScrollMessengerTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {

exceedValue = bound(exceedValue, 1, address(this).balance / 2);

l1Messenger.updateMaxReplayTimes(0);

// append a message
l1Messenger.sendMessage{value: 100}(address(0), 100, new bytes(0), 0, refundAddress);

Expand Down Expand Up @@ -179,9 +181,9 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
hevm.stopPrank();

hevm.expectEmit(false, false, false, true);
emit UpdateMaxReplayTimes(0, _maxReplayTimes);
emit UpdateMaxReplayTimes(3, _maxReplayTimes);

assertEq(l1Messenger.maxReplayTimes(), 0);
assertEq(l1Messenger.maxReplayTimes(), 3);
l1Messenger.updateMaxReplayTimes(_maxReplayTimes);
assertEq(l1Messenger.maxReplayTimes(), _maxReplayTimes);
}
Expand Down