modify lock config

Author: liuxiaobleach

server/dal.go

@@ -139,8 +139,9 @@ func (d *DAL) RefundTransfer(tid, txRefundHash Hash) error {
 }
 
 func (d *DAL) RecordTransferIn(tid, txHash Hash) error {
-	q := `UPDATE transfer SET status = $1, txhash = $2 WHERE tid = $3`
-	_, err := d.Exec(q, cbn.TransferStatus_TRANSFER_STATUS_LOCKED, txHash.String(), tid.String())
+	q := `UPDATE transfer SET status = $1, txhash = $2 WHERE tid = $3 and status in ($4,$5)`
+	_, err := d.Exec(q, cbn.TransferStatus_TRANSFER_STATUS_LOCKED, txHash.String(), tid.String(),
+		cbn.TransferStatus_TRANSFER_STATUS_TRANSFER_IN_START, cbn.TransferStatus_TRANSFER_STATUS_TRANSFER_IN_PENDING)
 	return err
 }
 

server/server.go

@@ -389,7 +389,7 @@ func (s *server) monitorLogTransferOut(bc *bridgeConfig) (monitor.CallbackID, er
 			}
 
 			timeout := int64(ev.Timelock) - tsNow.Unix()
-			if timeout < (3600 * 23) { // src timeout should be larger than 23 hours
+			if timeout < 3600*16 { // src timeout should be larger than 16 hours
 				log.Errorf("src transfer out timeout too small: %d sec", timeout)
 				return false
 			}