From 9c4145a9940ccb627ecfc2842bddaa137b387ae7 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Thu, 7 Mar 2024 16:25:26 -0600 Subject: [PATCH] Remove DOMAIN_BLOB_SIDECAR. See https://github.com/ethereum/consensus-specs/pull/3542 --- beacon-chain/rpc/eth/config/handlers_test.go | 5 +---- config/params/config.go | 1 - config/params/mainnet_config.go | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/beacon-chain/rpc/eth/config/handlers_test.go b/beacon-chain/rpc/eth/config/handlers_test.go index 3cd6aac715d9..521ba62d5def 100644 --- a/beacon-chain/rpc/eth/config/handlers_test.go +++ b/beacon-chain/rpc/eth/config/handlers_test.go @@ -156,9 +156,6 @@ func TestGetSpec(t *testing.T) { var dam [4]byte copy(dam[:], []byte{'1', '0', '0', '0'}) config.DomainApplicationMask = dam - var dbs [4]byte - copy(dam[:], []byte{'2', '0', '0', '0'}) - config.DomainBlobSidecar = dbs params.OverrideBeaconConfig(config) @@ -173,7 +170,7 @@ func TestGetSpec(t *testing.T) { data, ok := resp.Data.(map[string]interface{}) require.Equal(t, true, ok) - assert.Equal(t, 130, len(data)) + assert.Equal(t, 129, len(data)) for k, v := range data { switch k { case "CONFIG_NAME": diff --git a/config/params/config.go b/config/params/config.go index c22eee4fbed4..7a140be77cc9 100644 --- a/config/params/config.go +++ b/config/params/config.go @@ -120,7 +120,6 @@ type BeaconChainConfig struct { DomainApplicationMask [4]byte `yaml:"DOMAIN_APPLICATION_MASK" spec:"true"` // DomainApplicationMask defines the BLS signature domain for application mask. DomainApplicationBuilder [4]byte `yaml:"DOMAIN_APPLICATION_BUILDER" spec:"true"` // DomainApplicationBuilder defines the BLS signature domain for application builder. DomainBLSToExecutionChange [4]byte `yaml:"DOMAIN_BLS_TO_EXECUTION_CHANGE" spec:"true"` // DomainBLSToExecutionChange defines the BLS signature domain to change withdrawal addresses to ETH1 prefix - DomainBlobSidecar [4]byte `yaml:"DOMAIN_BLOB_SIDECAR" spec:"true"` // DomainBlobSidecar defines the BLS signature domain for blob sidecar. // Prysm constants. GweiPerEth uint64 // GweiPerEth is the amount of gwei corresponding to 1 eth. diff --git a/config/params/mainnet_config.go b/config/params/mainnet_config.go index 094db8386ad8..48e9060721cc 100644 --- a/config/params/mainnet_config.go +++ b/config/params/mainnet_config.go @@ -166,7 +166,6 @@ var mainnetBeaconConfig = &BeaconChainConfig{ DomainApplicationMask: bytesutil.Uint32ToBytes4(0x00000001), DomainApplicationBuilder: bytesutil.Uint32ToBytes4(0x00000001), DomainBLSToExecutionChange: bytesutil.Uint32ToBytes4(0x0A000000), - DomainBlobSidecar: bytesutil.Uint32ToBytes4(0x0B000000), // Prysm constants. GweiPerEth: 1000000000,