fix: lighter updates to address their api breaking changes (#118)

<!--- Provide a general summary of your changes in the Title above -->

## Description
<!--- Describe your changes in detail -->

## Related Issue Or Context
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Otherwise, describe context and motivation for change herre -->

Closes: #<issue>

## How Has This Been Tested? Testing details.
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
- [ ] I have commented my code, particularly in hard-to-understand
areas.
- [ ] I have ensured that all acceptance criteria (or expected behavior)
from issue are met
- [ ] I have updated the documentation locally and in docs.
- [ ] I have added tests to cover my changes.
- [ ] I have ensured that all the checks are passing and green, I've
signed the CLA bot

---------

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,50 @@ 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},
+		},
+	}, nil)
+
+	m := &coreMessage.Message{
+		Data:        ad,
+		Source:      0,
+		Destination: 10,
+	}
+	prop, err := s.handler.HandleMessage(m)
+
+	s.Nil(prop)
+	s.NotNil(err)
+
+	err = <-errChn
+	s.NotNil(err)
+}
+
+func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_InvalidAsset() {
+	s.mockCommunication.EXPECT().Broadcast(
+		gomock.Any(),
+		gomock.Any(),
+		comm.LighterMsg,
+		"lighter",
+	).Return(nil)
+	p, _ := pstoremem.NewPeerstore()
+	s.mockHost.EXPECT().Peerstore().Return(p)
+
+	errChn := make(chan error, 1)
+	ad := &message.LighterData{
+		ErrChn:        errChn,
+		Nonce:         big.NewInt(101),
+		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		OrderHash:     "orderHash",
+		DepositTxHash: "orderHash",
+	}
+	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
+		Type: lighter.TxTypeL2Withdraw,
+		Transfer: &lighter.Transfer{
+			Amount:         2000001,
+			AssetIndex:     2,
 			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 +260,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

protocol/lighter/mock/mockData.go

@@ -2,7 +2,7 @@
 package mock
 
 const LighterMockResponse = `
-{"code":200,"hash":"1e16eea4ad2ea1db483e7a0aeea2149fcafd96da3b9e7ecab5e95506f002182d1809858336e2af22","type":12,"info":"{\"FromAccountIndex\":283390,\"ApiKeyIndex\":0,\"ToAccountIndex\":3,\"USDCAmount\":2000000,\"Fee\":3000000,\"Memo\":[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],\"ExpiredAt\":1761149674469,\"Nonce\":2,\"Sig\":\"crr/TWDu2CzHpkOtGaTIow70UcgsdfChqSYurrEoFO/K+f9nZHvpOzNVXtZQBf7JhhVyMK9dDbzgt3nUK7z9N/GdbH/NakIGHzVod+9ULhQ=\",\"L1Sig\":\"0x320bdc9a593130a7e25103a572458188dd4e2efdb18c5d862c7e54da10d780fe751b444a259195baa4b5a7e3dc600dfa2227ec077a09919f3f97a736475eea471c\"}","event_info":"{\"f\":283390,\"t\":3,\"u\":2000000,\"fee\":3000000,\"ae\":\"\"}","status":3,"transaction_index":16,"l1_address":"0xEe7BfAD4caEd3e626AF8a9C7d5034CD589EE4990","account_index":283390,"nonce":2,"expire_at":1761149674469,"block_height":70687079,"queued_at":1761149084285,"sequence_index":16778685698,"parent_hash":"","committed_at":0,"verified_at":0,"executed_at":1761149084292}
+{"code":200,"hash":"1e16eea4ad2ea1db483e7a0aeea2149fcafd96da3b9e7ecab5e95506f002182d1809858336e2af22","type":12,"info":"{\"FromAccountIndex\":283390,\"ApiKeyIndex\":0,\"ToAccountIndex\":3,\"Amount\":2000000,\"AssetIndex\":3,\"Fee\":3000000,\"Memo\":[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],\"ExpiredAt\":1761149674469,\"Nonce\":2,\"Sig\":\"crr/TWDu2CzHpkOtGaTIow70UcgsdfChqSYurrEoFO/K+f9nZHvpOzNVXtZQBf7JhhVyMK9dDbzgt3nUK7z9N/GdbH/NakIGHzVod+9ULhQ=\",\"L1Sig\":\"0x320bdc9a593130a7e25103a572458188dd4e2efdb18c5d862c7e54da10d780fe751b444a259195baa4b5a7e3dc600dfa2227ec077a09919f3f97a736475eea471c\"}","event_info":"{\"f\":283390,\"t\":3,\"u\":2000000,\"fee\":3000000,\"ae\":\"\"}","status":3,"transaction_index":16,"l1_address":"0xEe7BfAD4caEd3e626AF8a9C7d5034CD589EE4990","account_index":283390,"nonce":2,"expire_at":1761149674469,"block_height":70687079,"queued_at":1761149084285,"sequence_index":16778685698,"parent_hash":"","committed_at":0,"verified_at":0,"executed_at":1761149084292}
 `
 
-const ExpectedLighterResponse = `{"code":200,"hash":"1e16eea4ad2ea1db483e7a0aeea2149fcafd96da3b9e7ecab5e95506f002182d1809858336e2af22","type":12,"info":"{\"FromAccountIndex\":283390,\"ApiKeyIndex\":0,\"ToAccountIndex\":3,\"USDCAmount\":2000000,\"Fee\":3000000,\"Memo\":[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],\"ExpiredAt\":1761149674469,\"Nonce\":2,\"Sig\":\"crr/TWDu2CzHpkOtGaTIow70UcgsdfChqSYurrEoFO/K+f9nZHvpOzNVXtZQBf7JhhVyMK9dDbzgt3nUK7z9N/GdbH/NakIGHzVod+9ULhQ=\",\"L1Sig\":\"0x320bdc9a593130a7e25103a572458188dd4e2efdb18c5d862c7e54da10d780fe751b444a259195baa4b5a7e3dc600dfa2227ec077a09919f3f97a736475eea471c\"}","event_info":"{\"f\":283390,\"t\":3,\"u\":2000000,\"fee\":3000000,\"ae\":\"\"}","status":3,"transaction_index":16,"l1_address":"0xEe7BfAD4caEd3e626AF8a9C7d5034CD589EE4990","account_index":283390,"nonce":2,"expire_at":1761149674469,"block_height":70687079,"queued_at":1761149084285,"sequence_index":16778685698,"parent_hash":"","committed_at":0,"verified_at":0,"executed_at":1761149084292}`
+const ExpectedLighterResponse = `{"code":200,"hash":"1e16eea4ad2ea1db483e7a0aeea2149fcafd96da3b9e7ecab5e95506f002182d1809858336e2af22","type":12,"info":"{\"FromAccountIndex\":283390,\"ApiKeyIndex\":0,\"ToAccountIndex\":3,\"Amount\":2000000,\"AssetIndex\":3,\"Fee\":3000000,\"Memo\":[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],\"ExpiredAt\":1761149674469,\"Nonce\":2,\"Sig\":\"crr/TWDu2CzHpkOtGaTIow70UcgsdfChqSYurrEoFO/K+f9nZHvpOzNVXtZQBf7JhhVyMK9dDbzgt3nUK7z9N/GdbH/NakIGHzVod+9ULhQ=\",\"L1Sig\":\"0x320bdc9a593130a7e25103a572458188dd4e2efdb18c5d862c7e54da10d780fe751b444a259195baa4b5a7e3dc600dfa2227ec077a09919f3f97a736475eea471c\"}","event_info":"{\"f\":283390,\"t\":3,\"u\":2000000,\"fee\":3000000,\"ae\":\"\"}","status":3,"transaction_index":16,"l1_address":"0xEe7BfAD4caEd3e626AF8a9C7d5034CD589EE4990","account_index":283390,"nonce":2,"expire_at":1761149674469,"block_height":70687079,"queued_at":1761149084285,"sequence_index":16778685698,"parent_hash":"","committed_at":0,"verified_at":0,"executed_at":1761149084292}`