Accepting HTLC when the balance is insufficient

omnilaboratory · Feb 16, 2022 · 35c9288 · 35c9288
1 parent cb29805
commit 35c9288
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lightclient/wsclient_user.go b/lightclient/wsclient_user.go
@@ -38,7 +38,7 @@ func (client *Client) UserModule(msg bean.RequestMessage) (enum.SendTargetType,
 		isAdmin := false
 
 		//TODO 管理员验证
-		if client.IsGRpcRequest || true {
+		if client.IsGRpcRequest {
 			loginToken := gjson.Get(msg.Data, "login_token").Str
 			isAdmin = service.CheckIsAdmin(loginToken)
 		}
@@ -47,6 +47,7 @@ func (client *Client) UserModule(msg bean.RequestMessage) (enum.SendTargetType,
 			peerId = tool.GetUserPeerId(mnemonic)
 		} else {
 			peerId = tool.GetUserPeerId(walletId)
+			//peerId = tool.GetUserPeerId(mnemonic)
 		}
 		if GlobalWsClientManager.OnlineClientMap[peerId] != nil {
 			if GlobalWsClientManager.OnlineClientMap[peerId].User.IsAdmin {

diff --git a/service/htlc_tx_forward.go b/service/htlc_tx_forward.go
@@ -497,6 +497,11 @@ func (service *htlcForwardTxManager) AliceAddHtlcAtAliceSide(msg bean.RequestMes
 	}
 	latestCommitmentTx, _ = getLatestCommitmentTxUseDbTx(tx, channelInfo.ChannelId, user.PeerId)
 
+	// Accepting HTLC when the balance is insufficient
+	if latestCommitmentTx.AmountToRSMC < requestData.AmountToPayee {
+		return nil, false, errors.New(fmt.Sprintf("The amountToPayee in transaction must be more than %.8f", latestCommitmentTx.AmountToRSMC))
+	}
+
 	if latestCommitmentTx.Id > 0 {
 		if latestCommitmentTx.CurrState == dao.TxInfoState_CreateAndSign {
 			_, err = omnicore.GetPubKeyFromWifAndCheck(requestData.LastTempAddressPrivateKey, latestCommitmentTx.RSMCTempAddressPubKey)