fix: lighter updates to address their api breaking changes

Signed-off-by: Marin Petrunic <[email protected]>

Author: mpetrunic

chains/lighter/message/lighter.go

@@ -24,8 +24,9 @@ import (
 )
 
 var (
-	ARBITRUM_CHAIN_ID = big.NewInt(42161)
-	FEE               = big.NewInt(2000000)
+	ARBITRUM_CHAIN_ID  = big.NewInt(42161)
+	FEE                = big.NewInt(2000000)
+	USDC_ACCOUNT_INDEX = 3
 )
 
 type Coordinator interface {
@@ -104,7 +105,7 @@ func (h *LighterMessageHandler) HandleMessage(m *message.Message) (*proposal.Pro
 
 	unlockHash, err := signature.BorrowUnlockHash(
 		calldata,
-		new(big.Int).SetUint64(tx.Transfer.USDCAmount),
+		new(big.Int).SetUint64(tx.Transfer.Amount),
 		h.usdcAddress,
 		ARBITRUM_CHAIN_ID,
 		h.lighterAddress,
@@ -145,15 +146,19 @@ func (h *LighterMessageHandler) verifyWithdrawal(tx *lighter.LighterTx) error {
 		return errors.New("transfer account index invalid")
 	}
 
-	if tx.Transfer.USDCAmount <= FEE.Uint64() {
+	if tx.Transfer.AssetIndex != uint64(USDC_ACCOUNT_INDEX) {
+		return errors.New("only usdc asset supported on lighter")
+	}
+
+	if tx.Transfer.Amount <= FEE.Uint64() {
 		return errors.New("fee higher than withdrawal amount")
 	}
 
 	return nil
 }
 
 func (h *LighterMessageHandler) calldata(tx *lighter.LighterTx) ([]byte, error) {
-	borrowAmount := new(big.Int).Sub(new(big.Int).SetUint64(tx.Transfer.USDCAmount), FEE)
+	borrowAmount := new(big.Int).Sub(new(big.Int).SetUint64(tx.Transfer.Amount), FEE)
 	return consts.LighterABI.Pack(
 		"fulfillWithdraw",
 		common.HexToHash(tx.Hash),

chains/lighter/message/lighter_test.go

@@ -91,7 +91,8 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_ValidMessage() {
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Transfer,
 		Transfer: &lighter.Transfer{
-			USDCAmount:     2000001,
+			Amount:         2000001,
+			AssetIndex:     3,
 			ToAccountIndex: 3,
 			Memo:           []byte{238, 123, 250, 212, 202, 237, 62, 98, 106, 248, 169, 199, 213, 3, 76, 213, 137, 238, 73, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 		},
@@ -133,7 +134,8 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_FeeHigherThanAmount(
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Transfer,
 		Transfer: &lighter.Transfer{
-			USDCAmount:     2000000,
+			Amount:         2000000,
+			AssetIndex:     3,
 			ToAccountIndex: 3,
 			Memo:           []byte{238, 123, 250, 212, 202, 237, 62, 98, 106, 248, 169, 199, 213, 3, 76, 213, 137, 238, 73, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 		},
@@ -174,7 +176,8 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_InvalidTxType() {
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Withdraw,
 		Transfer: &lighter.Transfer{
-			USDCAmount:     2000001,
+			Amount:         2000001,
+			AssetIndex:     3,
 			ToAccountIndex: 3,
 			Memo:           []byte{238, 123, 250, 212, 202, 237, 62, 98, 106, 248, 169, 199, 213, 3, 76, 213, 137, 238, 73, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 		},
@@ -215,7 +218,8 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_InvalidAccount() {
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Transfer,
 		Transfer: &lighter.Transfer{
-			USDCAmount:     2000001,
+			Amount:         2000001,
+			AssetIndex:     3,
 			ToAccountIndex: 5,
 			Memo:           []byte{238, 123, 250, 212, 202, 237, 62, 98, 106, 248, 169, 199, 213, 3, 76, 213, 137, 238, 73, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 		},

protocol/lighter/api.go

@@ -28,7 +28,8 @@ const (
 )
 
 type Transfer struct {
-	USDCAmount       uint64
+	Amount           uint64
+	AssetIndex       uint64
 	FromAccountIndex uint64
 	ToAccountIndex   int
 	Fee              uint64