london hard fork

payouts/unlocker.go

@@ -1,6 +1,7 @@
 package payouts
 
 import (
+	"errors"
 	"fmt"
 	"log"
 	"math/big"
@@ -17,24 +18,28 @@ import (
 )
 
 type UnlockerConfig struct {
-	Enabled              bool     `json:"enabled"`
+	Enabled                 bool     `json:"enabled"`
-	PoolFee              float64  `json:"poolFee"`
+	PoolFee                 float64  `json:"poolFee"`
-	PoolFeeAddress       string   `json:"poolFeeAddress"`
+	PoolFeeAddress          string   `json:"poolFeeAddress"`
-	Depth                int64    `json:"depth"`
+	Depth                   int64    `json:"depth"`
-	ImmatureDepth        int64    `json:"immatureDepth"`
+	ImmatureDepth           int64    `json:"immatureDepth"`
-	KeepTxFees           bool     `json:"keepTxFees"`
+	KeepTxFees              bool     `json:"keepTxFees"`
-	Interval             string   `json:"interval"`
+	Interval                string   `json:"interval"`
-	Daemon               string   `json:"daemon"`
+	Daemon                  string   `json:"daemon"`
-	Timeout              string   `json:"timeout"`
+	Timeout                 string   `json:"timeout"`
-	Ecip1017FBlock       int64    `json:"ecip1017FBlock"`
+	Ecip1017FBlock          int64    `json:"ecip1017FBlock"`
-	Ecip1017EraRounds    *big.Int `json:"ecip1017EraRounds"`
+	Ecip1017EraRounds       *big.Int `json:"ecip1017EraRounds"`
-	ByzantiumFBlock      *big.Int `json:"byzantiumFBlock"`
+	ByzantiumFBlock         *big.Int `json:"byzantiumFBlock"`
-	ConstantinopleFBlock *big.Int `json:"constantinopleFBlock"`
+	ConstantinopleFBlock    *big.Int `json:"constantinopleFBlock"`
-	Network              string   `json:"network"`
+	Network                 string   `json:"network"`
+	IsLondonHardForkEnabled bool     `json:"isLondonHardForkEnabled"`
 }
 
 const minDepth = 16
 
+// London hark fork
+const londonHardForkHeight = 12965000
+
 // Universal block reward ethash
 const UniversalHardForkHeight = 0
 
@@ -927,14 +932,31 @@ func getUncleRewardEthereum(uHeight *big.Int, height *big.Int, reward *big.Int)
 func (u *BlockUnlocker) getExtraRewardForTx(block *rpc.GetBlockReply) (*big.Int, error) {
 	amount := new(big.Int)
 
+	blockHeight, err := strconv.ParseInt(strings.Replace(block.Number, "0x", "", -1), 16, 64)
+	if err != nil {
+		return nil, err
+	}
+	baseFeePerGas := util.String2Big(block.BaseFeePerGas)
+
+	config := UnlockerConfig{
+		IsLondonHardForkEnabled: blockHeight >= londonHardForkHeight,
+	}
+
 	for _, tx := range block.Transactions {
 		receipt, err := u.rpc.GetTxReceipt(tx.Hash)
 		if err != nil {
-			return nil, err
+			log.Println("Error getting transaction receipt:", err)
+			continue
 		}
 		if receipt != nil {
 			gasUsed := util.String2Big(receipt.GasUsed)
 			gasPrice := util.String2Big(tx.GasPrice)
+			if config.IsLondonHardForkEnabled {
+				gasPrice = new(big.Int).Sub(gasPrice, baseFeePerGas)
+				if gasPrice.Cmp(big.NewInt(0)) < 0 {
+					return nil, errors.New("gasPrice less than baseFeePerGas")
+				}
+			}
 			fee := new(big.Int).Mul(gasUsed, gasPrice)
 			amount.Add(amount, fee)
 		}

rpc/rpc.go

@@ -40,6 +40,8 @@ type GetBlockReply struct {
 	Uncles        []string `json:"uncles"`
 	// https://github.com/ethereum/EIPs/issues/95
 	SealFields []string `json:"sealFields"`
+	// london hard fork
+	BaseFeePerGas string `json:"baseFeePerGas"`
 }
 
 type GetBlockReplyPart struct {