Use borrow amount from api for lighter

Author: mpetrun5

api/handlers/signing.go

@@ -135,6 +135,7 @@ func (h *SigningHandler) HandleSigning(w http.ResponseWriter, r *http.Request) {
 				Nonce:         b.Nonce.Int,
 				LiquidityPool: common.HexToAddress(b.LiquidityPool),
 				Caller:        common.HexToAddress(b.Caller),
+				BorrowAmount:  b.BorrowAmount.Int,
 				ErrChn:        errChn,
 				Source:        0,
 				Destination:   b.ChainId,

chains/lighter/chain.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	LIGHTER_DOMAIN_ID uint64 = 1513889025
+	LIGHTER_DOMAIN_ID uint64 = 1701984817 // lower 32bits of sha256 hash of lighter caip ("lighter:1")
 )
 
 type MessageHandler interface {

chains/lighter/message/lighter.go

@@ -87,21 +87,21 @@ func (h *LighterMessageHandler) HandleMessage(m *message.Message) (*proposal.Pro
 		return nil, err
 	}
 
-	if err = h.verifyWithdrawal(tx); err != nil {
+	if err = h.verifyWithdrawal(tx, data.BorrowAmount); err != nil {
 		data.ErrChn <- err
 		return nil, err
 	}
 
 	data.ErrChn <- nil
 
-	calldata, err := h.calldata(tx)
+	calldata, err := h.calldata(tx, data.BorrowAmount)
 	if err != nil {
 		return nil, err
 	}
 
 	unlockHash, err := signature.BorrowUnlockHash(
 		calldata,
-		new(big.Int).SetUint64(tx.Transfer.USDCAmount),
+		data.BorrowAmount,
 		h.usdcAddress,
 		ARBITRUM_CHAIN_ID,
 		h.lighterAddress,
@@ -134,7 +134,7 @@ func (h *LighterMessageHandler) HandleMessage(m *message.Message) (*proposal.Pro
 	return nil, nil
 }
 
-func (h *LighterMessageHandler) verifyWithdrawal(tx *lighter.LighterTx) error {
+func (h *LighterMessageHandler) verifyWithdrawal(tx *lighter.LighterTx, borrowAmount *big.Int) error {
 	if tx.Type != lighter.TxTypeL2Transfer {
 		return errors.New("invalid transaction type")
 	}
@@ -143,15 +143,19 @@ func (h *LighterMessageHandler) verifyWithdrawal(tx *lighter.LighterTx) error {
 		return errors.New("transfer account index invalid")
 	}
 
+	if borrowAmount.Cmp(new(big.Int).SetUint64(tx.Transfer.USDCAmount)) != -1 {
+		return errors.New("borrow amount exceeds withdrawal value")
+	}
+
 	return nil
 }
 
-func (h *LighterMessageHandler) calldata(tx *lighter.LighterTx) ([]byte, error) {
+func (h *LighterMessageHandler) calldata(tx *lighter.LighterTx, borrowAmount *big.Int) ([]byte, error) {
 	return consts.LighterABI.Pack(
 		"withdraw",
 		common.HexToHash(tx.Hash),
 		common.HexToAddress(tx.L1Address),
-		new(big.Int).SetUint64(tx.Transfer.USDCAmount))
+		borrowAmount)
 }
 
 func (h *LighterMessageHandler) Listen(ctx context.Context) {

chains/lighter/message/lighter_test.go

@@ -84,7 +84,9 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_ValidMessage() {
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		OrderHash:     "orderHash",
+		BorrowAmount:  big.NewInt(1900000),
 	}
+
 	s.mockCoordinator.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Transfer,
@@ -125,6 +127,7 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_InvalidTxType() {
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		OrderHash:     "orderHash",
+		BorrowAmount:  big.NewInt(1900000),
 	}
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Withdraw,
@@ -165,6 +168,7 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_InvalidAccount() {
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		OrderHash:     "orderHash",
+		BorrowAmount:  big.NewInt(1900000),
 	}
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
 		Type: lighter.TxTypeL2Transfer,
@@ -205,6 +209,7 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_MissingTx() {
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
 		OrderHash:     "orderHash",
+		BorrowAmount:  big.NewInt(1900000),
 	}
 	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(nil, fmt.Errorf("not found"))
 
@@ -221,3 +226,45 @@ func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_MissingTx() {
 	err = <-errChn
 	s.NotNil(err)
 }
+
+func (s *LighterMessageHandlerTestSuite) Test_HandleMessage_BorrowAmountTooHigh() {
+	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"),
+		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		OrderHash:     "orderHash",
+		BorrowAmount:  big.NewInt(2000000),
+	}
+
+	s.mockTxFetcher.EXPECT().GetTx(ad.OrderHash).Return(&lighter.LighterTx{
+		Type: lighter.TxTypeL2Transfer,
+		Transfer: &lighter.Transfer{
+			USDCAmount:     2000000,
+			ToAccountIndex: 3,
+		},
+	}, 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)
+}