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