Updates for 1.4.0-beta1

attestantio · Aug 1, 2023 · ae55399 · ae55399
1 parent c80eae9
commit ae55399
Show file tree

Hide file tree

Showing 23 changed files with 342 additions and 342 deletions.
diff --git a/api/v1/deneb/blindedbeaconblock_test.go b/api/v1/deneb/blindedbeaconblock_test.go
diff --git a/api/v1/deneb/blindedbeaconblockbody_test.go b/api/v1/deneb/blindedbeaconblockbody_test.go
diff --git a/api/v1/deneb/blindedblockcontents_test.go b/api/v1/deneb/blindedblockcontents_test.go
diff --git a/api/v1/deneb/blockcontents_test.go b/api/v1/deneb/blockcontents_test.go
diff --git a/api/v1/deneb/signedblindedbeaconblock_test.go b/api/v1/deneb/signedblindedbeaconblock_test.go
diff --git a/api/v1/deneb/signedblindedblockcontents_test.go b/api/v1/deneb/signedblindedblockcontents_test.go
diff --git a/api/v1/deneb/signedblockcontents_test.go b/api/v1/deneb/signedblockcontents_test.go
diff --git a/spec/deneb/beaconblock_test.go b/spec/deneb/beaconblock_test.go
diff --git a/spec/deneb/beaconblockbody.go b/spec/deneb/beaconblockbody.go
@@ -35,7 +35,7 @@ type BeaconBlockBody struct {
 	SyncAggregate         *altair.SyncAggregate
 	ExecutionPayload      *ExecutionPayload
 	BLSToExecutionChanges []*capella.SignedBLSToExecutionChange `ssz-max:"16"`
-	BlobKzgCommitments    []KzgCommitment                       `ssz-max:"6"  ssz-size:"?,48"`
+	BlobKzgCommitments    []KzgCommitment                       `ssz-max:"4096" ssz-size:"?,48"`
 }
 
 // String returns a string version of the structure.

diff --git a/spec/deneb/beaconblockbody_ssz.go b/spec/deneb/beaconblockbody_ssz.go
diff --git a/spec/deneb/beaconblockbody_test.go b/spec/deneb/beaconblockbody_test.go
diff --git a/spec/deneb/beaconstate_test.go b/spec/deneb/beaconstate_test.go
diff --git a/spec/deneb/executionpayload.go b/spec/deneb/executionpayload.go
@@ -40,8 +40,8 @@ type ExecutionPayload struct {
 	BlockHash     phase0.Hash32           `ssz-size:"32"`
 	Transactions  []bellatrix.Transaction `ssz-max:"1048576,1073741824" ssz-size:"?,?"`
 	Withdrawals   []*capella.Withdrawal   `ssz-max:"16"`
-	DataGasUsed   uint64
-	ExcessDataGas uint64
+	BlobGasUsed   uint64
+	ExcessBlobGas uint64
 }
 
 // String returns a string version of the structure.

diff --git a/spec/deneb/executionpayload_json.go b/spec/deneb/executionpayload_json.go
@@ -45,8 +45,8 @@ type executionPayloadJSON struct {
 	BlockHash     phase0.Hash32              `json:"block_hash"`
 	Transactions  []string                   `json:"transactions"`
 	Withdrawals   []*capella.Withdrawal      `json:"withdrawals"`
-	DataGasUsed   string                     `json:"data_gas_used"`
-	ExcessDataGas string                     `json:"excess_data_gas"`
+	BlobGasUsed   string                     `json:"blob_gas_used"`
+	ExcessBlobGas string                     `json:"excess_blob_gas"`
 }
 
 // MarshalJSON implements json.Marshaler.
@@ -77,8 +77,8 @@ func (e *ExecutionPayload) MarshalJSON() ([]byte, error) {
 		BlockHash:     e.BlockHash,
 		Transactions:  transactions,
 		Withdrawals:   e.Withdrawals,
-		DataGasUsed:   fmt.Sprintf("%d", e.DataGasUsed),
-		ExcessDataGas: fmt.Sprintf("%d", e.ExcessDataGas),
+		BlobGasUsed:   fmt.Sprintf("%d", e.BlobGasUsed),
+		ExcessBlobGas: fmt.Sprintf("%d", e.ExcessBlobGas),
 	})
 }
 
@@ -222,17 +222,17 @@ func (e *ExecutionPayload) UnmarshalJSON(input []byte) error {
 		return errors.Wrap(err, "withdrawals")
 	}
 
-	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["data_gas_used"], `"`)), 10, 64)
+	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["blob_gas_used"], `"`)), 10, 64)
 	if err != nil {
-		return errors.Wrap(err, "data_gas_used")
+		return errors.Wrap(err, "blob_gas_used")
 	}
-	e.DataGasUsed = tmpUint
+	e.BlobGasUsed = tmpUint
 
-	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["excess_data_gas"], `"`)), 10, 64)
+	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["excess_blob_gas"], `"`)), 10, 64)
 	if err != nil {
-		return errors.Wrap(err, "excess_data_gas")
+		return errors.Wrap(err, "excess_blob_gas")
 	}
-	e.ExcessDataGas = tmpUint
+	e.ExcessBlobGas = tmpUint
 
 	return nil
 }
diff --git a/spec/deneb/executionpayload_ssz.go b/spec/deneb/executionpayload_ssz.go
diff --git a/spec/deneb/executionpayload_test.go b/spec/deneb/executionpayload_test.go
diff --git a/spec/deneb/executionpayload_yaml.go b/spec/deneb/executionpayload_yaml.go
@@ -40,8 +40,8 @@ type executionPayloadYAML struct {
 	BlockHash     string                `yaml:"block_hash"`
 	Transactions  []string              `yaml:"transactions"`
 	Withdrawals   []*capella.Withdrawal `yaml:"withdrawals"`
-	DataGasUsed   uint64                `yaml:"data_gas_used"`
-	ExcessDataGas uint64                `yaml:"excess_data_gas"`
+	BlobGasUsed   uint64                `yaml:"blob_gas_used"`
+	ExcessBlobGas uint64                `yaml:"excess_blob_gas"`
 }
 
 // MarshalYAML implements yaml.Marshaler.
@@ -72,8 +72,8 @@ func (e *ExecutionPayload) MarshalYAML() ([]byte, error) {
 		BlockHash:     fmt.Sprintf("%#x", e.BlockHash),
 		Transactions:  transactions,
 		Withdrawals:   e.Withdrawals,
-		DataGasUsed:   e.DataGasUsed,
-		ExcessDataGas: e.ExcessDataGas,
+		BlobGasUsed:   e.BlobGasUsed,
+		ExcessBlobGas: e.ExcessBlobGas,
 	}, yaml.Flow(true))
 	if err != nil {
 		return nil, err

diff --git a/spec/deneb/executionpayloadheader.go b/spec/deneb/executionpayloadheader.go
@@ -39,8 +39,8 @@ type ExecutionPayloadHeader struct {
 	BlockHash        phase0.Hash32 `ssz-size:"32"`
 	TransactionsRoot phase0.Root   `ssz-size:"32"`
 	WithdrawalsRoot  phase0.Root   `ssz-size:"32"`
-	DataGasUsed      uint64
-	ExcessDataGas    uint64
+	BlobGasUsed      uint64
+	ExcessBlobGas    uint64
 }
 
 // String returns a string version of the structure.

diff --git a/spec/deneb/executionpayloadheader_json.go b/spec/deneb/executionpayloadheader_json.go
@@ -44,8 +44,8 @@ type executionPayloadHeaderJSON struct {
 	BlockHash        phase0.Hash32              `json:"block_hash"`
 	TransactionsRoot phase0.Root                `json:"transactions_root"`
 	WithdrawalsRoot  phase0.Root                `json:"withdrawals_root"`
-	DataGasUsed      string                     `json:"data_gas_used"`
-	ExcessDataGas    string                     `json:"excess_data_gas"`
+	BlobGasUsed      string                     `json:"blob_gas_used"`
+	ExcessBlobGas    string                     `json:"excess_blob_gas"`
 }
 
 // MarshalJSON implements json.Marshaler.
@@ -71,8 +71,8 @@ func (e *ExecutionPayloadHeader) MarshalJSON() ([]byte, error) {
 		BlockHash:        e.BlockHash,
 		TransactionsRoot: e.TransactionsRoot,
 		WithdrawalsRoot:  e.WithdrawalsRoot,
-		DataGasUsed:      fmt.Sprintf("%d", e.DataGasUsed),
-		ExcessDataGas:    fmt.Sprintf("%d", e.ExcessDataGas),
+		BlobGasUsed:      fmt.Sprintf("%d", e.BlobGasUsed),
+		ExcessBlobGas:    fmt.Sprintf("%d", e.ExcessBlobGas),
 	})
 }
 
@@ -202,17 +202,17 @@ func (e *ExecutionPayloadHeader) UnmarshalJSON(input []byte) error {
 		return errors.Wrap(err, "withdrawals_root")
 	}
 
-	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["data_gas_used"], `"`)), 10, 64)
+	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["blob_gas_used"], `"`)), 10, 64)
 	if err != nil {
-		return errors.Wrap(err, "data_gas_used")
+		return errors.Wrap(err, "blob_gas_used")
 	}
-	e.DataGasUsed = tmpUint
+	e.BlobGasUsed = tmpUint
 
-	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["excess_data_gas"], `"`)), 10, 64)
+	tmpUint, err = strconv.ParseUint(string(bytes.Trim(raw["excess_blob_gas"], `"`)), 10, 64)
 	if err != nil {
-		return errors.Wrap(err, "excess_data_gas")
+		return errors.Wrap(err, "excess_blob_gas")
 	}
-	e.ExcessDataGas = tmpUint
+	e.ExcessBlobGas = tmpUint
 
 	return nil
 }
diff --git a/spec/deneb/executionpayloadheader_ssz.go b/spec/deneb/executionpayloadheader_ssz.go