fix: attach blockHeight to verification

Author: Aman035

universalClient/chains/common/event_processor.go

@@ -366,27 +366,12 @@ func (ep *EventProcessor) extractOutboundObservation(event *store.Event) (*uexec
 		txHashHex = txHash
 	}
 
-	// Since the event is confirmed, success is always true
-	// Parse event data to extract error_msg if available
-	var errorMsg string = ""
-
-	if len(event.EventData) > 0 {
-		var eventData map[string]interface{}
-		if err := json.Unmarshal(event.EventData, &eventData); err == nil {
-			// Check for error_msg field
-			if errorMsgVal, ok := eventData["error_msg"].(string); ok {
-				errorMsg = errorMsgVal
-			}
-		}
-	}
-
 	observation := &uexecutortypes.OutboundObservation{
 		Success:     true, // Since event is confirmed, success is always true
 		BlockHeight: event.BlockHeight,
 		TxHash:      txHashHex,
-		ErrorMsg:    errorMsg,
+		ErrorMsg:    "",
 	}
 
 	return observation, nil
 }
-

universalClient/chains/common/types.go

@@ -43,12 +43,13 @@ type OutboundTxBuilder interface {
 	BroadcastOutboundSigningRequest(ctx context.Context, req *UnSignedOutboundTxReq, data *uetypes.OutboundCreatedEvent, signature []byte) (string, error)
 
 	// VerifyBroadcastedTx checks the status of a broadcasted transaction on the destination chain.
-	// Returns (found, confirmations, status, error):
+	// Returns (found, blockHeight, confirmations, status, error):
 	// - found=false: tx not found or not yet mined
 	// - found=true: tx exists on-chain
+	//   - blockHeight: the block in which the tx was mined
 	//   - confirmations: number of blocks since the tx was mined (0 = just mined)
 	//   - status: 0 = failed/reverted, 1 = success
-	VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, confirmations uint64, status uint8, err error)
+	VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, blockHeight uint64, confirmations uint64, status uint8, err error)
 }
 
 // UniversalTx Payload

universalClient/chains/evm/tx_builder.go

@@ -491,23 +491,25 @@ func (tb *TxBuilder) encodeFunctionCall(
 }
 
 // VerifyBroadcastedTx checks the status of a broadcasted transaction on the EVM chain.
-func (tb *TxBuilder) VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, confirmations uint64, status uint8, err error) {
+func (tb *TxBuilder) VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, blockHeight uint64, confirmations uint64, status uint8, err error) {
 	hash := ethcommon.HexToHash(txHash)
 	receipt, err := tb.rpcClient.GetTransactionReceipt(ctx, hash)
 	if err != nil {
 		// Transaction not found or not yet mined
-		return false, 0, 0, nil
+		return false, 0, 0, 0, nil
 	}
 
+	receiptBlock := receipt.BlockNumber.Uint64()
+
 	// Calculate confirmations from current block
 	var confs uint64
 	latestBlock, err := tb.rpcClient.GetLatestBlock(ctx)
-	if err == nil && latestBlock >= receipt.BlockNumber.Uint64() {
-		confs = latestBlock - receipt.BlockNumber.Uint64() + 1
+	if err == nil && latestBlock >= receiptBlock {
+		confs = latestBlock - receiptBlock + 1
 	}
 
 	// receipt.Status: 1 = success, 0 = reverted
-	return true, confs, uint8(receipt.Status), nil
+	return true, receiptBlock, confs, uint8(receipt.Status), nil
 }
 
 // getFunctionSignature returns the full function signature for ABI encoding

universalClient/chains/svm/tx_builder.go

@@ -1476,19 +1476,19 @@ func (tb *TxBuilder) buildWithdrawAndExecuteAccounts(
 // - found=true: tx exists on-chain
 //   - confirmations: number of slots since the tx was included (0 = just confirmed)
 //   - status: 0 = failed, 1 = success
-func (tb *TxBuilder) VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, confirmations uint64, status uint8, err error) {
+func (tb *TxBuilder) VerifyBroadcastedTx(ctx context.Context, txHash string) (found bool, blockHeight uint64, confirmations uint64, status uint8, err error) {
 	sig, sigErr := solana.SignatureFromBase58(txHash)
 	if sigErr != nil {
-		return false, 0, 0, nil
+		return false, 0, 0, 0, nil
 	}
 
 	tx, txErr := tb.rpcClient.GetTransaction(ctx, sig)
 	if txErr != nil {
-		return false, 0, 0, nil
+		return false, 0, 0, 0, nil
 	}
 
 	if tx == nil {
-		return false, 0, 0, nil
+		return false, 0, 0, 0, nil
 	}
 
 	// Calculate confirmations from current slot
@@ -1502,10 +1502,10 @@ func (tb *TxBuilder) VerifyBroadcastedTx(ctx context.Context, txHash string) (fo
 
 	// Check if transaction had an error
 	if tx.Meta != nil && tx.Meta.Err != nil {
-		return true, confs, 0, nil
+		return true, tx.Slot, confs, 0, nil
 	}
 
-	return true, confs, 1, nil
+	return true, tx.Slot, confs, 1, nil
 }
 
 // buildSetComputeUnitLimitInstruction creates a SetComputeUnitLimit instruction for the Compute Budget program