Added changes related to London hard-fork, also correct calculation o…

…f the reward minus Burnt Fees, additional eth_sendTransaction fields and settings: "gas": 21000, "maxFeePerGas": 50000000000,

examples/ethereum_pool.json

@@ -109,14 +109,16 @@
           }
         ],
         "paymentProcessing": {
-          "enabled": true,
-          "minimumPayment": 1,
-          "payoutScheme": "PPLNS",
-          "payoutSchemeConfig": {
-            "factor": 0.5
-          },
-          "keepUncles": false,
-          "keepTransactionFees": false
+            "enabled": true,
+            "minimumPayment": 1,
+            "payoutScheme": "PPLNS",
+            "payoutSchemeConfig": {
+                "factor": 0.5
+            },
+            "gas": 21000,
+            "maxFeePerGas": 50000000000,
+            "keepUncles": false,
+            "keepTransactionFees": false
         }
       }
     ]

src/Miningcore/Blockchain/Ethereum/Configuration/EthereumPoolPaymentProcessingConfigExtra.cs

@@ -11,5 +11,15 @@ public class EthereumPoolPaymentProcessingConfigExtra
         /// True to exempt uncle rewards from miner rewards
         /// </summary>
         public bool KeepUncles { get; set; }
+
+        /// <summary>
+        /// Gas amount for payout tx (advanced users only)
+        /// </summary>
+        public ulong Gas { get; set; }
+
+        /// <summary>
+        /// maximum amount you’re willing to pay
+        /// </summary>
+        public ulong MaxFeePerGas { get; set; }
     }
 }

src/Miningcore/Blockchain/Ethereum/DaemonRequests/SendTransactionRequest.cs

@@ -41,5 +41,17 @@ public class SendTransactionRequest
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string Data { get; set; }
+
+        /// <summary>
+        /// Maximum fee per gas the sender is willing to pay to miners in wei.
+        /// </summary>
+        [JsonConverter(typeof(HexToIntegralTypeJsonConverter<ulong>))]
+        public ulong MaxPriorityFeePerGas { get; set; }
+
+        /// <summary>
+        /// The maximum total fee per gas the sender is willing to pay(includes the network / base fee and miner / priority fee) in wei
+        /// </summary>
+        [JsonConverter(typeof(HexToIntegralTypeJsonConverter<ulong>))]
+        public ulong MaxFeePerGas { get; set; }
     }
 }

src/Miningcore/Blockchain/Ethereum/DaemonResponses/GetBlockResponse.cs

@@ -177,5 +177,11 @@ public class Block
         /// Array of uncle hashes.
         /// </summary>
         public string[] Uncles { get; set; }
+
+        /// <summary>
+        /// Base fee per gas.
+        /// </summary>
+        [JsonConverter(typeof(HexToIntegralTypeJsonConverter<ulong>))]
+        public ulong BaseFeePerGas { get; set; }
     }
 }

src/Miningcore/Blockchain/Ethereum/EthereumConstants.cs

@@ -85,5 +85,6 @@ public static class EthCommands
         public const string SendTx = "eth_sendTransaction";
         public const string UnlockAccount = "personal_unlockAccount";
         public const string Subscribe = "eth_subscribe";
+        public const string MaxPriorityFeePerGas = "eth_maxPriorityFeePerGas";
     }
 }

src/Miningcore/Blockchain/Ethereum/EthereumPayoutHandler.cs

@@ -126,6 +126,12 @@ public async Task<Block[]> ClassifyBlocksAsync(IMiningPool pool, Block[] blocks,
                             var blockHashResponse = await rpcClient.ExecuteAsync<DaemonResponses.Block>(logger, EC.GetBlockByNumber, ct,
                                 new[] { (object) block.BlockHeight.ToStringHexWithPrefix(), true });
                             var blockHash = blockHashResponse.Response.Hash;
+                            var baseGas = blockHashResponse.Response.BaseFeePerGas;
+                            var gasUsed = blockHashResponse.Response.GasUsed;
+
+                            var burnedFee = (decimal) 0;
+                            if(extraPoolConfig?.ChainTypeOverride == "Ethereum")
+                                burnedFee = (baseGas * gasUsed / EthereumConstants.Wei);
 
                             block.Hash = blockHash;
                             block.Status = BlockStatus.Confirmed;
@@ -138,7 +144,7 @@ public async Task<Block[]> ClassifyBlocksAsync(IMiningPool pool, Block[] blocks,
                                 block.Reward += blockInfo.Uncles.Length * (block.Reward / 32); // uncle rewards
 
                             if(extraConfig?.KeepTransactionFees == false && blockInfo.Transactions?.Length > 0)
-                                block.Reward += await GetTxRewardAsync(blockInfo, ct); // tx fees
+                                block.Reward += await GetTxRewardAsync(blockInfo, ct) - burnedFee;
 
                             logger.Info(() => $"[{LogCategory}] Unlocked block {block.BlockHeight} worth {FormatAmount(block.Reward)}");
 
@@ -396,6 +402,14 @@ private async Task<string> PayoutAsync(Balance balance, CancellationToken ct)
                 Value = amount.ToString("x").TrimStart('0'),
             };
 
+            if(extraPoolConfig?.ChainTypeOverride == "Ethereum")
+            {
+                var maxPriorityFeePerGas = await rpcClient.ExecuteAsync<string>(logger, EC.MaxPriorityFeePerGas, ct);
+                request.Gas = extraConfig.Gas;
+                request.MaxPriorityFeePerGas = maxPriorityFeePerGas.Response.IntegralFromHex<ulong>();
+                request.MaxFeePerGas = extraConfig.MaxFeePerGas;
+            }
+
             var response = await rpcClient.ExecuteAsync<string>(logger, EC.SendTx, ct, new[] { request });
 
             if(response.Error != null)