fix already executed revert message (#407)

Co-authored-by: maskpp <maskpp266@gmail.com>

bridge/l1/relayer.go

@@ -153,7 +153,7 @@ func (r *Layer1Relayer) processSavedEvent(msg *types.L1Message) error {
 	if err != nil && err.Error() == "execution reverted: Message expired" {
 		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgExpired)
 	}
-	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
+	if err != nil && err.Error() == "execution reverted: Message was already successfully executed" {
 		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
 	}
 	if err != nil {
@@ -236,10 +236,6 @@ func (r *Layer1Relayer) Start() {
 				case cfm := <-r.messageCh:
 					bridgeL1MsgsRelayedConfirmedTotalCounter.Inc(1)
 					if !cfm.IsSuccessful {
-						err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgRelayFailed, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
-						}
 						log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
 					} else {
 						// @todo handle db error

bridge/l2/relayer.go

@@ -247,7 +247,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 	if err != nil && err.Error() == "execution reverted: Message expired" {
 		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgExpired)
 	}
-	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
+	if err != nil && err.Error() == "execution reverted: Message was already successfully executed" {
 		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
 	}
 	if err != nil {
@@ -564,19 +564,17 @@ func (r *Layer2Relayer) Stop() {
 }
 
 func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
+	if !confirmation.IsSuccessful {
+		log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
+		return
+	}
+
 	transactionType := "Unknown"
 	// check whether it is message relay transaction
 	if msgHash, ok := r.processingMessage.Load(confirmation.ID); ok {
 		transactionType = "MessageRelay"
-		var status types.MsgStatus
-		if confirmation.IsSuccessful {
-			status = types.MsgConfirmed
-		} else {
-			status = types.MsgRelayFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
 		// @todo handle db error
-		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), status, confirmation.TxHash.String())
+		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), types.MsgConfirmed, confirmation.TxHash.String())
 		if err != nil {
 			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash.(string), "err", err)
 		}
@@ -588,16 +586,9 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	if batchBatches, ok := r.processingBatchesCommitment.Load(confirmation.ID); ok {
 		transactionType = "BatchesCommitment"
 		batchHashes := batchBatches.([]string)
-		var status types.RollupStatus
-		if confirmation.IsSuccessful {
-			status = types.RollupCommitted
-		} else {
-			status = types.RollupCommitFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
 		for _, batchHash := range batchHashes {
 			// @todo handle db error
-			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), status)
+			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), types.RollupCommitted)
 			if err != nil {
 				log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_hash", batchHash, "err", err)
 			}
@@ -609,15 +600,8 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	// check whether it is proof finalization transaction
 	if batchHash, ok := r.processingFinalization.Load(confirmation.ID); ok {
 		transactionType = "ProofFinalization"
-		var status types.RollupStatus
-		if confirmation.IsSuccessful {
-			status = types.RollupFinalized
-		} else {
-			status = types.RollupFinalizeFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
 		// @todo handle db error
-		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), status)
+		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), types.RollupFinalized)
 		if err != nil {
 			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", batchHash.(string), "err", err)
 		}

common/types/db.go

@@ -82,9 +82,6 @@ const (
 
 	// MsgExpired represents the from_layer message status is expired
 	MsgExpired
-
-	// MsgRelayFailed represents the from_layer message status is relay failed
-	MsgRelayFailed
 )
 
 // L1Message is structure of stored layer1 bridge message
@@ -203,7 +200,7 @@ func (ps ProvingStatus) String() string {
 	}
 }
 
-// RollupStatus block_batch rollup_status (pending, committing, committed, commit_failed, finalizing, finalized, finalize_skipped, finalize_failed)
+// RollupStatus block_batch rollup_status (pending, committing, committed, finalizing, finalized)
 type RollupStatus int
 
 const (
@@ -221,10 +218,6 @@ const (
 	RollupFinalized
 	// RollupFinalizationSkipped : batch finalization is skipped
 	RollupFinalizationSkipped
-	// RollupCommitFailed : rollup commit transaction confirmed but failed
-	RollupCommitFailed
-	// RollupFinalizeFailed : rollup finalize transaction is confirmed but failed
-	RollupFinalizeFailed
 )
 
 // BlockBatch is structure of stored block_batch

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v3.0.2"
+var tag = "v3.0.1"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

database/migrate/migrations/00002_l1_message.sql

@@ -18,7 +18,7 @@ create table l1_message
 );
 
 comment
-on column l1_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
+on column l1_message.status is 'undefined, pending, submitted, confirmed, failed, expired';
 
 create unique index l1_message_hash_uindex
 on l1_message (msg_hash);

database/migrate/migrations/00003_l2_message.sql

@@ -18,7 +18,7 @@ create table l2_message
 );
 
 comment
-on column l2_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
+on column l2_message.status is 'undefined, pending, submitted, confirmed, failed, expired';
 
 create unique index l2_message_hash_uindex
 on l2_message (msg_hash);

database/migrate/migrations/00004_block_batch.sql

@@ -33,7 +33,7 @@ create table block_batch
 comment
 on column block_batch.proving_status is 'undefined, unassigned, skipped, assigned, proved, verified, failed';
 comment
-on column block_batch.rollup_status is 'undefined, pending, committing, committed, finalizing, finalized, finalization_skipped, commit_failed, finalize_failed';
+on column block_batch.rollup_status is 'undefined, pending, committing, committed, finalizing, finalized, finalization_skipped';
 comment
 on column block_batch.oracle_status is 'undefined, pending, importing, imported, failed';