Merge pull request #594 from rocket-pool/master-into-v2-jul

Merge master into v2

Author: 0xfornax

.github/workflows/commits.yml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Block Fixup Commit Merge
-      uses: 13rac1/[email protected]
+      - uses: actions/checkout@v4
+      - name: Block Fixup Commit Merge
+        uses: 13rac1/[email protected]

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing to Smart Node
+Smart Node is an open-source project that welcomes community contributions.
+
+## Roles
+Smart Node has three roles: Owner, Maintainers, and Contributors.
+
+### Owner
+The Owner has final say in settling disputes and making executive decisions when consensus cannot be reached. Currently, the Owner is @0xfornax.
+
+### Maintainers
+Maintainers are team or community members who contribute routinely. The Owner is also a Maintainer. Current Maintainers:
+- @0xfornax
+- @thomaspanf
+- @jshufro
+
+Smart Node was previously maintained by @jclapis and @moles1
+
+### Contributors
+Contributors are community members who have submitted merged pull requests with some regularity. They are too numerous to list individually.
+
+## Good Practices
+- Adhere to golang best practices. See [Effective Go](https://golang.org/doc/effective_go.html) for a good starting point.
+- Adhere to broader coding practices, such as DRY, POLA, Avoid Deep Nesting, etc.
+- New code should be unit tested when possible.
+- Write self-documenting code when possible, and add comments when necessary.
+
+## Pull Requests
+- Each PR should represent a single feature, bugfix, or non-functional change.
+- Owners and Maintainers may decide if a change is too small for peer review, but should still offer the opportunity for review by posting the PR for at least a day, unless urgent.
+- Larger changes require at least one Maintainer's review.
+- All Contributor PRs must be reviewed by a Maintainer.
+- Commits should be groomed: each commit should compile, pass tests, and represent logical atomic progressions.
+- History rewriting is permissible only while a PR is in DRAFT status, or after a Maintainer has approved the PR. Once a PR is approved, fixup commits should be rebased into the original commits.
+
+## Licenses
+Smart Node is licensed under GNU GPLv3, and all contributions must be made under the same license. See [LICENSE](LICENSE) for details.

README.md

@@ -88,8 +88,6 @@ The following commands are available via the Smartnode client:
   - `rocketpool node deposit, d` - Make a deposit and create a minipool
   - `rocketpool node create-vacant-minipool, cvm` - Create an empty minipool, which can be used to migrate an existing solo staking validator as part of the 0x00 to 0x01 withdrawal credentials upgrade
   - `rocketpool node send, n` - Send ETH or tokens from the node account to an address. ENS names supported. <token> can be 'rpl', 'eth', 'fsrpl' (for the old RPL v1 token), 'reth', or the address of an arbitrary token you want to send (including the 0x prefix).
-  - `rocketpool node set-voting-delegate, sv` - Set the address you want to use when voting on Rocket Pool governance proposals on Snapshot, or the address you want to delegate your voting power to.
-  - `rocketpool node clear-voting-delegate, cv` - Remove the address you've set for voting on Rocket Pool governance proposals.
   - `rocketpool node initialize-fee-distributor, z` - Create the fee distributor contract for your node, so you can withdraw priority fees and MEV rewards after the merge
   - `rocketpool node distribute-fees, b` - Distribute the priority fee and MEV rewards from your fee distributor to your withdrawal address and the rETH contract (based on your node's average commission)
   - `rocketpool node join-smoothing-pool, js` - Opt your node into the Smoothing Pool

rocketpool-cli/commands/node/clear-voting-delegate.go

@@ -1,6 +1,8 @@
 package node
 
 import (
+	"fmt"
+
 	"github.com/urfave/cli/v2"
 
 	"github.com/rocket-pool/node-manager-core/utils/input"
@@ -515,33 +517,26 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 			{
 				Name:      "set-voting-delegate",
 				Aliases:   []string{"sv"},
-				Usage:     "Set the address you want to use when voting on Rocket Pool Snapshot governance proposals, or the address you want to delegate your voting power to.",
+				Usage:     "(DEPRECATED) Use `rocketpool pdao set-signalling-address` instead",
 				ArgsUsage: "address",
-				Flags: []cli.Flag{
-					cliutils.YesFlag,
-				},
 				Action: func(c *cli.Context) error {
-					// Validate args
-					utils.ValidateArgCount(c, 1)
-					delegate := c.Args().Get(0)
 
 					// Run
-					return nodeSetVotingDelegate(c, delegate)
+					fmt.Println("(DEPRECATED) Use `rocketpool pdao set-signalling-address` instead.")
+					fmt.Println("For more information, please refer to the Governance article on Medium (https://medium.com/rocket-pool/rocket-pool-protocol-dao-governance-a3c3e92904e0).")
+					return nil
 				},
 			},
 			{
 				Name:    "clear-voting-delegate",
 				Aliases: []string{"cv"},
-				Usage:   "Remove the address you've set for voting on Rocket Pool governance proposals.",
-				Flags: []cli.Flag{
-					cliutils.YesFlag,
-				},
+				Usage:   "(DEPRECATED) Use `rocketpool pdao clear-signalling-address` instead",
 				Action: func(c *cli.Context) error {
-					// Validate args
-					utils.ValidateArgCount(c, 0)
 
 					// Run
-					return nodeClearVotingDelegate(c)
+					fmt.Println("(DEPRECATED) Use `rocketpool pdao clear-signalling-address` instead.")
+					fmt.Println("For more information, please refer to the Governance article on Medium (https://medium.com/rocket-pool/rocket-pool-protocol-dao-governance-a3c3e92904e0).")
+					return nil
 				},
 			},
 

rocketpool-cli/commands/node/commands.go

@@ -216,6 +216,9 @@ func (m *ProposalManager) GetArtifactsForVoting(blockNumber uint32, nodeAddress
 
 	// Get the artifacts
 	totalDelegatedVp := nodeTree.Nodes[0].Sum
+	if totalDelegatedVp == nil {
+		totalDelegatedVp = big.NewInt(0)
+	}
 	treeIndex := getTreeNodeIndexFromRPNodeIndex(snapshot, nodeIndex)
 	proofPtrs := networkTree.generateMerkleProof(treeIndex)
 

rocketpool-cli/commands/node/set-voting-delegate.go

@@ -107,56 +107,17 @@ func (t *SubmitNetworkBalances) Run(state *state.NetworkState) error {
 	submissionIntervalInSeconds := int64(state.NetworkDetails.PricesSubmissionFrequency)
 	eth2Config := state.BeaconConfig
 
-	// Get the time of the latest block
-	latestEth1Block, err := t.rp.Client.HeaderByNumber(context.Background(), nil)
-	if err != nil {
-		return fmt.Errorf("Can't get the latest block time: %w", err)
-	}
-	latestBlockTimestamp := int64(latestEth1Block.Time)
-
-	// Calculate the next submission timestamp
-	submissionTimestamp, err := utils.FindNextSubmissionTimestamp(latestBlockTimestamp, referenceTimestamp, submissionIntervalInSeconds)
-	if err != nil {
-		return err
-	}
-
-	// Convert the submission timestamp to time.Time
-	nextSubmissionTime := time.Unix(submissionTimestamp, 0)
-
-	// Get the Beacon block corresponding to this time
-	genesisTime := time.Unix(int64(eth2Config.GenesisTime), 0)
-	timeSinceGenesis := nextSubmissionTime.Sub(genesisTime)
-	slotNumber := uint64(timeSinceGenesis.Seconds()) / eth2Config.SecondsPerSlot
-
-	// Search for the last existing EL block, going back up to 32 slots if the block is not found.
-	targetBlock, err := utils.FindLastBlockWithExecutionPayload(t.ctx, t.bc, slotNumber)
+	slotNumber, nextSubmissionTime, targetBlockHeader, err := utils.FindNextSubmissionTarget(t.ctx, t.rp, eth2Config, t.bc, t.ec, lastSubmissionBlock, referenceTimestamp, submissionIntervalInSeconds)
 	if err != nil {
 		return err
 	}
 
-	targetBlockNumber := targetBlock.ExecutionBlockNumber
-	if targetBlockNumber <= lastSubmissionBlock {
+	targetBlockNumber := targetBlockHeader.Number.Uint64()
+	if targetBlockNumber < lastSubmissionBlock {
 		// No submission needed: target block older or equal to the last submission
 		return nil
 	}
 
-	targetBlockHeader, err := t.ec.HeaderByNumber(context.Background(), big.NewInt(int64(targetBlockNumber)))
-	if err != nil {
-		return err
-	}
-
-	// Check if the required epoch is finalized yet
-	requiredEpoch := slotNumber / eth2Config.SlotsPerEpoch
-	beaconHead, err := t.bc.GetBeaconHead(t.ctx)
-	if err != nil {
-		return err
-	}
-	finalizedEpoch := beaconHead.FinalizedEpoch
-	if requiredEpoch > finalizedEpoch {
-		t.logger.Info("Balance report is due, waiting for target epoch to finalize.", slog.Uint64(keys.BlockKey, targetBlockNumber), slog.Uint64(keys.TargetEpochKey, requiredEpoch), slog.Uint64(keys.FinalizedEpochKey, finalizedEpoch))
-		return nil
-	}
-
 	// Check if the process is already running
 	t.lock.Lock()
 	if t.isRunning {

rocketpool-daemon/common/proposals/proposal-manager.go

@@ -94,47 +94,19 @@ func (t *SubmitRplPrice) Run(state *state.NetworkState) error {
 	submissionIntervalInSeconds := int64(state.NetworkDetails.PricesSubmissionFrequency)
 	eth2Config := state.BeaconConfig
 
-	// Get the time of the latest block
-	latestEth1Block, err := t.rp.Client.HeaderByNumber(context.Background(), nil)
-	if err != nil {
-		return fmt.Errorf("Can't get the latest block time: %w", err)
-	}
-	latestBlockTimestamp := int64(latestEth1Block.Time)
-
-	// Calculate the next submission timestamp
-	submissionTimestamp, err := utils.FindNextSubmissionTimestamp(latestBlockTimestamp, referenceTimestamp, submissionIntervalInSeconds)
+	_, nextSubmissionTime, targetBlockHeader, err := utils.FindNextSubmissionTarget(t.ctx, t.rp, eth2Config, t.bc, t.ec, lastSubmissionBlock, referenceTimestamp, submissionIntervalInSeconds)
 	if err != nil {
 		return err
 	}
 
-	// Get the Beacon slot corresponding to this time
-	genesisTime := (int64(eth2Config.GenesisTime))
-	timeSinceGenesis := submissionTimestamp - genesisTime
-	slotNumber := uint64(timeSinceGenesis) / eth2Config.SecondsPerSlot
+	submissionTimestamp := uint64(nextSubmissionTime.Unix())
 
-	// Search for the last existing EL block, going back up to 32 slots if the block is not found.
-	targetBlock, err := utils.FindLastBlockWithExecutionPayload(t.ctx, t.bc, slotNumber)
-	if err != nil {
-		return err
-	}
-	targetBlockNumber := targetBlock.ExecutionBlockNumber
-	if targetBlockNumber <= lastSubmissionBlock {
+	targetBlockNumber := targetBlockHeader.Number.Uint64()
+	if targetBlockNumber < lastSubmissionBlock {
 		// No submission needed: target block older or equal to the last submission
 		return nil
 	}
 
-	// Check if the required epoch is finalized yet
-	targetEpoch := slotNumber / eth2Config.SlotsPerEpoch
-	beaconHead, err := t.bc.GetBeaconHead(t.ctx)
-	if err != nil {
-		return err
-	}
-	finalizedEpoch := beaconHead.FinalizedEpoch
-	if targetEpoch > finalizedEpoch {
-		t.logger.Info("Prices must be reported, waiting until target Epoch is finalized.", slog.Uint64(keys.BlockKey, targetBlockNumber), slog.Uint64(keys.TargetEpochKey, targetEpoch), slog.Uint64(keys.FinalizedEpochKey, finalizedEpoch))
-		return nil
-	}
-
 	// Check if the process is already running
 	t.lock.Lock()
 	if t.isRunning {
@@ -163,7 +135,7 @@ func (t *SubmitRplPrice) Run(state *state.NetworkState) error {
 		t.logger.Info("Retrieved RPL price", slog.Uint64(keys.BlockKey, targetBlockNumber), slog.Float64(keys.PriceKey, math.RoundDown(eth.WeiToEth(rplPrice), 6)))
 
 		// Check if we have reported these specific values before
-		hasSubmittedSpecific, err := t.hasSubmittedSpecificBlockPrices(nodeAddress, targetBlockNumber, uint64(submissionTimestamp), rplPrice, true)
+		hasSubmittedSpecific, err := t.hasSubmittedSpecificBlockPrices(nodeAddress, targetBlockNumber, submissionTimestamp, rplPrice, true)
 		if err != nil {
 			t.handleError(err)
 			return
@@ -176,7 +148,7 @@ func (t *SubmitRplPrice) Run(state *state.NetworkState) error {
 		}
 
 		// We haven't submitted these values, check if we've submitted any for this block so we can log it
-		hasSubmitted, err := t.hasSubmittedBlockPrices(nodeAddress, targetBlockNumber, uint64(submissionTimestamp), true)
+		hasSubmitted, err := t.hasSubmittedBlockPrices(nodeAddress, targetBlockNumber, submissionTimestamp, true)
 		if err != nil {
 			t.handleError(err)
 			return
@@ -189,7 +161,7 @@ func (t *SubmitRplPrice) Run(state *state.NetworkState) error {
 		t.logger.Info("Submitting RPL price...")
 
 		// Submit RPL price
-		if err := t.submitRplPrice(targetBlockNumber, uint64(submissionTimestamp), rplPrice, true); err != nil {
+		if err := t.submitRplPrice(targetBlockNumber, submissionTimestamp, rplPrice, true); err != nil {
 			t.handleError(fmt.Errorf("error submitting RPL price: %w", err))
 			return
 		}