Merge branch 'eager_electron_5.0RC' into testnet

Author: echoby

core/lightning.cpp

@@ -518,7 +518,7 @@ void Channel::Update()
 	if (!m_State.m_Terminate)
 	{
 		const HeightRange* pHR = pPath->get_HR();
-		if (pHR && ((hTip + m_Params.m_hPostLockReserve + (m_iRole ? kPostLockReserveLag : 0)) > pHR->m_Max))
+		if (pHR && (hTip + (m_iRole ? kPostLockReserveLag : 0)) > (pHR->m_Max - m_Params.m_hPostLockReserve))
 		{
 			m_State.m_Terminate = true;
 			m_pNegCtx.reset();

wallet/laser/mediator.cpp

@@ -288,10 +288,23 @@ bool Mediator::Serve(const std::string& channelID)
     {
         m_actionsQueue.emplace_back([this, p_channelID] () {
             auto& channel = m_channels[p_channelID];
+
+            if (!channel)
+            {
+                LOG_ERROR() << "Unknown channel ID:  " << to_hex(p_channelID->m_pData, p_channelID->nBytes);
+                return;
+            }
+
+            if (IsChannelExpired(channel))
+            {
+                LOG_ERROR() << "Channel ID:  "
+                            << to_hex(p_channelID->m_pData, p_channelID->nBytes) << " lock height expired";
+                return;
+            }
+
             if (channel)
                 channel->Subscribe();
-            else
-                LOG_ERROR() << "Unknown channel ID:  " << to_hex(p_channelID->m_pData, p_channelID->nBytes);
+
         });
         return true;
     }
@@ -367,6 +380,13 @@ bool Mediator::Close(const std::string& channelID)
         return false;
     }
 
+    if (IsChannelExpired(channel))
+    {
+        LOG_ERROR() << "Channel ID:  "
+                    << to_hex(p_channelID->m_pData, p_channelID->nBytes) << " lock height expired";
+        return false;
+    }
+
     m_actionsQueue.emplace_back([this, p_channelID] () {
         CloseInternal(p_channelID);
     });
@@ -398,6 +418,13 @@ bool Mediator::GracefulClose(const std::string& channelID)
         return false;
     }
 
+    if (IsChannelExpired(channel))
+    {
+        LOG_ERROR() << "Channel ID:  "
+                    << to_hex(p_channelID->m_pData, p_channelID->nBytes) << " lock height expired";
+        return false;
+    }
+
     if (!IsInSync())
     {
         m_actionsQueue.emplace_back([this, &channel] () {
@@ -825,7 +852,8 @@ void Mediator::UpdateChannels()
 
         if (state != Lightning::Channel::State::None &&
             state != Lightning::Channel::State::Closed &&
-            state != Lightning::Channel::State::OpenFailed)
+            state != Lightning::Channel::State::OpenFailed &&
+            !IsChannelExpired(channel))
         {
             channel->Update();
         }
@@ -941,4 +969,11 @@ bool Mediator::IsInSync()
     return IsValidTimeStamp(tip.m_TimeStamp, kDefaultLaserTolerance);
 }
 
+bool Mediator::IsChannelExpired(const std::unique_ptr<Channel>& channel)
+{
+    Block::SystemState::Full tip;
+    get_History().get_Tip(tip);
+    return tip.m_Height >= channel->get_LockHeight() + channel->m_Params.m_hLockTime + channel->m_Params.m_hPostLockReserve;
+}
+
 }  // namespace beam::wallet::laser

wallet/laser/mediator.h

@@ -108,6 +108,7 @@ class Mediator : public IChannelHolder, public proto::FlyClient
     void Subscribe();
     void Unsubscribe();
     bool IsInSync();
+    bool IsChannelExpired(const std::unique_ptr<Channel>& channel);
 
     IWalletDB::Ptr m_pWalletDB;
     proto::FlyClient::INetwork::Ptr m_pConnection;