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

fix ignore deposit if fails during gasestimation #424

Merged
merged 3 commits into from
May 25, 2023
Merged

fix ignore deposit if fails during gasestimation #424

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dc93fe
fix ignore deposit if fails during gasestimation
ARR552 May 25, 2023
3b555a0
log
ARR552 May 25, 2023
13f4435
suggestion
ARR552 May 25, 2023
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
53 changes: 37 additions & 16 deletions claimtxman/claimtxman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,46 @@ func (tm *ClaimTxManager) updateDepositsStatus(ger *etherman.GlobalExitRoot) err
if err != nil {
return err
}
err = tm.processDepositStatus(ger, dbTx)
if err != nil {
log.Errorf("error processing ger. Error: %v", err)
rollbackErr := tm.storage.Rollback(tm.ctx, dbTx)
if rollbackErr != nil {
log.Errorf("claimtxman error rolling back state. RollbackErr: %v, err: %s", rollbackErr, err.Error())
return rollbackErr
}
return err
}
err = tm.storage.Commit(tm.ctx, dbTx)
if err != nil {
log.Errorf("AddClaimTx committing dbTx. Err: %v", err)
rollbackErr := tm.storage.Rollback(tm.ctx, dbTx)
if rollbackErr != nil {
log.Fatalf("claimtxman error rolling back state. RollbackErr: %s, err: %s", rollbackErr.Error(), err.Error())
}
log.Fatalf("AddClaimTx committing dbTx, err: %s", err.Error())
}
return nil
}

func (tm *ClaimTxManager) processDepositStatus(ger *etherman.GlobalExitRoot, dbTx pgx.Tx) error {
if ger.BlockID != 0 { // L2 exit root is updated
log.Infof("Rollup exitroot %v is updated", ger.ExitRoots[1])
if err := tm.storage.UpdateL2DepositsStatus(tm.ctx, ger.ExitRoots[1][:], tm.l2NetworkID, dbTx); err != nil {
log.Errorf("error updating L2DepositsStatus. Error: %v", err)
return err
}
} else { // L1 exit root is updated in the trusted state
log.Infof("Mainnet exitroot %v is updated", ger.ExitRoots[0])
deposits, err := tm.storage.UpdateL1DepositsStatus(tm.ctx, ger.ExitRoots[0][:], dbTx)
if err != nil {
log.Errorf("error getting and updating L1DepositsStatus. Error: %v", err)
return err
}
for _, deposit := range deposits {
claimHash, err := tm.bridgeService.GetDepositStatus(tm.ctx, deposit.DepositCount, deposit.DestinationNetwork)
if err != nil {
log.Errorf("error getting deposit status for deposit %d. Error: %v", deposit.DepositCount, err)
return err
}
if len(claimHash) > 0 || deposit.LeafType == LeafTypeMessage {
Expand All @@ -122,6 +148,7 @@ func (tm *ClaimTxManager) updateDepositsStatus(ger *etherman.GlobalExitRoot) err
log.Infof("create the claim tx for the deposit %d", deposit.DepositCount)
ger, proves, err := tm.bridgeService.GetClaimProof(deposit.DepositCount, deposit.NetworkID, dbTx)
if err != nil {
log.Errorf("error getting Claim Proof for deposit %d. Error: %v", deposit.DepositCount, err)
return err
}
var mtProves [mtHeight][keyLen]byte
Expand All @@ -136,21 +163,15 @@ func (tm *ClaimTxManager) updateDepositsStatus(ger *etherman.GlobalExitRoot) err
}},
tm.auth)
if err != nil {
log.Error("error BuildSendClaim tx for deposit %d. Error: %v", deposit.DepositCount, err)
return err
}
if err = tm.addClaimTx(deposit.DepositCount, deposit.BlockID, tm.auth.From, tx.To(), nil, tx.Data(), dbTx); err != nil {
log.Error("error adding claim tx for deposit %d. Error: %v", deposit.DepositCount, err)
return err
}
}
}
err = tm.storage.Commit(tm.ctx, dbTx)
if err != nil {
rollbackErr := tm.storage.Rollback(tm.ctx, dbTx)
if rollbackErr != nil {
log.Fatalf("claimtxman error rolling back state. RollbackErr: %s, err: %s", rollbackErr.Error(), err.Error())
}
log.Fatalf("AddClaimTx committing dbTx, err: %s", err.Error())
}
return nil
}

Expand All @@ -169,13 +190,6 @@ func (tm *ClaimTxManager) getNextNonce(from common.Address) (uint64, error) {
}

func (tm *ClaimTxManager) addClaimTx(id uint, blockID uint64, from common.Address, to *common.Address, value *big.Int, data []byte, dbTx pgx.Tx) error {
// get next nonce
nonce, err := tm.getNextNonce(from)
if err != nil {
err := fmt.Errorf("failed to get current nonce: %w", err)
log.Errorf(err.Error())
return err
}
// get gas
gas, err := tm.l2Node.EstimateGas(tm.ctx, ethereum.CallMsg{
From: from,
Expand All @@ -184,7 +198,14 @@ func (tm *ClaimTxManager) addClaimTx(id uint, blockID uint64, from common.Addres
Data: data,
})
if err != nil {
log.Errorf("failed to estimate gas: %w, data: %v", err, common.Bytes2Hex(data))
log.Errorf("failed to estimate gas. Ignoring tx... Error: %v, data: %s", err, common.Bytes2Hex(data))
return nil
}
// get next nonce
nonce, err := tm.getNextNonce(from)
if err != nil {
err := fmt.Errorf("failed to get current nonce: %w", err)
log.Errorf(err.Error())
return err
}

Expand Down