Update contracts submodule pin to latest develop #1791
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cla-bot
bot
added
the
s
PlasmaPower
force-pushed
the
update-contracts
branch
from
402164f
to
386d5ad
Compare
Codecov Report
@@ Coverage Diff @@
## master #1791 +/- ##
==========================================
- Coverage 56.70% 56.65% -0.05%
==========================================
Files 222 222
Lines 33572 33552 -20
==========================================
- Hits 19036 19008 -28
- Misses 12178 12186 +8
Partials 2358 2358 |
Tristan-Wilson
approved these changes
Aug 4, 2023
Comment on lines
-266
to
-278
| sequencerInbox, err := bridgegen.NewSequencerInbox(info.SequencerInbox, l1client) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error getting sequencer inbox: %w", err) | ||
| } | ||
|
|
||
| // if a zero sequencer address is specified, don't authorize any sequencers | ||
| if sequencer != (common.Address{}) { | ||
| tx, err = sequencerInbox.SetIsBatchPoster(deployAuth, sequencer, true) | ||
| err = andTxSucceeded(ctx, l1Reader, tx, err) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error setting is batch poster: %w", err) | ||
| } | ||
| } |
There was a problem hiding this comment.
Confirmed this logic has been moved into the contract https://github.com/OffchainLabs/nitro-contracts/blame/252e690df81dc6555e036c9b1f76a374721bcfd6/src/rollup/RollupCreator.sol#L86
Comment on lines
-280
to
-296
| var allowValidators []bool | ||
| var validatorAddrs []common.Address | ||
| for i := uint64(1); i <= authorizeValidators; i++ { | ||
| validatorAddrs = append(validatorAddrs, crypto.CreateAddress(validatorWalletCreator, i)) | ||
| allowValidators = append(allowValidators, true) | ||
| } | ||
| if len(validatorAddrs) > 0 { | ||
| rollup, err := rollupgen.NewRollupAdminLogic(info.RollupAddress, l1client) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error getting rollup admin: %w", err) | ||
| } | ||
| tx, err = rollup.SetValidator(deployAuth, validatorAddrs, allowValidators) | ||
| err = andTxSucceeded(ctx, l1Reader, tx, err) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error setting validator: %w", err) | ||
| } | ||
| } |
There was a problem hiding this comment.
Confirmed this logic was moved into the contract https://github.com/OffchainLabs/nitro-contracts/blame/252e690df81dc6555e036c9b1f76a374721bcfd6/src/rollup/RollupCreator.sol#L139
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The notable change in the contracts is that the RollupCreator now accepts a batch poster and list of validators to authorize as part of the deployment.
This PR also bumps geth to the latest master to include OffchainLabs/go-ethereum#245replaced with #1790