Also use gas from latest block when estimating on auto txs

0xfornax · 0xfornax · commit eb520b1ed87d · 2026-02-04T10:27:58.000-03:00
diff --git a/rocketpool/node/defend-challenge-exit.go b/rocketpool/node/defend-challenge-exit.go
@@ -207,7 +207,7 @@ func (t *defendChallengeExit) defendChallenge(rp *rocketpool.RocketPool, mp mega
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/defend-pdao-props.go b/rocketpool/node/defend-pdao-props.go
@@ -256,7 +256,7 @@ func (t *defendPdaoProps) defendProposal(prop defendableProposal) error {
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/distribute-minipools.go b/rocketpool/node/distribute-minipools.go
@@ -242,7 +242,7 @@ func (t *distributeMinipools) distributeMinipool(mpd *rpstate.NativeMinipoolDeta
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return false, err
 		}
diff --git a/rocketpool/node/notify-final-balance.go b/rocketpool/node/notify-final-balance.go
@@ -234,7 +234,7 @@ func (t *notifyFinalBalance) createFinalBalanceProof(rp *rocketpool.RocketPool,
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/notify-validator-exit.go b/rocketpool/node/notify-validator-exit.go
@@ -204,7 +204,7 @@ func (t *notifyValidatorExit) createExitProof(rp *rocketpool.RocketPool, beaconS
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/prestake-megapool-validator.go b/rocketpool/node/prestake-megapool-validator.go
@@ -200,7 +200,7 @@ func (t *prestakeMegapoolValidator) assignDeposit(callopts *bind.CallOpts) error
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/provision-express-tickets.go b/rocketpool/node/provision-express-tickets.go
@@ -157,7 +157,7 @@ func (t *provisionExpress) provisionExpress(nodeAddress common.Address) error {
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/reduce-bonds.go b/rocketpool/node/reduce-bonds.go
@@ -255,7 +255,7 @@ func (t *reduceBonds) forceFeeDistribution() (bool, error) {
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return false, err
 		}
@@ -365,7 +365,7 @@ func (t *reduceBonds) reduceBond(mpd *rpstate.NativeMinipoolDetails, windowStart
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return false, err
 		}
diff --git a/rocketpool/node/stake-megapool-validator.go b/rocketpool/node/stake-megapool-validator.go
@@ -215,7 +215,7 @@ func (t *stakeMegapoolValidator) stakeValidator(rp *rocketpool.RocketPool, beaco
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/node/verify-pdao-props.go b/rocketpool/node/verify-pdao-props.go
@@ -371,7 +371,7 @@ func (t *verifyPdaoProps) submitChallenge(challenge challenge) error {
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
@@ -427,7 +427,7 @@ func (t *verifyPdaoProps) submitDefeat(defeat defeat) error {
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/watchtower/process-penalties.go b/rocketpool/watchtower/process-penalties.go
@@ -505,7 +505,7 @@ func (t *processPenalties) submitPenalty(minipoolAddress common.Address, block *
 	// Get the max fee
 	maxFee := t.maxFee
 	if maxFee == nil || maxFee.Uint64() == 0 {
-		maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool/watchtower/submit-rpl-price.go b/rocketpool/watchtower/submit-rpl-price.go
@@ -966,7 +966,7 @@ func (t *submitRplPrice) submitArbitrumPrice(priceMessengerAddress string) error
 	if index == indexToSubmit {
 
 		// Get the current network recommended max fee
-		suggestedMaxFee, err := rpgas.GetHeadlessMaxFeeWei(t.cfg)
+		suggestedMaxFee, err := rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)
 		if err != nil {
 			return fmt.Errorf("error getting recommended base fee from the network for Arbitrum price submission: %w", err)
 		}
diff --git a/shared/services/gas/gas.go b/shared/services/gas/gas.go
@@ -1,6 +1,7 @@
 package gas
 
 import (
+	"context"
 	"fmt"
 	"math/big"
 	"strconv"
@@ -146,6 +147,22 @@ func GetMaxFeeAndLimit(gasInfo rocketpool.GasInfo, rp *rpsvc.Client, headless bo
 
 // Get the suggested max fee for service operations
 func GetHeadlessMaxFeeWei(cfg *config.RocketPoolConfig) (*big.Int, error) {
+	return GetHeadlessMaxFeeWeiWithLatestBlock(cfg, nil)
+}
+
+// Get the suggested max fee for service operations using the latest block
+func GetHeadlessMaxFeeWeiWithLatestBlock(cfg *config.RocketPoolConfig, rp *rocketpool.RocketPool) (*big.Int, error) {
+	if rp != nil {
+		// Getting the latest block to estimate the gas price
+		latestBlock, err := rp.Client.HeaderByNumber(context.Background(), nil)
+		if err != nil {
+			fmt.Printf("%sWarning: couldn't get gas estimates from the latest block%s\nUsing gas oracles%s\n", colorYellow, err.Error(), colorReset)
+		}
+		// Get the latest block gas + 20%
+		gasPrice := big.NewInt(0).Add(latestBlock.BaseFee, big.NewInt(0).Div(big.NewInt(0).Mul(latestBlock.BaseFee, big.NewInt(20)), big.NewInt(100)))
+		return gasPrice, nil
+	}
+
 	etherchainData, err := etherchain.GetGasPrices(cfg)
 	if err == nil {
 		return etherchainData.RapidWei, nil
@@ -155,10 +172,9 @@ func GetHeadlessMaxFeeWei(cfg *config.RocketPoolConfig) (*big.Int, error) {
 		etherscanData, err := etherscan.GetGasPrices()
 		if err == nil {
 			return eth.GweiToWei(etherscanData.FastGwei), nil
-		} else {
-			return nil, fmt.Errorf("Error getting gas price suggestions: %w", err)
 		}
 	}
+	return nil, fmt.Errorf("error getting gas estimates")
 }
 
 func handleEtherchainGasPrices(gasSuggestion etherchain.GasFeeSuggestion, gasInfo rocketpool.GasInfo, priorityFee float64, gasLimit uint64) float64 {
diff --git a/shared/services/megapools.go b/shared/services/megapools.go
@@ -382,6 +382,11 @@ func GetNodeMegapoolDetails(rp *rocketpool.RocketPool, bc beacon.Client, nodeAcc
 		details.NodeBond, err = mega.GetNodeBond(opts)
 		return err
 	})
+	wg.Go(func() error {
+		var err error
+		details.NodeQueuedBond, err = mega.GetNodeQueuedBond(opts)
+		return err
+	})
 	wg.Go(func() error {
 		var err error
 		details.UserCapital, err = mega.GetUserCapital(opts)
diff --git a/shared/types/api/megapool.go b/shared/types/api/megapool.go
@@ -39,6 +39,7 @@ type MegapoolDetails struct {
 	UseLatestDelegate        bool                       `json:"useLatestDelegate"`
 	AssignedValue            *big.Int                   `json:"assignedValue"`
 	NodeBond                 *big.Int                   `json:"nodeBond"`
+	NodeQueuedBond           *big.Int                   `json:"nodeQueuedBond"`
 	UserCapital              *big.Int                   `json:"userCapital"`
 	NodeShare                *big.Int                   `json:"nodeShare"`
 	BondRequirement          *big.Int                   `json:"bondRequirement"`

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func (t defendChallengeExit) defendChallenge(rp rocketpool.RocketPool, mp mega`
`207`	`207`	`// Get the max fee`
`208`	`208`	`maxFee := t.maxFee`
`209`	`209`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`210`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`210`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`211`	`211`	`if err != nil {`
`212`	`212`	`return err`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func (t *defendPdaoProps) defendProposal(prop defendableProposal) error {`
`256`	`256`	`// Get the max fee`
`257`	`257`	`maxFee := t.maxFee`
`258`	`258`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`259`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`259`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`260`	`260`	`if err != nil {`
`261`	`261`	`return err`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (t distributeMinipools) distributeMinipool(mpd rpstate.NativeMinipoolDeta`
`242`	`242`	`// Get the max fee`
`243`	`243`	`maxFee := t.maxFee`
`244`	`244`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`245`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`245`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`246`	`246`	`if err != nil {`
`247`	`247`	`return false, err`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (t notifyFinalBalance) createFinalBalanceProof(rp rocketpool.RocketPool,`
`234`	`234`	`// Get the max fee`
`235`	`235`	`maxFee := t.maxFee`
`236`	`236`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`237`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`237`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`238`	`238`	`if err != nil {`
`239`	`239`	`return err`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func (t notifyValidatorExit) createExitProof(rp rocketpool.RocketPool, beaconS`
`204`	`204`	`// Get the max fee`
`205`	`205`	`maxFee := t.maxFee`
`206`	`206`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`207`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`207`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`208`	`208`	`if err != nil {`
`209`	`209`	`return err`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func (t prestakeMegapoolValidator) assignDeposit(callopts bind.CallOpts) error`
`200`	`200`	`// Get the max fee`
`201`	`201`	`maxFee := t.maxFee`
`202`	`202`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`203`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`203`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`204`	`204`	`if err != nil {`
`205`	`205`	`return err`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func (t *provisionExpress) provisionExpress(nodeAddress common.Address) error {`
`157`	`157`	`// Get the max fee`
`158`	`158`	`maxFee := t.maxFee`
`159`	`159`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`160`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`160`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`161`	`161`	`if err != nil {`
`162`	`162`	`return err`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (t stakeMegapoolValidator) stakeValidator(rp rocketpool.RocketPool, beaco`
`215`	`215`	`// Get the max fee`
`216`	`216`	`maxFee := t.maxFee`
`217`	`217`	`if maxFee == nil \|\| maxFee.Uint64() == 0 {`
`218`		`- maxFee, err = rpgas.GetHeadlessMaxFeeWei(t.cfg)`
	`218`	`+ maxFee, err = rpgas.GetHeadlessMaxFeeWeiWithLatestBlock(t.cfg, t.rp)`
`219`	`219`	`if err != nil {`
`220`	`220`	`return err`
`221`	`221`	`}`