Add Miner Effort

Co-Authored-By: Reggerriee <[email protected]>

src/Miningcore/Api/Responses/GetBlocksResponse.cs

@@ -9,6 +9,7 @@ public class Block
     public string Type { get; set; }
     public double ConfirmationProgress { get; set; }
     public double? Effort { get; set; }
+    public double? MinerEffort { get; set; }
     public string TransactionConfirmationData { get; set; }
     public decimal Reward { get; set; }
     public string InfoLink { get; set; }

src/Miningcore/Api/Responses/GetMinerStatsResponse.cs

@@ -25,6 +25,7 @@ public class MinerStats
     public decimal PendingBalance { get; set; }
     public decimal TotalPaid { get; set; }
     public decimal TodayPaid { get; set; }
+    public double MinerEffort { get; set; }
     public DateTime? LastPayment { get; set; }
     public string LastPaymentLink { get; set; }
     public WorkerPerformanceStatsContainer Performance { get; set; }

src/Miningcore/Persistence/Model/Block.cs

@@ -10,6 +10,7 @@ public class Block
     public string Type { get; set; }
     public double ConfirmationProgress { get; set; }
     public double? Effort { get; set; }
+    public double? MinerEffort { get; set; }
     public string TransactionConfirmationData { get; set; }
     public string Miner { get; set; }
     public decimal Reward { get; set; }

src/Miningcore/Persistence/Model/Projections/MinerStats.cs

@@ -18,6 +18,7 @@ public class MinerStats
     public decimal PendingBalance { get; init; }
     public decimal TotalPaid { get; init; }
     public decimal TodayPaid { get; init; }
+    public double MinerEffort { get; set; }
     public Payment LastPayment { get; set; }
     public WorkerPerformanceStatsContainer Performance { get; set; }
     public MinerWorkerPerformanceStats[] PerformanceStats { get; init; }

src/Miningcore/Persistence/Postgres/Repositories/BlockRepository.cs

@@ -21,9 +21,9 @@ public async Task InsertAsync(IDbConnection con, IDbTransaction tx, Block block)
 
         const string query =
             @"INSERT INTO blocks(poolid, blockheight, networkdifficulty, status, type, transactionconfirmationdata,
-                miner, reward, effort, confirmationprogress, source, hash, created)
+                miner, reward, effort, minereffort, confirmationprogress, source, hash, created)
             VALUES(@poolid, @blockheight, @networkdifficulty, @status, @type, @transactionconfirmationdata,
-                @miner, @reward, @effort, @confirmationprogress, @source, @hash, @created)";
+                @miner, @reward, (SELECT SUM(difficulty / networkdifficulty) FROM shares WHERE poolid = @poolId AND created > (SELECT created FROM blocks WHERE poolid = @poolId ORDER BY created DESC LIMIT 1) AND created < now()), (SELECT SUM(difficulty / networkdifficulty) FROM shares WHERE poolid = @poolId AND miner = @miner AND created > (SELECT created FROM blocks WHERE poolid = @poolId AND miner = @miner ORDER BY created DESC LIMIT 1) AND created < now()), @confirmationprogress, @source, @hash, @created)";
 
         await con.ExecuteAsync(query, mapped, tx);
     }

src/Miningcore/Persistence/Postgres/Scripts/add_minereffort.sql

@@ -0,0 +1,2 @@
+\c miningcore
+ALTER TABLE blocks ADD COLUMN minereffort FLOAT NULL;

src/Miningcore/Persistence/Postgres/Scripts/createdb.sql

@@ -28,6 +28,7 @@ CREATE TABLE blocks
     type TEXT NULL,
     confirmationprogress FLOAT NOT NULL DEFAULT 0,
 	effort FLOAT NULL,
+	minereffort FLOAT NULL,
 	transactionconfirmationdata TEXT NOT NULL,
 	miner TEXT NULL,
 	reward decimal(28,12) NULL,