From 2f652b286cc7274b8d26a01be772b53f1fc69577 Mon Sep 17 00:00:00 2001
From: "kai.zhang" <kai.zhang@okg.com>
Date: Mon, 2 Dec 2024 20:14:06 +0800
Subject: [PATCH] modify sender address and init ehtman when call custodial
 assets interface

---
 cmd/run.go                       | 17 ++++++++++++-----
 sequencesender/sequencesender.go |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cmd/run.go b/cmd/run.go
index 6042e935a..626b76c46 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -240,18 +240,25 @@ func createSequenceSender(
 				ApiKey: cfg.SequenceSender.EthTxManager.Etherman.Etherscan.ApiKey,
 				Url:    cfg.SequenceSender.EthTxManager.Etherman.Etherscan.Url,
 			},
-			HTTPHeaders: cfg.SequenceSender.EthTxManager.Etherman.HTTPHeaders,
+			ZkEVMAddr:         cfg.SequenceSender.EthTxManager.Etherman.ZkEVMAddr,         // X Layer
+			RollupManagerAddr: cfg.SequenceSender.EthTxManager.Etherman.RollupManagerAddr, // X Layer
+			HTTPHeaders:       cfg.SequenceSender.EthTxManager.Etherman.HTTPHeaders,
 		},
 	}, cfg.NetworkConfig.L1Config, cfg.Common)
 	if err != nil {
 		logger.Fatalf("Failed to create etherman. Err: %w, ", err)
 	}
 
-	auth, _, err := ethman.LoadAuthFromKeyStore(cfg.SequenceSender.PrivateKey.Path, cfg.SequenceSender.PrivateKey.Password)
-	if err != nil {
-		logger.Fatal(err)
+	// X Layer
+	if cfg.SequenceSender.EthTxManager.CustodialAssets.Enable {
+		cfg.SequenceSender.SenderAddress = cfg.SequenceSender.EthTxManager.CustodialAssets.SequencerAddr
+	} else {
+		auth, _, err := ethman.LoadAuthFromKeyStore(cfg.SequenceSender.PrivateKey.Path, cfg.SequenceSender.PrivateKey.Password)
+		if err != nil {
+			logger.Fatal(err)
+		}
+		cfg.SequenceSender.SenderAddress = auth.From
 	}
-	cfg.SequenceSender.SenderAddress = auth.From
 	blockFinalityType := etherman.BlockNumberFinality(cfg.SequenceSender.BlockFinality)
 
 	blockFinality, err := blockFinalityType.ToBlockNum()
diff --git a/sequencesender/sequencesender.go b/sequencesender/sequencesender.go
index f8c944a1d..9bede87f2 100644
--- a/sequencesender/sequencesender.go
+++ b/sequencesender/sequencesender.go
@@ -117,6 +117,7 @@ func New(cfg Config, logger *log.Logger,
 		Outputs:     cfg.Log.Outputs,
 	}
 
+	// X Layer custodial assets
 	if cfg.EthTxManager.CustodialAssets.Enable {
 		s.ethTxManager, err = ethtxmanager.NewClientFromAddr(cfg.EthTxManager, cfg.SenderAddress)
 	} else {