Merge branch 'develop' into proposer-compare-wd-roots

beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go

@@ -91,9 +91,10 @@ func (vs *Server) GetBeaconBlock(ctx context.Context, req *ethpb.BlockRequest) (
 		sBlk.SetDeposits([]*ethpb.Deposit{})
 		sBlk.SetAttestations([]*ethpb.Attestation{})
 		log.WithError(err).Error("Could not pack deposits and attestations")
+	} else {
+		sBlk.SetDeposits(deposits)
+		sBlk.SetAttestations(atts)
 	}
-	sBlk.SetDeposits(deposits)
-	sBlk.SetAttestations(atts)
 
 	// Set proposer index.
 	idx, err := helpers.BeaconProposerIndex(ctx, head)

beacon-chain/sync/initial-sync/blocks_fetcher.go

@@ -396,6 +396,12 @@ func timeToWait(wanted, rem, capacity int64, timeTillEmpty time.Duration) time.D
 	if rem >= wanted {
 		return 0
 	}
+	// Handle edge case where capacity is equal to the remaining amount
+	// of blocks. This also handles the impossible case in where remaining blocks
+	// exceed the limiter's capacity.
+	if capacity <= rem {
+		return 0
+	}
 	blocksNeeded := wanted - rem
 	currentNumBlks := capacity - rem
 	expectedTime := int64(timeTillEmpty) * blocksNeeded / currentNumBlks

beacon-chain/sync/initial-sync/blocks_fetcher_test.go

@@ -914,6 +914,14 @@ func TestTimeToWait(t *testing.T) {
 			timeTillEmpty: 200 * time.Second,
 			want:          0 * time.Second,
 		},
+		{
+			name:          "Limiter has full capacity remaining",
+			wanted:        350,
+			rem:           320,
+			capacity:      320,
+			timeTillEmpty: 0 * time.Second,
+			want:          0 * time.Second,
+		},
 		{
 			name:          "Limiter has reached full capacity",
 			wanted:        64,

config/params/testnet_e2e_config.go

@@ -62,6 +62,7 @@ func E2EMainnetTestConfig() *BeaconChainConfig {
 	e2eConfig.MinGenesisActiveValidatorCount = 256
 	e2eConfig.GenesisDelay = 25 // 25 seconds so E2E has enough time to process deposits and get started.
 	e2eConfig.ChurnLimitQuotient = 65536
+	e2eConfig.MaxValidatorsPerWithdrawalsSweep = 128
 
 	// Time parameters.
 	e2eConfig.SecondsPerSlot = 6

config/validator/service/BUILD.bazel

@@ -7,7 +7,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//config/fieldparams:go_default_library",
-        "//config/params:go_default_library",
         "@com_github_ethereum_go_ethereum//common:go_default_library",
     ],
 )

config/validator/service/proposer-settings.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams"
-	"github.com/prysmaticlabs/prysm/v3/config/params"
 )
 
 // ProposerSettingsPayload is the struct representation of the JSON or YAML payload set in the validator through the CLI.
@@ -69,16 +68,12 @@ type ProposerSettings struct {
 	DefaultConfig *ProposerOption
 }
 
-// ProposerOption is a Prysm internal representation of the ProposerOptionPayload on the validator client in bytes format instead of hex.
-type ProposerOption struct {
-	FeeRecipient  common.Address
-	BuilderConfig *BuilderConfig
+type FeeRecipientConfig struct {
+	FeeRecipient common.Address
 }
 
-// DefaultProposerOption returns a Proposer Option with defaults filled
-func DefaultProposerOption() ProposerOption {
-	return ProposerOption{
-		FeeRecipient:  params.BeaconConfig().DefaultFeeRecipient,
-		BuilderConfig: nil,
-	}
+// ProposerOption is a Prysm internal representation of the ProposerOptionPayload on the validator client in bytes format instead of hex.
+type ProposerOption struct {
+	FeeRecipientConfig *FeeRecipientConfig
+	BuilderConfig      *BuilderConfig
 }

crypto/bls/common/mock/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@prysm//tools/go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface_mock.go"],
+    importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls/common/mock",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//crypto/bls/common:go_default_library",
+        "@com_github_golang_mock//gomock:go_default_library",
+    ],
+)

hack/update-mockgen.sh

@@ -88,3 +88,20 @@ done
 
 goimports -w "$beacon_api_mock_path/."
 gofmt -s -w "$beacon_api_mock_path/."
+
+# github.com/prysmaticlabs/prysm/v3/crypto/bls
+# --------------------------------------------
+crypto_bls_common_mock_path="crypto/bls/common/mock"
+crypto_bls_common_mocks=(
+      "$crypto_bls_common_mock_path/interface_mock.go interface.go"
+)
+
+for ((i = 0; i < ${#crypto_bls_common_mocks[@]}; i++)); do
+    file=${crypto_bls_common_mocks[i]% *};
+    source=${crypto_bls_common_mocks[i]#* };
+    echo "generating $file for file: $source";
+    GO11MODULE=on mockgen -package=mock -source="crypto/bls/common/$source" -destination="$file"
+done
+
+goimports -w "$crypto_bls_common_mock_path/."
+gofmt -s -w "$crypto_bls_common_mock_path/."