浏览代码

fixed bags on payouts

closes #1 #2'
TooManySugar 3 年之前
父节点
当前提交
4f294e09f2
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      update_data.go

+ 4 - 4
update_data.go

@@ -216,21 +216,21 @@ func (c *Connection) updateWorker(workerData ethmineapi.WorkerData,
 
 		//removing old records
 		result := c.GormDb.
-			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newPayoutRecord.Time).
+			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newMinerRecord.Time).
 			Delete(Worker{})
 		if result.Error != nil {
 			LogError.Println(result.Error)
 		}
 
 		result = c.GormDb.
-			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newPayoutRecord.Time).
+			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newMinerRecord.Time).
 			Delete(Miner{})
 		if result.Error != nil {
 			LogError.Println(result.Error)
 		}
 
 		result = c.GormDb.
-			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newPayoutRecord.Time).
+			Where("wallet = ? AND time < ?", newPayoutRecord.Wallet, newMinerRecord.Time).
 			Delete(Payout{})
 		if result.Error != nil {
 			LogError.Println(result.Error)
@@ -256,7 +256,7 @@ func (c *Connection) updateWorker(workerData ethmineapi.WorkerData,
 			max = 0
 		}
 
-		if lastWorkerRecord.Time > max {
+		if lastWorkerRecord.Time > max || lastWorkerRecord.WorkerUnpaid == 0 {
 			workerUnpaid := float64(lastWorkerRecord.WorkerUnpaid+
 				float64(newMinerRecord.Unpaid-lastMinerRecord.Unpaid)) *
 				(float64(workerData.ReportedHashrate) / float64(newMinerRecord.ReportedHashrate))