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

reflect new contract changes #33

Merged
merged 1 commit into from
Dec 24, 2024
Merged

reflect new contract changes #33

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
21 changes: 15 additions & 6 deletions sequencer/eth/rollup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ func NewRollupClient(client *EthereumClient, address ethCommon.Address) (*Rollup
func (c *RollupClient) RollupConstants() (rollupConstants *common.RollupConstants, err error) {
rollupConstants = new(common.RollupConstants)
if err := c.client.Call(func(ec *ethclient.Client) error {
absoluteMaxL1L2BatchTimeout, err := c.sybil.ABSOLUTEMAXL1BATCHTIMEOUT(c.opts)
absoluteMaxL1L2BatchTimeout, err := c.sybil.ABSOLUTEMAXBATCHTIMEOUT(c.opts)
if err != nil {
return common.Wrap(err)
}
Expand All @@ -338,7 +338,7 @@ func (c *RollupClient) RollupConstants() (rollupConstants *common.RollupConstant
// if err != nil {
// return common.Wrap(err)
// }
rollupVerifier, err := c.sybil.RollupVerifiers(c.opts, big.NewInt(0))
rollupVerifier, err := c.sybil.RollupVerifier(c.opts)
if err != nil {
return common.Wrap(err)
}
Expand All @@ -354,8 +354,8 @@ func (c *RollupClient) RollupConstants() (rollupConstants *common.RollupConstant
// newRollupVerifier)
// }
var newRollupVerifier common.RollupVerifierStruct
newRollupVerifier.MaxTx = rollupVerifier.MaxTxs.Int64()
newRollupVerifier.NLevels = rollupVerifier.NLevels.Int64()
newRollupVerifier.MaxTx = rollupVerifier.MaxTx.Int64()
newRollupVerifier.NLevels = rollupVerifier.NLevel.Int64()
rollupConstants.Verifiers = append(rollupConstants.Verifiers,
newRollupVerifier)
return common.Wrap(err)
Expand Down Expand Up @@ -586,8 +586,17 @@ func (c *RollupClient) RollupForgeBatch(args *RollupForgeBatchArgs, auth *bind.T
// }

// TODO: Need to send ZK Proof here on last param
tx, err = c.sybil.ForgeBatch(auth, newLastIdx, args.NewAccountRoot, args.NewVouchRoot, args.NewScoreRoot, args.NewExitRoot,
args.VerifierIdx, args.ProofA, args.ProofB, args.ProofC, args.NewScoreRoot)
tx, err = c.sybil.ForgeBatch(
auth,
newLastIdx,
args.NewAccountRoot,
args.NewVouchRoot,
args.NewScoreRoot,
args.NewExitRoot,
args.ProofA,
args.ProofB,
args.ProofC,
)
if err != nil {
return nil, fmt.Errorf("Sybil.ForgeBatch: %w", err)
}
Expand Down
Loading