From 314db22177e740eac5f9a2173b703889bbbf3970 Mon Sep 17 00:00:00 2001
From: Charlie Chen <34498985+ws4charlie@users.noreply.github.com>
Date: Thu, 5 Dec 2024 19:25:55 -0600
Subject: [PATCH] fix: move relayer key check after tss keysign (#3250)

* move relayer key checking after the tss keysign to unblock Athens3

* print relayer key fileName if not found
---
 zetaclient/chains/solana/signer/signer.go | 12 ++++++------
 zetaclient/keys/relayer_key.go            |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/zetaclient/chains/solana/signer/signer.go b/zetaclient/chains/solana/signer/signer.go
index b6739751ac..1e3d6914f3 100644
--- a/zetaclient/chains/solana/signer/signer.go
+++ b/zetaclient/chains/solana/signer/signer.go
@@ -127,12 +127,6 @@ func (signer *Signer) TryProcessOutbound(
 	nonce := params.TssNonce
 	coinType := cctx.InboundParams.CoinType
 
-	// skip relaying the transaction if this signer hasn't set the relayer key
-	if !signer.HasRelayerKey() {
-		logger.Warn().Msgf("TryProcessOutbound: no relayer key configured")
-		return
-	}
-
 	var tx *solana.Transaction
 
 	switch coinType {
@@ -168,6 +162,12 @@ func (signer *Signer) TryProcessOutbound(
 		return
 	}
 
+	// skip relaying the transaction if this signer hasn't set the relayer key
+	if !signer.HasRelayerKey() {
+		logger.Warn().Msgf("TryProcessOutbound: no relayer key configured")
+		return
+	}
+
 	// set relayer balance metrics
 	signer.SetRelayerBalanceMetrics(ctx)
 
diff --git a/zetaclient/keys/relayer_key.go b/zetaclient/keys/relayer_key.go
index af5918c634..2c7df857f5 100644
--- a/zetaclient/keys/relayer_key.go
+++ b/zetaclient/keys/relayer_key.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
 
 	"github.com/zeta-chain/node/pkg/chains"
 	"github.com/zeta-chain/node/pkg/crypto"
@@ -68,6 +69,8 @@ func LoadRelayerKey(relayerKeyPath string, network chains.Network, password stri
 		return relayerKey, nil
 	}
 
+	log.Logger.Warn().Msgf("relayer key file not found: %s", fileName)
+
 	// relayer key is optional, so it's okay if the relayer key is not provided
 	return nil, nil
 }