Merge branch 'master' into use_hex

Author: joshuacolvin0

execution/gethexec/executionengine.go

@@ -37,14 +37,14 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/ethereum/go-ethereum/params"
 
 	"github.com/offchainlabs/nitro/arbos"
 	"github.com/offchainlabs/nitro/arbos/arbosState"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
 	"github.com/offchainlabs/nitro/arbos/l1pricing"
 	"github.com/offchainlabs/nitro/arbos/programs"
 	"github.com/offchainlabs/nitro/arbutil"
-	"github.com/offchainlabs/nitro/cmd/chaininfo"
 	"github.com/offchainlabs/nitro/execution"
 	"github.com/offchainlabs/nitro/util/arbmath"
 	"github.com/offchainlabs/nitro/util/sharedmetrics"
@@ -1005,17 +1005,16 @@ func (s *ExecutionEngine) digestMessageWithBlockMutex(msgIdxToDigest arbutil.Mes
 			timestamp = time.Unix(int64(timestampInt), 0)
 			timeUntilUpgrade = time.Until(timestamp)
 		}
-		maxSupportedVersion := chaininfo.ArbitrumDevTestChainConfig().ArbitrumChainParams.InitialArbOSVersion
 		logLevel := log.Warn
 		if timeUntilUpgrade < time.Hour*24 {
 			logLevel = log.Error
 		}
-		if version > maxSupportedVersion {
+		if version > params.MaxArbosVersionSupported {
 			logLevel(
 				"you need to update your node to the latest version before this scheduled ArbOS upgrade",
 				"timeUntilUpgrade", timeUntilUpgrade,
 				"upgradeScheduledFor", timestamp,
-				"maxSupportedArbosVersion", maxSupportedVersion,
+				"maxSupportedArbosVersion", params.MaxArbosVersionSupported,
 				"pendingArbosUpgradeVersion", version,
 			)
 		}

staker/bold/bold_staker.go

@@ -16,7 +16,9 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/node"
+	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 
 	protocol "github.com/offchainlabs/bold/chain-abstraction"
@@ -31,11 +33,17 @@ import (
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/staker"
 	legacystaker "github.com/offchainlabs/nitro/staker/legacy"
+	"github.com/offchainlabs/nitro/util/arbmath"
 	"github.com/offchainlabs/nitro/util/headerreader"
 	"github.com/offchainlabs/nitro/util/stopwaiter"
 	"github.com/offchainlabs/nitro/validator"
 )
 
+var (
+	boldStakerBalanceGauge      = metrics.NewRegisteredGaugeFloat64("arb/staker/balance", nil)
+	boldStakerAmountStakedGauge = metrics.NewRegisteredGauge("arb/staker/amount_staked", nil)
+)
+
 var assertionCreatedId common.Hash
 
 func init() {
@@ -195,7 +203,7 @@ type BOLDStaker struct {
 	blockValidator     *staker.BlockValidator
 	rollupAddress      common.Address
 	l1Reader           *headerreader.HeaderReader
-	client             protocol.ChainBackend
+	client             *util.BackendWrapper
 	callOpts           bind.CallOpts
 	wallet             legacystaker.ValidatorWalletInterface
 	stakedNotifiers    []legacystaker.LatestStakedNotifier
@@ -327,10 +335,43 @@ func (b *BOLDStaker) Start(ctxIn context.Context) {
 				notifier.UpdateLatestConfirmed(confirmedMsgCount, *confirmedGlobalState)
 			}
 		}
+		err = b.updateStakerBalanceMetric(ctx)
+		if err != nil {
+			log.Warn("error updating staker balance metric", "err", err)
+		}
 		return b.config.AssertionPostingInterval
 	})
 }
 
+func (b *BOLDStaker) updateStakerBalanceMetric(ctx context.Context) error {
+	walletAddressOrZero := b.wallet.AddressOrZero()
+	if walletAddressOrZero != (common.Address{}) {
+		rollupUserLogic, err := boldrollup.NewRollupUserLogic(b.rollupAddress, b.client)
+		if err != nil {
+			return fmt.Errorf("error creating rollup user logic: %w", err)
+		}
+		amountStaked, err := rollupUserLogic.AmountStaked(&bind.CallOpts{Context: ctx}, walletAddressOrZero)
+		if err != nil {
+			return fmt.Errorf("error getting amount staked: %w", err)
+		}
+		boldStakerAmountStakedGauge.Update(arbmath.BigDivByUint(amountStaked, params.Ether).Int64())
+	} else {
+		boldStakerAmountStakedGauge.Update(0)
+	}
+
+	txSenderAddress := b.wallet.TxSenderAddress()
+	if txSenderAddress != nil {
+		balance, err := b.client.BalanceAt(ctx, *txSenderAddress, nil)
+		if err != nil {
+			return fmt.Errorf("error getting balance for %v: %w", txSenderAddress, err)
+		}
+		boldStakerBalanceGauge.Update(arbmath.BalancePerEther(balance))
+	} else {
+		boldStakerBalanceGauge.Update(0)
+	}
+	return nil
+}
+
 func (b *BOLDStaker) getLatestState(ctx context.Context, confirmed bool) (arbutil.MessageIndex, *validator.GoGlobalState, error) {
 	var globalState protocol.GoGlobalState
 	var err error