*: cherrypick for v1.0-rc7, round two (#3156)

- #3146
- #3155

category: misc
ticket: none

cmd/exit_sign.go

@@ -148,6 +148,7 @@ func runSignPartialExit(ctx context.Context, config exitConfig) error {
 		valAPICallOpts.Indices = []eth2p0.ValidatorIndex{
 			eth2p0.ValidatorIndex(config.ValidatorIndex),
 		}
+		valIndex = eth2p0.ValidatorIndex(config.ValidatorIndex)
 	} else {
 		valAPICallOpts.PubKeys = []eth2p0.BLSPubKey{
 			valEth2,

core/bcast/bcast.go

@@ -74,26 +74,26 @@ func (b Broadcaster) Broadcast(ctx context.Context, duty core.Duty, set core.Sig
 		}
 
 		var (
-			block        core.VersionedSignedProposal
-			blindedBlock core.VersionedSignedBlindedProposal
-
-			blinded bool
-			ok      bool
+			block core.VersionedSignedProposal
+			ok    bool
 		)
 
 		block, ok = aggData.(core.VersionedSignedProposal)
 		if !ok {
-			// check if it's a blinded proposal
-			blindedBlock, blinded = aggData.(core.VersionedSignedBlindedProposal)
-			if !blinded {
-				return errors.New("invalid proposal")
-			}
+			return errors.New("invalid proposal")
 		}
 
-		switch blinded {
+		switch block.Blinded {
 		case true:
+			var blinded eth2api.VersionedSignedBlindedProposal
+
+			blinded, err = block.ToBlinded()
+			if err != nil {
+				return errors.Wrap(err, "cannot broadcast, expected blinded proposal")
+			}
+
 			err = b.eth2Cl.SubmitBlindedProposal(ctx, &eth2api.SubmitBlindedProposalOpts{
-				Proposal: &blindedBlock.VersionedSignedBlindedProposal,
+				Proposal: &blinded,
 			})
 		default:
 			err = b.eth2Cl.SubmitProposal(ctx, &eth2api.SubmitProposalOpts{
@@ -105,7 +105,7 @@ func (b Broadcaster) Broadcast(ctx context.Context, duty core.Duty, set core.Sig
 			log.Info(ctx, "Successfully submitted block proposal to beacon node",
 				z.Any("delay", b.delayFunc(duty.Slot)),
 				z.Any("pubkey", pubkey),
-				z.Bool("blinded", blinded),
+				z.Bool("blinded", block.Blinded),
 			)
 		}
 

core/eth2signeddata.go

@@ -17,7 +17,6 @@ var (
 	_ Eth2SignedData = VersionedSignedProposal{}
 	_ Eth2SignedData = Attestation{}
 	_ Eth2SignedData = SignedVoluntaryExit{}
-	_ Eth2SignedData = VersionedSignedBlindedProposal{}
 	_ Eth2SignedData = VersionedSignedValidatorRegistration{}
 	_ Eth2SignedData = SignedRandao{}
 	_ Eth2SignedData = BeaconCommitteeSelection{}
@@ -57,21 +56,6 @@ func (p VersionedSignedProposal) Epoch(ctx context.Context, eth2Cl eth2wrap.Clie
 	return eth2util.EpochFromSlot(ctx, eth2Cl, slot)
 }
 
-// Implement Eth2SignedData for VersionedSignedBlindedProposal.
-
-func (VersionedSignedBlindedProposal) DomainName() signing.DomainName {
-	return signing.DomainBeaconProposer
-}
-
-func (p VersionedSignedBlindedProposal) Epoch(ctx context.Context, eth2Cl eth2wrap.Client) (eth2p0.Epoch, error) {
-	slot, err := p.VersionedSignedBlindedProposal.Slot()
-	if err != nil {
-		return 0, err
-	}
-
-	return eth2util.EpochFromSlot(ctx, eth2Cl, slot)
-}
-
 // Implement Eth2SignedData for Attestation.
 
 func (Attestation) DomainName() signing.DomainName {

core/eth2signeddata_test.go

@@ -30,18 +30,6 @@ func TestVerifyEth2SignedData(t *testing.T) {
 			name: "verify beacon block",
 			data: testutil.RandomBellatrixCoreVersionedSignedProposal(),
 		},
-		{
-			name: "verify blinded beacon block bellatrix",
-			data: testutil.RandomBellatrixVersionedSignedBlindedProposal(),
-		},
-		{
-			name: "verify blinded beacon block capella",
-			data: testutil.RandomCapellaVersionedSignedBlindedProposal(),
-		},
-		{
-			name: "verify blinded beacon block deneb",
-			data: testutil.RandomDenebVersionedSignedBlindedProposal(),
-		},
 		{
 			name: "verify randao",
 			data: testutil.RandomCoreSignedRandao(),

core/parsigex/parsigex_test.go

@@ -174,15 +174,17 @@ func TestParSigExVerifier(t *testing.T) {
 
 	t.Run("Verify blinded proposal", func(t *testing.T) {
 		blindedBlock := testutil.RandomDenebVersionedSignedBlindedProposal()
-		blindedBlock.Deneb.Message.Slot = slot
-		sigRoot, err := blindedBlock.Root()
+		blindedBlock.DenebBlinded.Message.Slot = slot
+		sigRoot, err := blindedBlock.DenebBlinded.Message.HashTreeRoot()
 		require.NoError(t, err)
 
 		sigData, err := signing.GetDataRoot(ctx, bmock, signing.DomainBeaconProposer, epoch, sigRoot)
 		require.NoError(t, err)
 
-		blindedBlock.Deneb.Signature = sign(sigData[:])
-		data, err := core.NewPartialVersionedSignedBlindedProposal(&blindedBlock.VersionedSignedBlindedProposal, shareIdx)
+		blindedBlock.DenebBlinded.Signature = sign(sigData[:])
+		eth2apiBlinded, err := blindedBlock.ToBlinded()
+		require.NoError(t, err)
+		data, err := core.NewPartialVersionedSignedBlindedProposal(&eth2apiBlinded, shareIdx)
 		require.NoError(t, err)
 
 		require.NoError(t, verifyFunc(ctx, core.NewProposerDuty(slot), pubkey, data))

core/serialise_test.go

@@ -16,11 +16,15 @@ import (
 
 var coreTypeFuncs = []func() any{
 	func() any { return new(core.VersionedSignedProposal) },
+	func() any {
+		ret := new(core.VersionedSignedProposal)
+		ret.Blinded = true
+
+		return ret
+	},
 	func() any { return new(core.Attestation) },
 	func() any { return new(core.Signature) },
 	func() any { return new(core.SignedVoluntaryExit) },
-	func() any { return new(core.VersionedSignedBlindedProposal) },
-
 	func() any { return new(core.SignedRandao) },
 	func() any { return new(core.BeaconCommitteeSelection) },
 	func() any { return new(core.SignedAggregateAndProof) },

core/sigagg/sigagg_test.go

@@ -490,7 +490,7 @@ func TestSigAgg_DutyBuilderProposer(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			block, err := core.NewVersionedSignedBlindedProposal(test.block)
+			block, err := core.NewVersionedSignedProposalFromBlindedProposal(test.block)
 			require.NoError(t, err)
 
 			msgRoot, err := block.MessageRoot()
@@ -514,7 +514,7 @@ func TestSigAgg_DutyBuilderProposer(t *testing.T) {
 				sig, err := tbls.Sign(secret, msg[:])
 				require.NoError(t, err)
 
-				block, err := core.NewVersionedSignedBlindedProposal(test.block)
+				block, err := core.NewVersionedSignedProposalFromBlindedProposal(test.block)
 				require.NoError(t, err)
 
 				sigCore := tblsconv.SigToCore(sig)