Skip to content

Commit 4c8762a

Browse files
mpetrun5mpetrun5
authored
fix: use order hash as deposit ID (#47)
* Use depositId field for getting mayan order hash * Update tests * Lint
1 parent db08068 commit 4c8762a

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

‎api/handlers/signing.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ func (h *SigningHandler) HandleSigning(w http.ResponseWriter, r *http.Request) {
8383
case MayanProtocol:
8484
{
8585
m = evmMessage.NewMayanMessage(0, b.ChainId, &evmMessage.MayanData{
86+
OrderHash: b.DepositId,
8687
Nonce: b.Nonce.Int,
8788
LiquidityPool: common.HexToAddress(b.LiquidityPool),
8889
Caller: common.HexToAddress(b.Caller),

‎chains/evm/message/mayan.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (h *MayanMessageHandler) HandleMessage(m *message.Message) (*proposal.Propo
112112
data.ErrChn <- err
113113
return nil, err
114114
}
115-
swap, err := h.swapFetcher.GetSwap(txHash.Hex())
115+
swap, err := h.swapFetcher.GetSwap(data.OrderHash)
116116
if err != nil {
117117
data.ErrChn <- err
118118
return nil, err

‎chains/evm/message/mayan_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_ValidMessage() {
133133
Caller: common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
134134
Calldata: mayanCalldata,
135135
BorrowAmount: big.NewInt(9000000000000000),
136+
OrderHash: "orderHash",
136137
DepositTxHash: "0x6cd3de31d0085c8318a19eb1299b00e1d0636838cb6359da6199adcd6d142952",
137138
}
138139

139140
calldataBytes, _ := hex.DecodeString(ad.Calldata)
140-
txHash := common.HexToHash(ad.DepositTxHash)
141141
orderHash := common.HexToHash(common.Bytes2Hex([]byte("orderHash")))
142142

143143
s.mockContract.EXPECT().DecodeFulfillCall(calldataBytes).Return(
@@ -156,7 +156,7 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_ValidMessage() {
156156
PromisedAmount: 989000,
157157
},
158158
nil)
159-
s.mockSwapFetcher.EXPECT().GetSwap(txHash.Hex()).Return(&mayan.MayanSwap{
159+
s.mockSwapFetcher.EXPECT().GetSwap(ad.OrderHash).Return(&mayan.MayanSwap{
160160
OrderHash: orderHash.Hex(),
161161
}, nil)
162162
s.mockContract.EXPECT().GetOrder(gomock.Any(), gomock.Any(), uint8(18)).Return(&contracts.MayanOrder{
@@ -199,11 +199,11 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_BorrowAmountTooHigh()
199199
Caller: common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
200200
Calldata: mayanCalldata,
201201
BorrowAmount: big.NewInt(900000000000000000),
202+
OrderHash: "orderHash",
202203
DepositTxHash: "0x6cd3de31d0085c8318a19eb1299b00e1d0636838cb6359da6199adcd6d142952",
203204
}
204205

205206
calldataBytes, _ := hex.DecodeString(ad.Calldata)
206-
txHash := common.HexToHash(ad.DepositTxHash)
207207
orderHash := common.HexToHash(common.Bytes2Hex([]byte("orderHash")))
208208

209209
s.mockContract.EXPECT().DecodeFulfillCall(calldataBytes).Return(
@@ -222,7 +222,7 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_BorrowAmountTooHigh()
222222
PromisedAmount: 989000,
223223
},
224224
nil)
225-
s.mockSwapFetcher.EXPECT().GetSwap(txHash.Hex()).Return(&mayan.MayanSwap{
225+
s.mockSwapFetcher.EXPECT().GetSwap(ad.OrderHash).Return(&mayan.MayanSwap{
226226
OrderHash: orderHash.Hex(),
227227
}, nil)
228228
s.mockContract.EXPECT().GetOrder(gomock.Any(), gomock.Any(), uint8(18)).Return(&contracts.MayanOrder{
@@ -264,10 +264,10 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidOrderHash() {
264264
Calldata: mayanCalldata,
265265
BorrowAmount: big.NewInt(900000000000000000),
266266
DepositTxHash: "0x6cd3de31d0085c8318a19eb1299b00e1d0636838cb6359da6199adcd6d142952",
267+
OrderHash: "orderHash",
267268
}
268269

269270
calldataBytes, _ := hex.DecodeString(ad.Calldata)
270-
txHash := common.HexToHash(ad.DepositTxHash)
271271
orderHash := common.HexToHash(common.Bytes2Hex([]byte("orderHash")))
272272

273273
s.mockContract.EXPECT().DecodeFulfillCall(calldataBytes).Return(
@@ -286,7 +286,7 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidOrderHash() {
286286
PromisedAmount: 989000,
287287
},
288288
nil)
289-
s.mockSwapFetcher.EXPECT().GetSwap(txHash.Hex()).Return(&mayan.MayanSwap{
289+
s.mockSwapFetcher.EXPECT().GetSwap(ad.OrderHash).Return(&mayan.MayanSwap{
290290
OrderHash: "invalid",
291291
}, nil)
292292
s.mockContract.EXPECT().GetOrder(gomock.Any(), gomock.Any(), uint8(18)).Return(&contracts.MayanOrder{
@@ -327,11 +327,11 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidCaller() {
327327
Caller: common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
328328
Calldata: mayanCalldata,
329329
BorrowAmount: big.NewInt(900000000000000000),
330+
OrderHash: "orderHash",
330331
DepositTxHash: "0x6cd3de31d0085c8318a19eb1299b00e1d0636838cb6359da6199adcd6d142952",
331332
}
332333

333334
calldataBytes, _ := hex.DecodeString(ad.Calldata)
334-
txHash := common.HexToHash(ad.DepositTxHash)
335335
orderHash := common.HexToHash(common.Bytes2Hex([]byte("orderHash")))
336336

337337
s.mockContract.EXPECT().DecodeFulfillCall(calldataBytes).Return(
@@ -350,7 +350,7 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidCaller() {
350350
PromisedAmount: 989000,
351351
},
352352
nil)
353-
s.mockSwapFetcher.EXPECT().GetSwap(txHash.Hex()).Return(&mayan.MayanSwap{
353+
s.mockSwapFetcher.EXPECT().GetSwap(ad.OrderHash).Return(&mayan.MayanSwap{
354354
OrderHash: orderHash.Hex(),
355355
}, nil)
356356
s.mockContract.EXPECT().GetOrder(gomock.Any(), gomock.Any(), uint8(18)).Return(&contracts.MayanOrder{
@@ -392,10 +392,10 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidFulfillAmount()
392392
Calldata: mayanCalldata,
393393
BorrowAmount: big.NewInt(900000000000000000),
394394
DepositTxHash: "0x6cd3de31d0085c8318a19eb1299b00e1d0636838cb6359da6199adcd6d142952",
395+
OrderHash: "orderHash",
395396
}
396397

397398
calldataBytes, _ := hex.DecodeString(ad.Calldata)
398-
txHash := common.HexToHash(ad.DepositTxHash)
399399
orderHash := common.HexToHash(common.Bytes2Hex([]byte("orderHash")))
400400

401401
s.mockContract.EXPECT().DecodeFulfillCall(calldataBytes).Return(
@@ -414,7 +414,7 @@ func (s *MayanMessageHandlerTestSuite) Test_HandleMessage_InvalidFulfillAmount()
414414
PromisedAmount: 9900000,
415415
},
416416
nil)
417-
s.mockSwapFetcher.EXPECT().GetSwap(txHash.Hex()).Return(&mayan.MayanSwap{
417+
s.mockSwapFetcher.EXPECT().GetSwap(ad.OrderHash).Return(&mayan.MayanSwap{
418418
OrderHash: orderHash.Hex(),
419419
}, nil)
420420
s.mockContract.EXPECT().GetOrder(gomock.Any(), gomock.Any(), uint8(18)).Return(&contracts.MayanOrder{

‎chains/evm/message/message.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func NewAcrossMessage(source, destination uint64, acrossData *AcrossData) *messa
5050
type MayanData struct {
5151
ErrChn chan error `json:"-"`
5252

53+
OrderHash string
5354
Coordinator peer.ID
5455
LiquidityPool common.Address
5556
Caller common.Address

0 commit comments

Comments
 (0)