Use repayment account from solver config

Author: mpetrun5

chains/lighter/config.go

@@ -18,6 +18,7 @@ var (
 type LighterConfig struct {
 	WithdrawalAddress common.Address
 	UsdcAddress       common.Address
+	RepaymentAddress  string
 }
 
 func NewLighterConfig(solverConfig solverConfig.SolverConfig) (*LighterConfig, error) {
@@ -38,6 +39,7 @@ func NewLighterConfig(solverConfig solverConfig.SolverConfig) (*LighterConfig, e
 
 	return &LighterConfig{
 		WithdrawalAddress: common.HexToAddress(withdrawalAddress),
+		RepaymentAddress:  solverConfig.ProtocolsMetadata.Lighter.RepaymentAddress,
 		UsdcAddress:       common.HexToAddress(usdcConfig.Address),
 	}, nil
 }

chains/lighter/config_test.go

@@ -80,6 +80,7 @@ func (s *NewLighterConfigTestSuite) Test_ValidConfig() {
 		Chains: solverChains,
 		ProtocolsMetadata: solverConfig.ProtocolsMetadata{
 			Lighter: &solverConfig.Lighter{
+				RepaymentAddress: "3",
 				FastWithdrawalContract: map[string]string{
 					"eip155:42161": "withdrawal",
 				},
@@ -91,5 +92,6 @@ func (s *NewLighterConfigTestSuite) Test_ValidConfig() {
 	s.Equal(config, &lighter.LighterConfig{
 		WithdrawalAddress: common.HexToAddress("withdrawal"),
 		UsdcAddress:       common.HexToAddress("usdc"),
+		RepaymentAddress:  "3",
 	})
 }

chains/lighter/message/lighter.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strconv"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -23,9 +24,8 @@ import (
 )
 
 var (
-	ARBITRUM_CHAIN_ID               = big.NewInt(42161)
-	FILL_DEADLINE                   = time.Minute * 5
-	WITHDRAWAL_ACCOUNT_INDEX uint64 = 3
+	ARBITRUM_CHAIN_ID = big.NewInt(42161)
+	FILL_DEADLINE     = time.Minute * 5
 )
 
 type Coordinator interface {
@@ -43,14 +43,16 @@ type LighterMessageHandler struct {
 	fetcher     signing.SaveDataFetcher
 	sigChn      chan any
 
-	lighterAddress common.Address
-	usdcAddress    common.Address
-	txFetcher      TxFetcher
+	lighterAddress   common.Address
+	usdcAddress      common.Address
+	repaymentAccount string
+	txFetcher        TxFetcher
 }
 
 func NewLighterMessageHandler(
 	lighterAddress common.Address,
 	usdcAddress common.Address,
+	repaymentAccount string,
 	txFetcher TxFetcher,
 	coordinator Coordinator,
 	host host.Host,
@@ -59,14 +61,15 @@ func NewLighterMessageHandler(
 	sigChn chan any,
 ) *LighterMessageHandler {
 	return &LighterMessageHandler{
-		txFetcher:      txFetcher,
-		usdcAddress:    usdcAddress,
-		lighterAddress: lighterAddress,
-		coordinator:    coordinator,
-		host:           host,
-		comm:           comm,
-		fetcher:        fetcher,
-		sigChn:         sigChn,
+		txFetcher:        txFetcher,
+		usdcAddress:      usdcAddress,
+		repaymentAccount: repaymentAccount,
+		lighterAddress:   lighterAddress,
+		coordinator:      coordinator,
+		host:             host,
+		comm:             comm,
+		fetcher:          fetcher,
+		sigChn:           sigChn,
 	}
 }
 
@@ -139,7 +142,7 @@ func (h *LighterMessageHandler) verifyWithdrawal(tx *lighter.LighterTx, borrowAm
 		return errors.New("invalid transaction type")
 	}
 
-	if tx.Transfer.ToAccountIndex != WITHDRAWAL_ACCOUNT_INDEX {
+	if strconv.Itoa(tx.Transfer.ToAccountIndex) != h.repaymentAccount {
 		return errors.New("transfer account index invalid")
 	}
 

chains/lighter/message/lighter_test.go

@@ -58,6 +58,7 @@ func (s *LighterMessageHandlerTestSuite) SetupTest() {
 	s.handler = message.NewLighterMessageHandler(
 		common.Address{},
 		common.Address{},
+		"3",
 		s.mockTxFetcher,
 		s.mockCoordinator,
 		s.mockHost,

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.9.0
 	github.com/sprintertech/lifi-solver v0.0.0-20251023154209-4cf9ac1ab166
-	github.com/sprintertech/solver-config/go v0.0.0-20251024140304-ee77ffefd608
+	github.com/sprintertech/solver-config/go v0.0.0-20251027142430-7f32bdd5da1e
 	github.com/stretchr/testify v1.10.0
 	github.com/sygmaprotocol/sygma-core v0.0.0-20250304150334-bd39ac4f7b82
 	go.opentelemetry.io/otel v1.16.0

go.sum

@@ -950,6 +950,8 @@ github.com/sprintertech/lifi-solver v0.0.0-20251023154209-4cf9ac1ab166 h1:mCcKOx
 github.com/sprintertech/lifi-solver v0.0.0-20251023154209-4cf9ac1ab166/go.mod h1:EbAH3JJxioBVuHvyjaP5zTh6uPmumCpbE93WEjwpRm0=
 github.com/sprintertech/solver-config/go v0.0.0-20251024140304-ee77ffefd608 h1:J5RxJUhqMGfoIUb8XnSjDBlUMH658nM9NIjXft+DjkA=
 github.com/sprintertech/solver-config/go v0.0.0-20251024140304-ee77ffefd608/go.mod h1:MrIGW6M815PSYKtWSeOd1Z7eiSeOIk/uA/6E2PhlQVQ=
+github.com/sprintertech/solver-config/go v0.0.0-20251027142430-7f32bdd5da1e h1:5sSP6GbqCT/ApxxZmUtav6GHy5Ke98zh5oqQxewhJd4=
+github.com/sprintertech/solver-config/go v0.0.0-20251027142430-7f32bdd5da1e/go.mod h1:MrIGW6M815PSYKtWSeOd1Z7eiSeOIk/uA/6E2PhlQVQ=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

protocol/lighter/api.go

@@ -22,7 +22,7 @@ const (
 type Transfer struct {
 	USDCAmount       uint64
 	FromAccountIndex uint64
-	ToAccountIndex   uint64
+	ToAccountIndex   int
 	Fee              uint64
 }