naming

indexer/processors/bridge/l1_bridge_processor.go

@@ -28,14 +28,14 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		log.Info("detected transaction deposits", "size", len(optimismPortalTxDeposits))
 	}
 
-	totalDepositAmount := 0
+	portalDepositAmount := 0
 	portalDeposits := make(map[logKey]*contracts.OptimismPortalTransactionDepositEvent, len(optimismPortalTxDeposits))
 	transactionDeposits := make([]database.L1TransactionDeposit, len(optimismPortalTxDeposits))
 	for i := range optimismPortalTxDeposits {
 		depositTx := optimismPortalTxDeposits[i]
 		portalDeposits[logKey{depositTx.Event.BlockHash, depositTx.Event.LogIndex}] = &depositTx
 		if len(depositTx.Tx.Data) == 0 {
-			totalDepositAmount = totalDepositAmount + int(depositTx.Tx.Amount.Uint64())
+			portalDepositAmount = portalDepositAmount + int(depositTx.Tx.Amount.Uint64())
 		}
 
 		transactionDeposits[i] = database.L1TransactionDeposit{
@@ -51,7 +51,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 			return err
 		}
 		metrics.RecordL1TransactionDeposits(len(transactionDeposits))
-		metrics.RecordL1InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, totalDepositAmount)
+		metrics.RecordL1InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, portalDepositAmount)
 	}
 
 	// (2) L1CrossDomainMessenger
@@ -183,7 +183,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		log.Info("detected finalized withdrawals", "size", len(finalizedWithdrawals))
 	}
 
-	totalWithdrawalAmount := 0
+	portalWithdrawalAmount := 0
 	for i := range finalizedWithdrawals {
 		finalizedWithdrawal := finalizedWithdrawals[i]
 		withdrawal, err := db.BridgeTransactions.L2TransactionWithdrawal(finalizedWithdrawal.WithdrawalHash)
@@ -195,7 +195,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		}
 
 		if len(withdrawal.Tx.Data) == 0 {
-			totalWithdrawalAmount = totalWithdrawalAmount + int(withdrawal.Tx.Amount.Int64())
+			portalWithdrawalAmount = portalWithdrawalAmount + int(withdrawal.Tx.Amount.Int64())
 		}
 
 		if err = db.BridgeTransactions.MarkL2TransactionWithdrawalFinalizedEvent(finalizedWithdrawal.WithdrawalHash, finalizedWithdrawal.Event.GUID, finalizedWithdrawal.Success); err != nil {
@@ -205,7 +205,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 	}
 	if len(finalizedWithdrawals) > 0 {
 		metrics.RecordL1FinalizedWithdrawals(len(finalizedWithdrawals))
-		metrics.RecordL1FinalizedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, totalWithdrawalAmount)
+		metrics.RecordL1FinalizedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, portalWithdrawalAmount)
 	}
 
 	// (3) L1CrossDomainMessenger

indexer/processors/bridge/l2_bridge_processor.go

@@ -28,14 +28,14 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L2M
 		log.Info("detected transaction withdrawals", "size", len(l2ToL1MPMessagesPassed))
 	}
 
-	totalWithdrawalAmount := 0
+	l2ToL1WithdrawalAmount := 0
 	messagesPassed := make(map[logKey]*contracts.L2ToL1MessagePasserMessagePassed, len(l2ToL1MPMessagesPassed))
 	transactionWithdrawals := make([]database.L2TransactionWithdrawal, len(l2ToL1MPMessagesPassed))
 	for i := range l2ToL1MPMessagesPassed {
 		messagePassed := l2ToL1MPMessagesPassed[i]
 		messagesPassed[logKey{messagePassed.Event.BlockHash, messagePassed.Event.LogIndex}] = &messagePassed
 		if len(messagePassed.Tx.Data) == 0 {
-			totalWithdrawalAmount = totalWithdrawalAmount + int(messagePassed.Tx.Amount.Int64())
+			l2ToL1WithdrawalAmount = l2ToL1WithdrawalAmount + int(messagePassed.Tx.Amount.Int64())
 		}
 
 		transactionWithdrawals[i] = database.L2TransactionWithdrawal{
@@ -50,8 +50,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L2M
 		if err := db.BridgeTransactions.StoreL2TransactionWithdrawals(transactionWithdrawals); err != nil {
 			return err
 		}
-
-		metrics.RecordL2InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, totalWithdrawalAmount)
+		metrics.RecordL2InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, l2ToL1WithdrawalAmount)
 		metrics.RecordL2TransactionWithdrawals(len(transactionWithdrawals))
 	}
 

indexer/processors/bridge/legacy_bridge_processor.go

@@ -31,14 +31,14 @@ func LegacyL1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metri
 		log.Info("detected legacy transaction deposits", "size", len(ctcTxDepositEvents))
 	}
 
-	totalDepositAmount := 0
+	ctcDepositAmount := 0
 	ctcTxDeposits := make(map[logKey]*contracts.LegacyCTCDepositEvent, len(ctcTxDepositEvents))
 	transactionDeposits := make([]database.L1TransactionDeposit, len(ctcTxDepositEvents))
 	for i := range ctcTxDepositEvents {
 		deposit := ctcTxDepositEvents[i]
 		ctcTxDeposits[logKey{deposit.Event.BlockHash, deposit.Event.LogIndex}] = &deposit
 		if len(deposit.Tx.Data) == 0 {
-			totalDepositAmount = totalDepositAmount + int(deposit.Tx.Amount.Uint64())
+			ctcDepositAmount = ctcDepositAmount + int(deposit.Tx.Amount.Uint64())
 		}
 		transactionDeposits[i] = database.L1TransactionDeposit{
 			// We re-use the L2 Transaction hash as the source hash to remain consistent in the schema.
@@ -54,7 +54,7 @@ func LegacyL1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metri
 			return err
 		}
 		metrics.RecordL1TransactionDeposits(len(transactionDeposits))
-		metrics.RecordL1InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, totalDepositAmount)
+		metrics.RecordL1InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, ctcDepositAmount)
 	}
 
 	// (2) L1CrossDomainMessenger
@@ -161,7 +161,7 @@ func LegacyL2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metri
 		log.Info("detected legacy transaction withdrawals (via L2CrossDomainMessenger)", "size", len(crossDomainSentMessages))
 	}
 
-	totalWithdrawalAmount := 0
+	messengerWithdrawalAmount := 0
 	sentMessages := make(map[logKey]*contracts.CrossDomainMessengerSentMessageEvent, len(crossDomainSentMessages))
 	bridgeMessages := make([]database.L2BridgeMessage, len(crossDomainSentMessages))
 	transactionWithdrawals := make([]database.L2TransactionWithdrawal, len(crossDomainSentMessages))
@@ -169,7 +169,7 @@ func LegacyL2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metri
 		sentMessage := crossDomainSentMessages[i]
 		sentMessages[logKey{sentMessage.Event.BlockHash, sentMessage.Event.LogIndex}] = &sentMessage
 		if len(sentMessage.BridgeMessage.Tx.Data) == 0 {
-			totalWithdrawalAmount = totalWithdrawalAmount + int(sentMessage.BridgeMessage.Tx.Amount.Int64())
+			messengerWithdrawalAmount = messengerWithdrawalAmount + int(sentMessage.BridgeMessage.Tx.Amount.Int64())
 		}
 
 		// To ensure consistency in the schema, we duplicate this as the "root" transaction withdrawal. The storage key in the message
@@ -203,7 +203,7 @@ func LegacyL2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metri
 		}
 		metrics.RecordL2TransactionWithdrawals(len(transactionWithdrawals))
 		metrics.RecordL2CrossDomainSentMessages(len(bridgeMessages))
-		metrics.RecordL2InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, totalWithdrawalAmount)
+		metrics.RecordL2InitiatedBridgeTransfers(database.ETHTokenPair.LocalTokenAddress, messengerWithdrawalAmount)
 	}
 
 	// (2) L2StandardBridge