Merge branch 'main' into beacon-state-inconsistent-gwei-usage

berachain · Oct 3, 2024 · f54531f · f54531f
2 parents 0b80e54 + c1c5172
commit f54531f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/mod/consensus-types/pkg/types/block.go b/mod/consensus-types/pkg/types/block.go
@@ -81,17 +81,16 @@ func (b *BeaconBlock) NewFromSSZ(
 	bz []byte,
 	forkVersion uint32,
 ) (*BeaconBlock, error) {
-	var block = new(BeaconBlock)
+	var block *BeaconBlock
 	switch forkVersion {
 	case version.Deneb:
 		block = &BeaconBlock{}
+		return block, block.UnmarshalSSZ(bz)
 	case version.DenebPlus:
 		panic("unsupported fork version")
 	default:
 		return block, ErrForkVersionNotSupported
 	}
-
-	return block, block.UnmarshalSSZ(bz)
 }
 
 /* -------------------------------------------------------------------------- */

diff --git a/mod/consensus-types/pkg/types/withdrawal_credentials.go b/mod/consensus-types/pkg/types/withdrawal_credentials.go
@@ -42,7 +42,7 @@ func NewCredentialsFromExecutionAddress(
 	address common.ExecutionAddress,
 ) WithdrawalCredentials {
 	credentials := WithdrawalCredentials{}
-	credentials[0] = 0x01
+	credentials[0] = EthSecp256k1CredentialPrefix
 	copy(credentials[12:], address[:])
 	return credentials
 }