modify sender address with custodial assets

okx · Nov 28, 2024 · cc0929d · cc0929d
1 parent f97c7f8
commit cc0929d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -247,11 +247,16 @@ func createSequenceSender(
 		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
@@ -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 {