diff --git a/chains/evm/message/confirmations.go b/chains/evm/message/confirmations.go index da7e5198..3f79ecae 100644 --- a/chains/evm/message/confirmations.go +++ b/chains/evm/message/confirmations.go @@ -88,7 +88,7 @@ func (w *Watcher) wait(ctx context.Context, txHash common.Hash, requiredConfirma for { select { case <-ctx.Done(): - return fmt.Errorf("timed out waiting for confirmations") + return fmt.Errorf("timed out waiting for confirmations %s", txHash.Hex()) default: txReceipt, err := w.client.TransactionReceipt(ctx, txHash) if err != nil { diff --git a/chains/evm/message/lifiEscrow.go b/chains/evm/message/lifiEscrow.go index ab68f315..0066c3c2 100644 --- a/chains/evm/message/lifiEscrow.go +++ b/chains/evm/message/lifiEscrow.go @@ -118,7 +118,7 @@ func (h *LifiEscrowMessageHandler) HandleMessage(m *message.Message) (*proposal. err = h.confirmationWatcher.WaitForOrderConfirmations( context.Background(), h.chainID, - common.HexToHash(data.DepositTxHash), + *order.Meta.OrderInitiatedTxHash, orderValue, ) if err != nil { diff --git a/chains/evm/message/lifiEscrow_test.go b/chains/evm/message/lifiEscrow_test.go index b1547275..da66a736 100644 --- a/chains/evm/message/lifiEscrow_test.go +++ b/chains/evm/message/lifiEscrow_test.go @@ -205,12 +205,11 @@ func (s *LifiEscrowMessageHandlerTestSuite) Test_HandleMessage_ValidOrder() { LiquidityPool: common.HexToAddress("0xe59aaf21c4D9Cf92d9eD4537f4404BA031f83b23"), BorrowAmount: big.NewInt(10000), OrderID: "orderID", - DepositTxHash: "0xhash", } s.mockOrderFetcher.EXPECT().GetOrder("orderID").Return(s.mockOrder, nil) s.mockOrderValidator.EXPECT().Validate(s.mockOrder).Return(nil) s.mockOrderPricer.EXPECT().PriceInputs(gomock.Any()).Return(float64(1000), nil) - s.mockWatcher.EXPECT().WaitForOrderConfirmations(gomock.Any(), uint64(8453), common.HexToHash(ad.DepositTxHash), float64(1000)).Return(nil) + s.mockWatcher.EXPECT().WaitForOrderConfirmations(gomock.Any(), uint64(8453), gomock.Any(), float64(1000)).Return(nil) s.mockCoordinator.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil) m := &coreMessage.Message{