Skip to content

Fix IsProofFinalized to use withdrawal hash instead of L2 tx hash #68

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
saddam92 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix IsProofFinalized to use withdrawal hash instead of L2 tx hash #68

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion withdraw/fpwithdraw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ func (w *FPWithdrawer) ProveWithdrawal() error {
}

func (w *FPWithdrawer) IsProofFinalized() (bool, error) {
return w.Portal.FinalizedWithdrawals(&bind.CallOpts{}, w.L2TxHash)
hash, err := w.getWithdrawalHash()
if err != nil {
return false, err
}

return w.Portal.FinalizedWithdrawals(&bind.CallOpts{}, hash)
}

func (w *FPWithdrawer) FinalizeWithdrawal() error {
Expand Down
18 changes: 17 additions & 1 deletion withdraw/withdraw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,23 @@ func (w *Withdrawer) ProveWithdrawal() error {
}

func (w *Withdrawer) IsProofFinalized() (bool, error) {
return w.Portal.FinalizedWithdrawals(&bind.CallOpts{}, w.L2TxHash)
l2 := ethclient.NewClient(w.L2Client)
receipt, err := l2.TransactionReceipt(w.Ctx, w.L2TxHash)
if err != nil {
return false, err
}

ev, err := withdrawals.ParseMessagePassed(receipt)
if err != nil {
return false, err
}

hash, err := withdrawals.WithdrawalHash(ev)
if err != nil {
return false, err
}

return w.Portal.FinalizedWithdrawals(&bind.CallOpts{}, hash)
}

func (w *Withdrawer) FinalizeWithdrawal() error {
Expand Down