diff --git a/api/client/builder/client_test.go b/api/client/builder/client_test.go index 80ac1262c8d2..c2552c805133 100644 --- a/api/client/builder/client_test.go +++ b/api/client/builder/client_test.go @@ -844,8 +844,8 @@ func testSignedBlindedBeaconBlockAndBlobsDeneb(t *testing.T) *eth.SignedBlindedB BlockHash: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), WithdrawalsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), - DataGasUsed: 1, - ExcessDataGas: 1, + BlobGasUsed: 1, + ExcessBlobGas: 2, }, }, }, diff --git a/api/client/builder/types.go b/api/client/builder/types.go index c2d48a8edd78..0a6db7cdbda2 100644 --- a/api/client/builder/types.go +++ b/api/client/builder/types.go @@ -1202,8 +1202,8 @@ type ExecutionPayloadHeaderDeneb struct { BlockHash hexutil.Bytes `json:"block_hash"` TransactionsRoot hexutil.Bytes `json:"transactions_root"` WithdrawalsRoot hexutil.Bytes `json:"withdrawals_root"` - DataGasUsed Uint64String `json:"data_gas_used"` // new in deneb - ExcessDataGas Uint64String `json:"excess_data_gas"` // new in deneb + BlobGasUsed Uint64String `json:"blob_gas_used"` // new in deneb + ExcessBlobGas Uint64String `json:"excess_blob_gas"` // new in deneb *v1.ExecutionPayloadHeaderDeneb } @@ -1230,8 +1230,8 @@ func (h *ExecutionPayloadHeaderDeneb) MarshalJSON() ([]byte, error) { BlockHash: h.ExecutionPayloadHeaderDeneb.BlockHash, TransactionsRoot: h.ExecutionPayloadHeaderDeneb.TransactionsRoot, WithdrawalsRoot: h.ExecutionPayloadHeaderDeneb.WithdrawalsRoot, - DataGasUsed: Uint64String(h.ExecutionPayloadHeaderDeneb.DataGasUsed), - ExcessDataGas: Uint64String(h.ExecutionPayloadHeaderDeneb.ExcessDataGas), + BlobGasUsed: Uint64String(h.ExecutionPayloadHeaderDeneb.BlobGasUsed), + ExcessBlobGas: Uint64String(h.ExecutionPayloadHeaderDeneb.ExcessBlobGas), }) } @@ -1267,8 +1267,8 @@ func (h *ExecutionPayloadHeaderDeneb) ToProto() (*v1.ExecutionPayloadHeaderDeneb BlockHash: bytesutil.SafeCopyBytes(h.BlockHash), TransactionsRoot: bytesutil.SafeCopyBytes(h.TransactionsRoot), WithdrawalsRoot: bytesutil.SafeCopyBytes(h.WithdrawalsRoot), - DataGasUsed: uint64(h.DataGasUsed), - ExcessDataGas: uint64(h.ExcessDataGas), + BlobGasUsed: uint64(h.BlobGasUsed), + ExcessBlobGas: uint64(h.ExcessBlobGas), }, nil } @@ -1301,8 +1301,8 @@ type ExecutionPayloadDeneb struct { BlockHash hexutil.Bytes `json:"block_hash"` Transactions []hexutil.Bytes `json:"transactions"` Withdrawals []Withdrawal `json:"withdrawals"` - DataGasUsed Uint64String `json:"data_gas_used"` // new in deneb - ExcessDataGas Uint64String `json:"excess_data_gas"` // new in deneb + BlobGasUsed Uint64String `json:"blob_gas_used"` // new in deneb + ExcessBlobGas Uint64String `json:"excess_blob_gas"` // new in deneb } // BlobsBundle is a field in ExecutionPayloadDenebAndBlobsBundle. @@ -1392,8 +1392,8 @@ func (p *ExecutionPayloadDeneb) ToProto() (*v1.ExecutionPayloadDeneb, error) { BlockHash: bytesutil.SafeCopyBytes(p.BlockHash), Transactions: txs, Withdrawals: withdrawals, - DataGasUsed: uint64(p.DataGasUsed), - ExcessDataGas: uint64(p.ExcessDataGas), + BlobGasUsed: uint64(p.BlobGasUsed), + ExcessBlobGas: uint64(p.ExcessBlobGas), }, nil } diff --git a/api/client/builder/types_test.go b/api/client/builder/types_test.go index 4dac14862a19..a1abe8a6b675 100644 --- a/api/client/builder/types_test.go +++ b/api/client/builder/types_test.go @@ -137,8 +137,8 @@ var testExampleHeaderResponseDeneb = `{ "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "transactions_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "withdrawals_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "data_gas_used": "1", - "excess_data_gas": "1" + "blob_gas_used": "1", + "excess_blob_gas": "2" }, "blinded_blobs_bundle": { "commitments": [ @@ -588,8 +588,8 @@ var testExampleExecutionPayloadDeneb = fmt.Sprintf(`{ "amount": "1" } ], - "data_gas_used": "2", - "excess_data_gas": "3" + "blob_gas_used": "2", + "excess_blob_gas": "3" }, "blobs_bundle": { "commitments": [ @@ -851,13 +851,13 @@ func TestExecutionPayloadResponseDenebUnmarshal(t *testing.T) { }, { expected: "2", - actual: fmt.Sprintf("%d", epr.Data.ExecutionPayload.DataGasUsed), - name: "ExecPayloadResponse.ExecutionPayload.DataGasUsed", + actual: fmt.Sprintf("%d", epr.Data.ExecutionPayload.BlobGasUsed), + name: "ExecPayloadResponse.ExecutionPayload.BlobGasUsed", }, { expected: "3", - actual: fmt.Sprintf("%d", epr.Data.ExecutionPayload.ExcessDataGas), - name: "ExecPayloadResponse.ExecutionPayload.ExcessDataGas", + actual: fmt.Sprintf("%d", epr.Data.ExecutionPayload.ExcessBlobGas), + name: "ExecPayloadResponse.ExecutionPayload.ExcessBlobGas", }, } for _, c := range cases { @@ -873,8 +873,8 @@ func TestExecutionPayloadResponseDenebUnmarshal(t *testing.T) { assert.Equal(t, uint64(1), w.ValidatorIndex.Uint64()) assert.DeepEqual(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943", w.Address.String()) assert.Equal(t, uint64(1), w.Amount.Uint64()) - assert.Equal(t, uint64(2), uint64(epr.Data.ExecutionPayload.DataGasUsed)) - assert.Equal(t, uint64(3), uint64(epr.Data.ExecutionPayload.ExcessDataGas)) + assert.Equal(t, uint64(2), uint64(epr.Data.ExecutionPayload.BlobGasUsed)) + assert.Equal(t, uint64(3), uint64(epr.Data.ExecutionPayload.ExcessBlobGas)) } func TestExecutionPayloadResponseToProto(t *testing.T) { @@ -1038,8 +1038,8 @@ func TestExecutionPayloadResponseDenebToProto(t *testing.T) { Amount: 1, }, }, - DataGasUsed: 2, - ExcessDataGas: 3, + BlobGasUsed: 2, + ExcessBlobGas: 3, } require.DeepEqual(t, expected, p) commitment, err := hexutil.Decode("0x8dab030c51e16e84be9caab84ee3d0b8bbec1db4a0e4de76439da8424d9b957370a10a78851f97e4b54d2ce1ab0d686f") @@ -1312,8 +1312,8 @@ func pbExecutionPayloadHeaderDeneb(t *testing.T) *v1.ExecutionPayloadHeaderDeneb BlockHash: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), WithdrawalsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), - DataGasUsed: 1, - ExcessDataGas: 1, + BlobGasUsed: 1, + ExcessBlobGas: 2, } } @@ -1343,7 +1343,7 @@ func TestExecutionPayloadHeaderDeneb_MarshalJSON(t *testing.T) { } b, err := json.Marshal(h) require.NoError(t, err) - expected := `{"parent_hash":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","fee_recipient":"0xabcf8e0d4e9587369b2301d0790347320302cc09","state_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","receipts_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","logs_bloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","prev_randao":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","block_number":"1","gas_limit":"1","gas_used":"1","timestamp":"1","extra_data":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","base_fee_per_gas":"452312848583266388373324160190187140051835877600158453279131187530910662656","block_hash":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","transactions_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","withdrawals_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","data_gas_used":"1","excess_data_gas":"1"}` + expected := `{"parent_hash":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","fee_recipient":"0xabcf8e0d4e9587369b2301d0790347320302cc09","state_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","receipts_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","logs_bloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","prev_randao":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","block_number":"1","gas_limit":"1","gas_used":"1","timestamp":"1","extra_data":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","base_fee_per_gas":"452312848583266388373324160190187140051835877600158453279131187530910662656","block_hash":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","transactions_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","withdrawals_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2","blob_gas_used":"1","excess_blob_gas":"2"}` require.Equal(t, expected, string(b)) } diff --git a/beacon-chain/core/deneb/upgrade.go b/beacon-chain/core/deneb/upgrade.go index 6112d446266f..269bda7bc8ad 100644 --- a/beacon-chain/core/deneb/upgrade.go +++ b/beacon-chain/core/deneb/upgrade.go @@ -101,8 +101,8 @@ func UpgradeToDeneb(state state.BeaconState) (state.BeaconState, error) { ExtraData: payloadHeader.ExtraData(), BaseFeePerGas: payloadHeader.BaseFeePerGas(), BlockHash: payloadHeader.BlockHash(), - ExcessDataGas: 0, - DataGasUsed: 0, + ExcessBlobGas: 0, + BlobGasUsed: 0, TransactionsRoot: txRoot, WithdrawalsRoot: wdRoot, }, diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go index 526972ac37e1..7188a1e11348 100644 --- a/beacon-chain/execution/engine_client.go +++ b/beacon-chain/execution/engine_client.go @@ -805,13 +805,13 @@ func fullPayloadFromExecutionBlock( Withdrawals: block.Withdrawals, }, 0) // We can't get the block value and don't care about the block value for this instance case version.Deneb: - edg, err := header.ExcessDataGas() + ebg, err := header.ExcessBlobGas() if err != nil { - return nil, errors.Wrap(err, "unable to extract ExcessDataGas attribute from excution payload header") + return nil, errors.Wrap(err, "unable to extract ExcessBlobGas attribute from excution payload header") } - dgu, err := header.DataGasUsed() + bgu, err := header.BlobGasUsed() if err != nil { - return nil, errors.Wrap(err, "unable to extract DataGasUsed attribute from excution payload header") + return nil, errors.Wrap(err, "unable to extract BlobGasUsed attribute from excution payload header") } return blocks.WrappedExecutionPayloadDeneb( &pb.ExecutionPayloadDeneb{ @@ -830,8 +830,8 @@ func fullPayloadFromExecutionBlock( BlockHash: blockHash[:], Transactions: txs, Withdrawals: block.Withdrawals, - ExcessDataGas: edg, - DataGasUsed: dgu, + ExcessBlobGas: ebg, + BlobGasUsed: bgu, }, 0) // We can't get the block value and don't care about the block value for this instance default: return nil, fmt.Errorf("unknown execution block version %d", block.Version) @@ -882,13 +882,13 @@ func fullPayloadFromPayloadBody( Withdrawals: body.Withdrawals, }, 0) // We can't get the block value and don't care about the block value for this instance case version.Deneb: - edg, err := header.ExcessDataGas() + ebg, err := header.ExcessBlobGas() if err != nil { - return nil, errors.Wrap(err, "unable to extract ExcessDataGas attribute from excution payload header") + return nil, errors.Wrap(err, "unable to extract ExcessBlobGas attribute from excution payload header") } - dgu, err := header.DataGasUsed() + bgu, err := header.BlobGasUsed() if err != nil { - return nil, errors.Wrap(err, "unable to extract DataGasUsed attribute from excution payload header") + return nil, errors.Wrap(err, "unable to extract BlobGasUsed attribute from excution payload header") } return blocks.WrappedExecutionPayloadDeneb( &pb.ExecutionPayloadDeneb{ @@ -907,8 +907,8 @@ func fullPayloadFromPayloadBody( BlockHash: header.BlockHash(), Transactions: body.Transactions, Withdrawals: body.Withdrawals, - ExcessDataGas: edg, - DataGasUsed: dgu, + ExcessBlobGas: ebg, + BlobGasUsed: bgu, }, 0) // We can't get the block value and don't care about the block value for this instance default: return nil, fmt.Errorf("unknown execution block version for payload %d", bVersion) diff --git a/beacon-chain/execution/engine_client_test.go b/beacon-chain/execution/engine_client_test.go index 06af6b3f351e..65e6b2e4a4c3 100644 --- a/beacon-chain/execution/engine_client_test.go +++ b/beacon-chain/execution/engine_client_test.go @@ -308,10 +308,10 @@ func TestClient_HTTP(t *testing.T) { resp, blobsBundle, override, err := client.GetPayload(ctx, payloadId, 2*params.BeaconConfig().SlotsPerEpoch) require.NoError(t, err) require.Equal(t, true, override) - g, err := resp.ExcessDataGas() + g, err := resp.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, uint64(3), g) - g, err = resp.DataGasUsed() + g, err = resp.BlobGasUsed() require.NoError(t, err) require.DeepEqual(t, uint64(2), g) @@ -1438,8 +1438,8 @@ func fixtures() map[string]interface{} { BlockHash: foo[:], Transactions: [][]byte{foo[:]}, Withdrawals: []*pb.Withdrawal{}, - DataGasUsed: 2, - ExcessDataGas: 3, + BlobGasUsed: 2, + ExcessBlobGas: 3, } hexUint := hexutil.Uint64(1) executionPayloadWithValueFixtureCapella := &pb.GetPayloadV2ResponseJson{ @@ -1461,8 +1461,8 @@ func fixtures() map[string]interface{} { }, BlockValue: "0x11fffffffff", } - dgu := hexutil.Uint64(2) - edg := hexutil.Uint64(3) + bgu := hexutil.Uint64(2) + ebg := hexutil.Uint64(3) executionPayloadWithValueFixtureDeneb := &pb.GetPayloadV3ResponseJson{ ShouldOverrideBuilder: true, ExecutionPayload: &pb.ExecutionPayloadDenebJSON{ @@ -1480,8 +1480,8 @@ func fixtures() map[string]interface{} { GasLimit: &hexUint, GasUsed: &hexUint, Timestamp: &hexUint, - DataGasUsed: &dgu, - ExcessDataGas: &edg, + BlobGasUsed: &bgu, + ExcessBlobGas: &ebg, }, BlockValue: "0x11fffffffff", BlobsBundle: &pb.BlobBundleJSON{ diff --git a/beacon-chain/rpc/apimiddleware/structs.go b/beacon-chain/rpc/apimiddleware/structs.go index 58e6736e8d6f..58238013f471 100644 --- a/beacon-chain/rpc/apimiddleware/structs.go +++ b/beacon-chain/rpc/apimiddleware/structs.go @@ -711,8 +711,8 @@ type ExecutionPayloadDenebJson struct { TimeStamp string `json:"timestamp"` ExtraData string `json:"extra_data" hex:"true"` BaseFeePerGas string `json:"base_fee_per_gas" uint256:"true"` - DataGasUsed string `json:"data_gas_used"` // new in deneb - ExcessDataGas string `json:"excess_data_gas"` // new in deneb + BlobGasUsed string `json:"blob_gas_used"` // new in deneb + ExcessBlobGas string `json:"excess_blob_gas"` // new in deneb BlockHash string `json:"block_hash" hex:"true"` Transactions []string `json:"transactions" hex:"true"` Withdrawals []*WithdrawalJson `json:"withdrawals"` @@ -766,8 +766,8 @@ type ExecutionPayloadHeaderDenebJson struct { TimeStamp string `json:"timestamp"` ExtraData string `json:"extra_data" hex:"true"` BaseFeePerGas string `json:"base_fee_per_gas" uint256:"true"` - DataGasUsed string `json:"data_gas_used"` // new in deneb - ExcessDataGas string `json:"excess_data_gas"` // new in deneb + BlobGasUsed string `json:"blob_gas_used"` // new in deneb + ExcessBlobGas string `json:"excess_blob_gas"` // new in deneb BlockHash string `json:"block_hash" hex:"true"` TransactionsRoot string `json:"transactions_root" hex:"true"` WithdrawalsRoot string `json:"withdrawals_root" hex:"true"` diff --git a/beacon-chain/rpc/eth/beacon/handlers_test.go b/beacon-chain/rpc/eth/beacon/handlers_test.go index 7d1d19a55b3d..f16bf35a2271 100644 --- a/beacon-chain/rpc/eth/beacon/handlers_test.go +++ b/beacon-chain/rpc/eth/beacon/handlers_test.go @@ -1738,8 +1738,8 @@ const ( "extra_data": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "base_fee_per_gas": "1", "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "data_gas_used": "1", - "excess_data_gas": "2", + "blob_gas_used": "1", + "excess_blob_gas": "2", "transactions_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "withdrawals_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2" }, @@ -1946,8 +1946,8 @@ var denebBlockContents = `{ "extra_data": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "base_fee_per_gas": "1", "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "data_gas_used": "1", - "excess_data_gas": "2", + "blob_gas_used": "1", + "excess_blob_gas": "2", "transactions": [ "0x02f878831469668303f51d843b9ac9f9843b9aca0082520894c93269b73096998db66be0441e836d873535cb9c8894a19041886f000080c001a031cc29234036afbf9a1fb9476b463367cb1f957ac0b919b69bbc798436e604aaa018c4e9c3914eb27aadd0b91e10b18655739fcf8c1fc398763a9f1beecb8ddc86" ], @@ -1982,7 +1982,7 @@ var denebBlockContents = `{ "slot":"1", "block_parent_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "proposer_index":"1", - "blob":"` + hexutil.Encode(make([]byte, 131072)) + `", + "blob":"` + hexutil.Encode(make([]byte, 131072)) + `" , "kzg_commitment":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8000", "kzg_proof":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8000" }, diff --git a/beacon-chain/rpc/eth/beacon/structs.go b/beacon-chain/rpc/eth/beacon/structs.go index 6671f97dce06..6d307fa4cb24 100644 --- a/beacon-chain/rpc/eth/beacon/structs.go +++ b/beacon-chain/rpc/eth/beacon/structs.go @@ -215,8 +215,8 @@ type ExecutionPayloadDeneb struct { TimeStamp string `json:"timestamp" validate:"required"` ExtraData string `json:"extra_data" validate:"required"` BaseFeePerGas string `json:"base_fee_per_gas" validate:"required"` - DataGasUsed string `json:"data_gas_used" validate:"required"` // new in deneb - ExcessDataGas string `json:"excess_data_gas" validate:"required"` // new in deneb + BlobGasUsed string `json:"blob_gas_used" validate:"required"` // new in deneb + ExcessBlobGas string `json:"excess_blob_gas" validate:"required"` // new in deneb BlockHash string `json:"block_hash" validate:"required"` Transactions []string `json:"transactions" validate:"required"` Withdrawals []*Withdrawal `json:"withdrawals" validate:"required"` @@ -456,8 +456,8 @@ type ExecutionPayloadHeaderDeneb struct { Timestamp string `json:"timestamp" validate:"required"` ExtraData string `json:"extra_data" validate:"required"` BaseFeePerGas string `json:"base_fee_per_gas" validate:"required"` - DataGasUsed string `json:"data_gas_used" validate:"required"` // new in deneb - ExcessDataGas string `json:"excess_data_gas" validate:"required"` // new in deneb + BlobGasUsed string `json:"blob_gas_used" validate:"required"` // new in deneb + ExcessBlobGas string `json:"excess_blob_gas" validate:"required"` // new in deneb BlockHash string `json:"block_hash" validate:"required"` TransactionsRoot string `json:"transactions_root" validate:"required"` WithdrawalsRoot string `json:"withdrawals_root" validate:"required"` @@ -1584,13 +1584,13 @@ func convertToSignedDenebBlock(signedBlock *SignedBeaconBlockDeneb) (*eth.Signed if err != nil { return nil, err } - payloadDataGasUsed, err := strconv.ParseUint(signedBlock.Message.Body.ExecutionPayload.DataGasUsed, 10, 64) + payloadBlobGasUsed, err := strconv.ParseUint(signedBlock.Message.Body.ExecutionPayload.BlobGasUsed, 10, 64) if err != nil { - return nil, errors.Wrap(err, "could not decode signedBlock.Message.Body.ExecutionPayload.DataGasUsed") + return nil, errors.Wrap(err, "could not decode signedBlock.Message.Body.ExecutionPayload.BlobGasUsed") } - payloadExcessDataGas, err := strconv.ParseUint(signedBlock.Message.Body.ExecutionPayload.ExcessDataGas, 10, 64) + payloadExcessBlobGas, err := strconv.ParseUint(signedBlock.Message.Body.ExecutionPayload.ExcessBlobGas, 10, 64) if err != nil { - return nil, errors.Wrap(err, "could not decode signedBlock.Message.Body.ExecutionPayload.ExcessDataGas") + return nil, errors.Wrap(err, "could not decode signedBlock.Message.Body.ExecutionPayload.ExcessBlobGas") } return ð.SignedBeaconBlockDeneb{ Block: ð.BeaconBlockDeneb{ @@ -1631,8 +1631,8 @@ func convertToSignedDenebBlock(signedBlock *SignedBeaconBlockDeneb) (*eth.Signed BlockHash: payloadBlockHash, Transactions: txs, Withdrawals: withdrawals, - DataGasUsed: payloadDataGasUsed, - ExcessDataGas: payloadExcessDataGas, + BlobGasUsed: payloadBlobGasUsed, + ExcessBlobGas: payloadExcessBlobGas, }, BlsToExecutionChanges: blsChanges, }, @@ -1856,13 +1856,13 @@ func convertToSignedBlindedDenebBlock(signedBlindedBlock *SignedBlindedBeaconBlo if err != nil { return nil, err } - payloadDataGasUsed, err := strconv.ParseUint(signedBlindedBlock.Message.Body.ExecutionPayloadHeader.DataGasUsed, 10, 64) + payloadBlobGasUsed, err := strconv.ParseUint(signedBlindedBlock.Message.Body.ExecutionPayloadHeader.BlobGasUsed, 10, 64) if err != nil { - return nil, errors.Wrap(err, "could not decode signedBlindedBlock.Message.Body.ExecutionPayload.DataGasUsed") + return nil, errors.Wrap(err, "could not decode signedBlindedBlock.Message.Body.ExecutionPayload.BlobGasUsed") } - payloadExcessDataGas, err := strconv.ParseUint(signedBlindedBlock.Message.Body.ExecutionPayloadHeader.ExcessDataGas, 10, 64) + payloadExcessBlobGas, err := strconv.ParseUint(signedBlindedBlock.Message.Body.ExecutionPayloadHeader.ExcessBlobGas, 10, 64) if err != nil { - return nil, errors.Wrap(err, "could not decode signedBlindedBlock.Message.Body.ExecutionPayload.ExcessDataGas") + return nil, errors.Wrap(err, "could not decode signedBlindedBlock.Message.Body.ExecutionPayload.ExcessBlobGas") } return ð.SignedBlindedBeaconBlockDeneb{ Block: ð.BlindedBeaconBlockDeneb{ @@ -1903,8 +1903,8 @@ func convertToSignedBlindedDenebBlock(signedBlindedBlock *SignedBlindedBeaconBlo BlockHash: payloadBlockHash, TransactionsRoot: payloadTxsRoot, WithdrawalsRoot: payloadWithdrawalsRoot, - DataGasUsed: payloadDataGasUsed, - ExcessDataGas: payloadExcessDataGas, + BlobGasUsed: payloadBlobGasUsed, + ExcessBlobGas: payloadExcessBlobGas, }, BlsToExecutionChanges: blsChanges, }, diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go index 3a58d1e65913..71a32e35ae08 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go @@ -320,8 +320,8 @@ func TestServer_setExecutionData(t *testing.T) { Timestamp: uint64(ti.Unix()), BlockNumber: 2, WithdrawalsRoot: wr[:], - DataGasUsed: 123, - ExcessDataGas: 456, + BlobGasUsed: 123, + ExcessBlobGas: 456, }, Pubkey: sk.PublicKey().Marshal(), Value: bytesutil.PadTo(builderValue, 32), diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go index 632343afbf61..931932ad0988 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -509,8 +509,8 @@ func TestServer_GetBeaconBlock_Deneb(t *testing.T) { GasLimit: 2, GasUsed: 3, Timestamp: uint64(timeStamp.Unix()), - DataGasUsed: 4, - ExcessDataGas: 5, + BlobGasUsed: 4, + ExcessBlobGas: 5, } kc := make([][]byte, 0) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder_test.go index 4700c939ca1c..91ea556d6134 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder_test.go @@ -23,8 +23,8 @@ func Test_unblindBuilderBlock(t *testing.T) { pCapella.GasLimit = 123 pDeneb := emptyPayloadDeneb() pDeneb.GasLimit = 123 - pDeneb.ExcessDataGas = 456 - pDeneb.DataGasUsed = 789 + pDeneb.ExcessBlobGas = 456 + pDeneb.BlobGasUsed = 789 tests := []struct { name string @@ -312,8 +312,8 @@ func Test_unblindBuilderBlock(t *testing.T) { TransactionsRoot: txRoot[:], WithdrawalsRoot: withdrawalsRoot[:], GasLimit: 123, - ExcessDataGas: 456, - DataGasUsed: 789, + ExcessBlobGas: 456, + BlobGasUsed: 789, } wb, err := blocks.NewSignedBeaconBlock(b) require.NoError(t, err) diff --git a/beacon-chain/sync/blobs_test.go b/beacon-chain/sync/blobs_test.go index 07a8dba04ace..f2aa6935efad 100644 --- a/beacon-chain/sync/blobs_test.go +++ b/beacon-chain/sync/blobs_test.go @@ -84,7 +84,8 @@ func generateTestBlockWithSidecars(t *testing.T, parent [32]byte, slot types.Slo Timestamp: 0, ExtraData: make([]byte, 0), BaseFeePerGas: bytesutil.PadTo([]byte("baseFeePerGas"), fieldparams.RootLength), - ExcessDataGas: 0, + ExcessBlobGas: 0, + BlobGasUsed: 0, BlockHash: blockHash[:], Transactions: encodedBinaryTxs, } diff --git a/consensus-types/blocks/execution.go b/consensus-types/blocks/execution.go index 517fae4deea1..7785b3e40274 100644 --- a/consensus-types/blocks/execution.go +++ b/consensus-types/blocks/execution.go @@ -162,13 +162,13 @@ func (executionPayload) WithdrawalsRoot() ([]byte, error) { return nil, consensus_types.ErrUnsupportedField } -// DataGasUsed -- -func (e executionPayload) DataGasUsed() (uint64, error) { +// BlobGasUsed -- +func (e executionPayload) BlobGasUsed() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } -// ExcessDataGas -- -func (e executionPayload) ExcessDataGas() (uint64, error) { +// ExcessBlobGas -- +func (e executionPayload) ExcessBlobGas() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } @@ -333,13 +333,13 @@ func (executionPayloadHeader) WithdrawalsRoot() ([]byte, error) { return nil, consensus_types.ErrUnsupportedField } -// DataGasUsed -- -func (e executionPayloadHeader) DataGasUsed() (uint64, error) { +// BlobGasUsed -- +func (e executionPayloadHeader) BlobGasUsed() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } -// ExcessDataGas -- -func (e executionPayloadHeader) ExcessDataGas() (uint64, error) { +// ExcessBlobGas -- +func (e executionPayloadHeader) ExcessBlobGas() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } @@ -533,13 +533,13 @@ func (executionPayloadCapella) WithdrawalsRoot() ([]byte, error) { return nil, consensus_types.ErrUnsupportedField } -// DataGasUsed -- -func (e executionPayloadCapella) DataGasUsed() (uint64, error) { +// BlobGasUsed -- +func (e executionPayloadCapella) BlobGasUsed() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } -// ExcessDataGas -- -func (e executionPayloadCapella) ExcessDataGas() (uint64, error) { +// ExcessBlobGas -- +func (e executionPayloadCapella) ExcessBlobGas() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } @@ -705,13 +705,13 @@ func (e executionPayloadHeaderCapella) WithdrawalsRoot() ([]byte, error) { return e.p.WithdrawalsRoot, nil } -// DataGasUsed -- -func (e executionPayloadHeaderCapella) DataGasUsed() (uint64, error) { +// BlobGasUsed -- +func (e executionPayloadHeaderCapella) BlobGasUsed() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } -// ExcessDataGas -- -func (e executionPayloadHeaderCapella) ExcessDataGas() (uint64, error) { +// ExcessBlobGas -- +func (e executionPayloadHeaderCapella) ExcessBlobGas() (uint64, error) { return 0, consensus_types.ErrUnsupportedField } @@ -786,11 +786,11 @@ func PayloadToHeaderDeneb(payload interfaces.ExecutionData) (*enginev1.Execution if err != nil { return nil, err } - dataGasUsed, err := payload.DataGasUsed() + blobGasUsed, err := payload.BlobGasUsed() if err != nil { return nil, err } - excessDataGas, err := payload.ExcessDataGas() + excessBlobGas, err := payload.ExcessBlobGas() if err != nil { return nil, err } @@ -811,8 +811,8 @@ func PayloadToHeaderDeneb(payload interfaces.ExecutionData) (*enginev1.Execution BlockHash: bytesutil.SafeCopyBytes(payload.BlockHash()), TransactionsRoot: txRoot[:], WithdrawalsRoot: withdrawalsRoot[:], - DataGasUsed: dataGasUsed, - ExcessDataGas: excessDataGas, + BlobGasUsed: blobGasUsed, + ExcessBlobGas: excessBlobGas, }, nil } @@ -1015,12 +1015,14 @@ func (e executionPayloadHeaderDeneb) WithdrawalsRoot() ([]byte, error) { return e.p.WithdrawalsRoot, nil } -func (e executionPayloadHeaderDeneb) DataGasUsed() (uint64, error) { - return e.p.DataGasUsed, nil +// BlobGasUsed +func (e executionPayloadHeaderDeneb) BlobGasUsed() (uint64, error) { + return e.p.BlobGasUsed, nil } -func (e executionPayloadHeaderDeneb) ExcessDataGas() (uint64, error) { - return e.p.ExcessDataGas, nil +// ExcessBlobGas +func (e executionPayloadHeaderDeneb) ExcessBlobGas() (uint64, error) { + return e.p.ExcessBlobGas, nil } // PbBellatrix -- @@ -1184,12 +1186,12 @@ func (e executionPayloadDeneb) WithdrawalsRoot() ([]byte, error) { return nil, consensus_types.ErrUnsupportedField } -func (e executionPayloadDeneb) DataGasUsed() (uint64, error) { - return e.p.DataGasUsed, nil +func (e executionPayloadDeneb) BlobGasUsed() (uint64, error) { + return e.p.BlobGasUsed, nil } -func (e executionPayloadDeneb) ExcessDataGas() (uint64, error) { - return e.p.ExcessDataGas, nil +func (e executionPayloadDeneb) ExcessBlobGas() (uint64, error) { + return e.p.ExcessBlobGas, nil } // PbBellatrix -- diff --git a/consensus-types/blocks/execution_test.go b/consensus-types/blocks/execution_test.go index 67d1c233f839..5f0788e5f3f7 100644 --- a/consensus-types/blocks/execution_test.go +++ b/consensus-types/blocks/execution_test.go @@ -264,8 +264,8 @@ func TestWrapExecutionPayloadDeneb(t *testing.T) { Address: []byte("executionaddress"), Amount: 77, }}, - DataGasUsed: 88, - ExcessDataGas: 99, + BlobGasUsed: 88, + ExcessBlobGas: 99, } payload, err := blocks.WrappedExecutionPayloadDeneb(data, 420) require.NoError(t, err) @@ -273,11 +273,11 @@ func TestWrapExecutionPayloadDeneb(t *testing.T) { require.NoError(t, err) assert.Equal(t, uint64(420), v) - g, err := payload.DataGasUsed() + g, err := payload.BlobGasUsed() require.NoError(t, err) require.DeepEqual(t, uint64(88), g) - g, err = payload.ExcessDataGas() + g, err = payload.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, uint64(99), g) } @@ -299,8 +299,8 @@ func TestWrapExecutionPayloadHeaderDeneb(t *testing.T) { BlockHash: []byte("blockhash"), TransactionsRoot: []byte("transactionsroot"), WithdrawalsRoot: []byte("withdrawalsroot"), - DataGasUsed: 88, - ExcessDataGas: 99, + BlobGasUsed: 88, + ExcessBlobGas: 99, } payload, err := blocks.WrappedExecutionPayloadHeaderDeneb(data, 10) require.NoError(t, err) @@ -309,11 +309,11 @@ func TestWrapExecutionPayloadHeaderDeneb(t *testing.T) { require.NoError(t, err) assert.Equal(t, uint64(10), v) - g, err := payload.DataGasUsed() + g, err := payload.BlobGasUsed() require.NoError(t, err) require.DeepEqual(t, uint64(88), g) - g, err = payload.ExcessDataGas() + g, err = payload.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, uint64(99), g) } @@ -453,8 +453,8 @@ func createWrappedPayloadDeneb(t testing.TB) interfaces.ExecutionData { BlockHash: make([]byte, fieldparams.RootLength), Transactions: make([][]byte, 0), Withdrawals: make([]*enginev1.Withdrawal, 0), - DataGasUsed: 0, - ExcessDataGas: 0, + BlobGasUsed: 0, + ExcessBlobGas: 0, }, 0) require.NoError(t, err) return payload @@ -477,8 +477,8 @@ func createWrappedPayloadHeaderDeneb(t testing.TB) interfaces.ExecutionData { BlockHash: make([]byte, fieldparams.RootLength), TransactionsRoot: make([]byte, fieldparams.RootLength), WithdrawalsRoot: make([]byte, fieldparams.RootLength), - DataGasUsed: 0, - ExcessDataGas: 0, + BlobGasUsed: 0, + ExcessBlobGas: 0, }, 0) require.NoError(t, err) return payload diff --git a/consensus-types/blocks/factory_test.go b/consensus-types/blocks/factory_test.go index 55cde7ef7b6c..93c91161a54d 100644 --- a/consensus-types/blocks/factory_test.go +++ b/consensus-types/blocks/factory_test.go @@ -512,7 +512,8 @@ func TestBuildSignedBeaconBlockFromExecutionPayload(t *testing.T) { BaseFeePerGas: make([]byte, fieldparams.RootLength), BlockHash: make([]byte, fieldparams.RootLength), Transactions: make([][]byte, 0), - ExcessDataGas: 123, + ExcessBlobGas: 123, + BlobGasUsed: 321, } wrapped, err := WrappedExecutionPayloadDeneb(payload, 123) require.NoError(t, err) @@ -531,6 +532,7 @@ func TestBuildSignedBeaconBlockFromExecutionPayload(t *testing.T) { got, err := builtBlock.Block().Body().Execution() require.NoError(t, err) require.DeepEqual(t, payload, got.Proto()) - require.DeepEqual(t, uint64(123), payload.ExcessDataGas) + require.DeepEqual(t, uint64(123), payload.ExcessBlobGas) + require.DeepEqual(t, uint64(321), payload.BlobGasUsed) }) } diff --git a/consensus-types/blocks/getters_test.go b/consensus-types/blocks/getters_test.go index e0ad7dc452b5..2132206f6f5a 100644 --- a/consensus-types/blocks/getters_test.go +++ b/consensus-types/blocks/getters_test.go @@ -213,8 +213,8 @@ func Test_BeaconBlock_Copy(t *testing.T) { assert.NotEqual(t, cp, b) assert.NotEqual(t, cp.Body(), bb) - payload := &pb.ExecutionPayloadDeneb{ExcessDataGas: 123} - header := &pb.ExecutionPayloadHeaderDeneb{ExcessDataGas: 223} + payload := &pb.ExecutionPayloadDeneb{ExcessBlobGas: 123} + header := &pb.ExecutionPayloadHeaderDeneb{ExcessBlobGas: 223} payloadInterface, err := WrappedExecutionPayloadDeneb(payload, 123) require.NoError(t, err) headerInterface, err := WrappedExecutionPayloadHeaderDeneb(header, 123) @@ -232,7 +232,7 @@ func Test_BeaconBlock_Copy(t *testing.T) { assert.NotEqual(t, cp.Body(), bb) e, err := cp.Body().Execution() require.NoError(t, err) - gas, err := e.ExcessDataGas() + gas, err := e.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, gas, uint64(123)) @@ -243,7 +243,7 @@ func Test_BeaconBlock_Copy(t *testing.T) { assert.NotEqual(t, cp.Body(), bb) e, err = cp.Body().Execution() require.NoError(t, err) - gas, err = e.ExcessDataGas() + gas, err = e.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, gas, uint64(223)) } @@ -442,7 +442,7 @@ func Test_BeaconBlockBody_Execution(t *testing.T) { require.NoError(t, err) assert.DeepEqual(t, result, eCapellaHeader) - executionDeneb := &pb.ExecutionPayloadDeneb{BlockNumber: 1, ExcessDataGas: 123} + executionDeneb := &pb.ExecutionPayloadDeneb{BlockNumber: 1, ExcessBlobGas: 123} eDeneb, err := WrappedExecutionPayloadDeneb(executionDeneb, 0) require.NoError(t, err) bb = &SignedBeaconBlock{version: version.Deneb, block: &BeaconBlock{body: &BeaconBlockBody{version: version.Deneb}}} @@ -450,11 +450,11 @@ func Test_BeaconBlockBody_Execution(t *testing.T) { result, err = bb.Block().Body().Execution() require.NoError(t, err) assert.DeepEqual(t, result, eDeneb) - gas, err := eDeneb.ExcessDataGas() + gas, err := eDeneb.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, gas, uint64(123)) - executionDenebHeader := &pb.ExecutionPayloadHeaderDeneb{BlockNumber: 1, ExcessDataGas: 223} + executionDenebHeader := &pb.ExecutionPayloadHeaderDeneb{BlockNumber: 1, ExcessBlobGas: 223} eDenebHeader, err := WrappedExecutionPayloadHeaderDeneb(executionDenebHeader, 0) require.NoError(t, err) bb = &SignedBeaconBlock{version: version.Deneb, block: &BeaconBlock{version: version.Deneb, body: &BeaconBlockBody{version: version.Deneb, isBlinded: true}}} @@ -462,7 +462,7 @@ func Test_BeaconBlockBody_Execution(t *testing.T) { result, err = bb.Block().Body().Execution() require.NoError(t, err) assert.DeepEqual(t, result, eDenebHeader) - gas, err = eDenebHeader.ExcessDataGas() + gas, err = eDenebHeader.ExcessBlobGas() require.NoError(t, err) require.DeepEqual(t, gas, uint64(223)) } diff --git a/consensus-types/blocks/proto_test.go b/consensus-types/blocks/proto_test.go index 0ce7b403ca95..afb621f21511 100644 --- a/consensus-types/blocks/proto_test.go +++ b/consensus-types/blocks/proto_test.go @@ -1662,8 +1662,8 @@ func getFields() fields { Amount: 128, }, }, - DataGasUsed: 128, - ExcessDataGas: 128, + BlobGasUsed: 128, + ExcessBlobGas: 128, } execPayloadHeaderDeneb := &enginev1.ExecutionPayloadHeaderDeneb{ ParentHash: root[:], @@ -1681,8 +1681,8 @@ func getFields() fields { BlockHash: root[:], TransactionsRoot: root[:], WithdrawalsRoot: root[:], - DataGasUsed: 128, - ExcessDataGas: 128, + BlobGasUsed: 128, + ExcessBlobGas: 128, } kzgCommitments := [][]byte{ diff --git a/consensus-types/interfaces/beacon_block.go b/consensus-types/interfaces/beacon_block.go index 94731b2f9c07..395f1df0f637 100644 --- a/consensus-types/interfaces/beacon_block.go +++ b/consensus-types/interfaces/beacon_block.go @@ -118,8 +118,8 @@ type ExecutionData interface { Timestamp() uint64 ExtraData() []byte BaseFeePerGas() []byte - DataGasUsed() (uint64, error) - ExcessDataGas() (uint64, error) + BlobGasUsed() (uint64, error) + ExcessBlobGas() (uint64, error) BlockHash() []byte Transactions() ([][]byte, error) TransactionsRoot() ([]byte, error) diff --git a/deps.bzl b/deps.bzl index 35e7c1a7488e..78ed1d2108e5 100644 --- a/deps.bzl +++ b/deps.bzl @@ -692,8 +692,8 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:6IrxszG5G+O7zhtkWxq6+unVvnrm1fqV2Pe+T95DUzw=", - version = "v0.0.0-20220523130400-f11357ae11c7", + sum = "h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0=", + version = "v0.0.0-20230601170251-1830d0757c80", ) go_repository( @@ -1000,8 +1000,8 @@ def prysm_deps(): "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], replace = "github.com/MariusVanDerWijden/go-ethereum", - sum = "h1:mSJb4fjfOioDXX/Sval6wW5hgJXKgh6qOnbONJf9/pc=", - version = "v1.8.22-0.20230626175218-2d586a9714d9", + sum = "h1:TWfJgaTCz1DqjkyYSCZQgCJoppWwX+w/NeAvy1MvcSE=", + version = "v1.8.22-0.20230727144632-9b621f5131f8", ) go_repository( @@ -1157,8 +1157,8 @@ def prysm_deps(): go_repository( name = "com_github_gballet_go_verkle", importpath = "github.com/gballet/go-verkle", - sum = "h1:AB7YjNrzlVHsYz06zCULVV2zYCEft82P86dSmtwxKL0=", - version = "v0.0.0-20220902153445-097bd83b7732", + sum = "h1:vMT47RYsrftsHSTQhqXwC3BYflo38OLC3Y4LtXtLyU0=", + version = "v0.0.0-20230607174250-df487255f46b", ) go_repository( @@ -1707,8 +1707,8 @@ def prysm_deps(): go_repository( name = "com_github_grpc_ecosystem_grpc_gateway", importpath = "github.com/grpc-ecosystem/grpc-gateway", - sum = "h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=", - version = "v1.9.5", + sum = "h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=", + version = "v1.16.0", ) go_repository( name = "com_github_grpc_ecosystem_grpc_gateway_v2", @@ -1864,8 +1864,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_billy", importpath = "github.com/holiman/billy", - sum = "h1:OEhkkDN9VRUu0ALWB0xM5v4nOwyCCuGYM7f8UouUORw=", - version = "v0.0.0-20230616073924-97ff6efa2b93", + sum = "h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw=", + version = "v0.0.0-20230718173358-1c7e68d277a7", ) go_repository( @@ -1884,8 +1884,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_uint256", importpath = "github.com/holiman/uint256", - sum = "h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=", - version = "v1.2.2", + sum = "h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=", + version = "v1.2.3", ) go_repository( name = "com_github_hpcloud_tail", @@ -2244,8 +2244,8 @@ def prysm_deps(): go_repository( name = "com_github_karalabe_usb", importpath = "github.com/karalabe/usb", - sum = "h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4=", - version = "v0.0.2", + sum = "h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs=", + version = "v0.0.3-0.20230711191512-61db3e06439c", ) go_repository( name = "com_github_kataras_blocks", @@ -3284,6 +3284,12 @@ def prysm_deps(): sum = "h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=", version = "v0.0.0-20210106213030-5aafc221ea8c", ) + go_repository( + name = "com_github_prashantv_gostub", + importpath = "github.com/prashantv/gostub", + sum = "h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=", + version = "v1.1.0", + ) go_repository( name = "com_github_prometheus_client_golang", @@ -4390,6 +4396,12 @@ def prysm_deps(): sum = "h1:faUiUgXjW8yVZ7XMnKHKm1WE4OldPBUWWfIRN/3z1dc=", version = "v1.8.0", ) + go_repository( + name = "com_google_cloud_go_compute", + importpath = "cloud.google.com/go/compute", + sum = "h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE=", + version = "v1.15.1", + ) go_repository( name = "com_google_cloud_go_compute_metadata", @@ -5478,14 +5490,14 @@ def prysm_deps(): go_repository( name = "org_golang_x_sync", importpath = "golang.org/x/sync", - sum = "h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=", - version = "v0.2.0", + sum = "h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=", + version = "v0.3.0", ) go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=", - version = "v0.8.0", + sum = "h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=", + version = "v0.9.0", ) go_repository( name = "org_golang_x_term", @@ -5553,8 +5565,8 @@ def prysm_deps(): "gazelle:go_visibility @prysm//runtime/maxprocs:__pkg__", ], importpath = "go.uber.org/automaxprocs", - sum = "h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0=", - version = "v1.3.0", + sum = "h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=", + version = "v1.5.2", ) go_repository( name = "org_uber_go_dig", diff --git a/go.mod b/go.mod index 1f2a1cd52581..8b78eef84e3a 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e - github.com/holiman/uint256 v1.2.2 + github.com/holiman/uint256 v1.2.3 github.com/ianlancetaylor/cgosymbolizer v0.0.0-20200424224625-be1b05b0b279 github.com/ipfs/go-log/v2 v2.5.1 github.com/joonix/log v0.0.0-20200409080653-9c1d2ceb5f1d @@ -79,11 +79,11 @@ require ( github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 go.etcd.io/bbolt v1.3.6 go.opencensus.io v0.24.0 - go.uber.org/automaxprocs v1.3.0 + go.uber.org/automaxprocs v1.5.2 golang.org/x/crypto v0.9.0 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc golang.org/x/mod v0.10.0 - golang.org/x/sync v0.2.0 + golang.org/x/sync v0.3.0 golang.org/x/tools v0.9.1 google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f google.golang.org/grpc v1.53.0 @@ -145,7 +145,7 @@ require ( github.com/graph-gophers/graphql-go v1.3.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect - github.com/holiman/billy v0.0.0-20230616073924-97ff6efa2b93 // indirect + github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/holiman/goevmlab v0.0.0-20230602194133-da4e4913b799 // indirect github.com/huin/goupnp v1.1.0 // indirect @@ -156,7 +156,7 @@ require ( github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect - github.com/karalabe/usb v0.0.2 // indirect + github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c // indirect github.com/klauspost/compress v1.16.4 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/koron/go-ssdp v0.0.4 // indirect @@ -256,7 +256,7 @@ require ( github.com/go-playground/validator/v10 v10.13.0 github.com/peterh/liner v1.2.0 // indirect github.com/prysmaticlabs/gohashtree v0.0.3-alpha - golang.org/x/sys v0.8.0 // indirect + golang.org/x/sys v0.9.0 // indirect google.golang.org/api v0.44.0 // indirect google.golang.org/appengine v1.6.7 // indirect k8s.io/klog/v2 v2.80.0 // indirect @@ -268,4 +268,4 @@ replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.201 // See https://github.com/prysmaticlabs/grpc-gateway/issues/2 replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20230315201114-09284ba20446 -replace github.com/ethereum/go-ethereum => github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230626175218-2d586a9714d9 +replace github.com/ethereum/go-ethereum => github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230727144632-9b621f5131f8 diff --git a/go.sum b/go.sum index e494b4e793d1..d628401b3719 100644 --- a/go.sum +++ b/go.sum @@ -80,8 +80,8 @@ github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4K github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20221202121132-bd37e8fb1d0d h1:DyFNUJjW7jX3w+QPsDw4cdwZ2j6BapkuQpiUg5IefzE= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20221202121132-bd37e8fb1d0d/go.mod h1:BSKhCg8phwi9taTm849mjagbJqs5fpFFXCc6uH4qaT4= -github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230626175218-2d586a9714d9 h1:mSJb4fjfOioDXX/Sval6wW5hgJXKgh6qOnbONJf9/pc= -github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230626175218-2d586a9714d9/go.mod h1:gBJi25HIQ0kgf76prZGagCKFeKKjBu5Q2XX1KMaIxug= +github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230727144632-9b621f5131f8 h1:TWfJgaTCz1DqjkyYSCZQgCJoppWwX+w/NeAvy1MvcSE= +github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230727144632-9b621f5131f8/go.mod h1:zKetLweqBR8ZS+1O9iJWI8DvmmD2NzD19apjEWDCsnw= github.com/MariusVanDerWijden/tx-fuzz v1.0.2 h1:H/C75+C305sWTF2ZoC4wZlJrMOpQ1YIdUBPL48ILIWI= github.com/MariusVanDerWijden/tx-fuzz v1.0.2/go.mod h1:jrK+Lr2mr1+6Pm3LlQ6rGHgK3WRQ9VMTiX+2mPMe6ys= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -249,7 +249,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/crate-crypto/go-ipa v0.0.0-20220523130400-f11357ae11c7/go.mod h1:gFnFS95y8HstDP6P9pPwzrxOOC5TRDkwbM+ao15ChAI= +github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI= github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A= github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -328,7 +328,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/ethereum/c-kzg-4844 v0.2.0/go.mod h1:WI2Nd82DMZAAZI1wV2neKGost9EKjvbpQR9OqE5Qqa8= github.com/ethereum/c-kzg-4844 v0.3.0 h1:3Y3hD6l5i0dEYsBL50C+Om644kve3pNqoAcvE26o9zI= github.com/ethereum/c-kzg-4844 v0.3.0/go.mod h1:WI2Nd82DMZAAZI1wV2neKGost9EKjvbpQR9OqE5Qqa8= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -368,7 +367,7 @@ github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= -github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732/go.mod h1:o/XfIXWi4/GqbQirfRm5uTbXMG5NpqxkxblnbZ+QM9I= +github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b/go.mod h1:CDncRYVRSDqwakm282WEkjfaAj1hxU/v5RXxk5nXOiI= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1/go.mod h1:Az6Jt+M5idSED2YPGtwnfJV0kXohgdCBPmHGSYc1r04= github.com/gdamore/tcell/v2 v2.5.3/go.mod h1:wSkrPaXoiIWZqW/g7Px4xc79di6FTcpB8tvaKJ6uGBo= @@ -665,8 +664,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= -github.com/holiman/billy v0.0.0-20230616073924-97ff6efa2b93 h1:OEhkkDN9VRUu0ALWB0xM5v4nOwyCCuGYM7f8UouUORw= -github.com/holiman/billy v0.0.0-20230616073924-97ff6efa2b93/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/goevmlab v0.0.0-20221201133036-b31966a5267d/go.mod h1:tQJ4EfAokPShVDyEwKslIWKyt0qA/z8u+iK3kAwO424= @@ -674,9 +673,8 @@ github.com/holiman/goevmlab v0.0.0-20221207202144-89074274e1b7/go.mod h1:t5n9hEK github.com/holiman/goevmlab v0.0.0-20230602194133-da4e4913b799 h1:BPP25cIOO16g50P6PgZ1dYkyOD2WBLCcl+2GJ+yQgNw= github.com/holiman/goevmlab v0.0.0-20230602194133-da4e4913b799/go.mod h1:z2Lgbrti+/tEP5LlI/K1Phv6EDhEkdQVa1XPUjMApcU= github.com/holiman/uint256 v1.2.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= -github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk= -github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= +github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= +github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= @@ -749,8 +747,8 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= -github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= -github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs= +github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kataras/blocks v0.0.6/go.mod h1:UK+Iwk0Oxpc0GdoJja7sEildotAUKK1LYeYcVF0COWc= github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= @@ -1125,6 +1123,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b h1:Bt5PzQCqfP4xiLXDSrMoqAfj6CBr3N9DAyyq8OiIWsc= github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1480,8 +1480,8 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/automaxprocs v1.3.0 h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0= -go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA= +go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= +go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/dig v1.16.1 h1:+alNIBsl0qfY0j6epRubp/9obgtrObRAc5aD+6jbWY8= go.uber.org/dig v1.16.1/go.mod h1:557JTAUZT5bUK0SvCwikmLPPtdQhfvLYtO5tJgQSbnk= go.uber.org/fx v1.19.2 h1:SyFgYQFr1Wl0AYstE8vyYIzP4bFz2URrScjwC4cwUvY= @@ -1707,8 +1707,9 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1817,7 +1818,6 @@ golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1832,8 +1832,9 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go index ee458306d155..afb7f8f959d7 100755 --- a/proto/engine/v1/execution_engine.pb.go +++ b/proto/engine/v1/execution_engine.pb.go @@ -466,8 +466,8 @@ type ExecutionPayloadDeneb struct { BlockHash []byte `protobuf:"bytes,13,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` Transactions [][]byte `protobuf:"bytes,14,rep,name=transactions,proto3" json:"transactions,omitempty" ssz-max:"1048576,1073741824" ssz-size:"?,?"` Withdrawals []*Withdrawal `protobuf:"bytes,15,rep,name=withdrawals,proto3" json:"withdrawals,omitempty" ssz-max:"16"` - DataGasUsed uint64 `protobuf:"varint,16,opt,name=data_gas_used,json=dataGasUsed,proto3" json:"data_gas_used,omitempty"` - ExcessDataGas uint64 `protobuf:"varint,17,opt,name=excess_data_gas,json=excessDataGas,proto3" json:"excess_data_gas,omitempty"` + BlobGasUsed uint64 `protobuf:"varint,16,opt,name=blob_gas_used,json=blobGasUsed,proto3" json:"blob_gas_used,omitempty"` + ExcessBlobGas uint64 `protobuf:"varint,17,opt,name=excess_blob_gas,json=excessBlobGas,proto3" json:"excess_blob_gas,omitempty"` } func (x *ExecutionPayloadDeneb) Reset() { @@ -607,16 +607,16 @@ func (x *ExecutionPayloadDeneb) GetWithdrawals() []*Withdrawal { return nil } -func (x *ExecutionPayloadDeneb) GetDataGasUsed() uint64 { +func (x *ExecutionPayloadDeneb) GetBlobGasUsed() uint64 { if x != nil { - return x.DataGasUsed + return x.BlobGasUsed } return 0 } -func (x *ExecutionPayloadDeneb) GetExcessDataGas() uint64 { +func (x *ExecutionPayloadDeneb) GetExcessBlobGas() uint64 { if x != nil { - return x.ExcessDataGas + return x.ExcessBlobGas } return 0 } @@ -1077,8 +1077,8 @@ type ExecutionPayloadHeaderDeneb struct { BlockHash []byte `protobuf:"bytes,13,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` TransactionsRoot []byte `protobuf:"bytes,14,opt,name=transactions_root,json=transactionsRoot,proto3" json:"transactions_root,omitempty" ssz-size:"32"` WithdrawalsRoot []byte `protobuf:"bytes,15,opt,name=withdrawals_root,json=withdrawalsRoot,proto3" json:"withdrawals_root,omitempty" ssz-size:"32"` - DataGasUsed uint64 `protobuf:"varint,16,opt,name=data_gas_used,json=dataGasUsed,proto3" json:"data_gas_used,omitempty"` - ExcessDataGas uint64 `protobuf:"varint,17,opt,name=excess_data_gas,json=excessDataGas,proto3" json:"excess_data_gas,omitempty"` + BlobGasUsed uint64 `protobuf:"varint,16,opt,name=blob_gas_used,json=blobGasUsed,proto3" json:"blob_gas_used,omitempty"` + ExcessBlobGas uint64 `protobuf:"varint,17,opt,name=excess_blob_gas,json=excessBlobGas,proto3" json:"excess_blob_gas,omitempty"` } func (x *ExecutionPayloadHeaderDeneb) Reset() { @@ -1218,16 +1218,16 @@ func (x *ExecutionPayloadHeaderDeneb) GetWithdrawalsRoot() []byte { return nil } -func (x *ExecutionPayloadHeaderDeneb) GetDataGasUsed() uint64 { +func (x *ExecutionPayloadHeaderDeneb) GetBlobGasUsed() uint64 { if x != nil { - return x.DataGasUsed + return x.BlobGasUsed } return 0 } -func (x *ExecutionPayloadHeaderDeneb) GetExcessDataGas() uint64 { +func (x *ExecutionPayloadHeaderDeneb) GetExcessBlobGas() uint64 { if x != nil { - return x.ExcessDataGas + return x.ExcessBlobGas } return 0 } @@ -1982,12 +1982,12 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x42, 0x06, 0x92, 0xb5, 0x18, 0x02, 0x31, 0x36, 0x52, 0x0b, 0x77, - 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x64, 0x61, - 0x74, 0x61, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x26, - 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x67, 0x61, - 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x44, - 0x61, 0x74, 0x61, 0x47, 0x61, 0x73, 0x22, 0x7f, 0x0a, 0x20, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x62, 0x6c, + 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x26, + 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, + 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x42, + 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x22, 0x7f, 0x0a, 0x20, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x70, 0x65, 0x6c, 0x6c, 0x61, 0x57, 0x69, 0x74, 0x68, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x45, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x74, @@ -2127,12 +2127,12 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x31, 0x0a, 0x10, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x64, - 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0d, 0x64, 0x61, - 0x74, 0x61, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x26, - 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x67, 0x61, - 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x44, - 0x61, 0x74, 0x61, 0x47, 0x61, 0x73, 0x22, 0xb9, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0d, 0x62, 0x6c, + 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x26, + 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, + 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x42, + 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x22, 0xb9, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x19, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, diff --git a/proto/engine/v1/execution_engine.proto b/proto/engine/v1/execution_engine.proto index 7126a61ed9b4..abdfa4649d75 100644 --- a/proto/engine/v1/execution_engine.proto +++ b/proto/engine/v1/execution_engine.proto @@ -82,8 +82,8 @@ message ExecutionPayloadDeneb { repeated bytes transactions = 14 [(ethereum.eth.ext.ssz_size) = "?,?", (ethereum.eth.ext.ssz_max) = "1048576,1073741824"]; // MAX_WITHDRAWALS_PER_PAYLOAD repeated Withdrawal withdrawals = 15 [(ethereum.eth.ext.ssz_max) = "withdrawal.size"]; - uint64 data_gas_used = 16; - uint64 excess_data_gas = 17; + uint64 blob_gas_used = 16; + uint64 excess_blob_gas = 17; } message ExecutionPayloadCapellaWithValue { @@ -150,8 +150,8 @@ message ExecutionPayloadHeaderDeneb { bytes block_hash = 13 [(ethereum.eth.ext.ssz_size) = "32"]; bytes transactions_root = 14 [(ethereum.eth.ext.ssz_size) = "32"]; bytes withdrawals_root = 15 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 data_gas_used = 16; - uint64 excess_data_gas = 17; + uint64 blob_gas_used = 16; + uint64 excess_blob_gas = 17; } message TransitionConfiguration { diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go index cabab53c93f6..9a90137ce3ac 100644 --- a/proto/engine/v1/generated.ssz.go +++ b/proto/engine/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: e55708aac3d3cb6d7fa68dafd784f6fa014917a3888e8e46fc9e056dbf0f2672 +// Hash: 4140c14176015ace6edb7d8611bd16207ad64fe872f3ea0170279fbde82b5303 package enginev1 import ( @@ -939,11 +939,11 @@ func (e *ExecutionPayloadDeneb) MarshalSSZTo(buf []byte) (dst []byte, err error) dst = ssz.WriteOffset(dst, offset) offset += len(e.Withdrawals) * 44 - // Field (15) 'DataGasUsed' - dst = ssz.MarshalUint64(dst, e.DataGasUsed) + // Field (15) 'BlobGasUsed' + dst = ssz.MarshalUint64(dst, e.BlobGasUsed) - // Field (16) 'ExcessDataGas' - dst = ssz.MarshalUint64(dst, e.ExcessDataGas) + // Field (16) 'ExcessBlobGas' + dst = ssz.MarshalUint64(dst, e.ExcessBlobGas) // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { @@ -1076,11 +1076,11 @@ func (e *ExecutionPayloadDeneb) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - // Field (15) 'DataGasUsed' - e.DataGasUsed = ssz.UnmarshallUint64(buf[512:520]) + // Field (15) 'BlobGasUsed' + e.BlobGasUsed = ssz.UnmarshallUint64(buf[512:520]) - // Field (16) 'ExcessDataGas' - e.ExcessDataGas = ssz.UnmarshallUint64(buf[520:528]) + // Field (16) 'ExcessBlobGas' + e.ExcessBlobGas = ssz.UnmarshallUint64(buf[520:528]) // Field (10) 'ExtraData' { @@ -1300,11 +1300,11 @@ func (e *ExecutionPayloadDeneb) HashTreeRootWith(hh *ssz.Hasher) (err error) { } } - // Field (15) 'DataGasUsed' - hh.PutUint64(e.DataGasUsed) + // Field (15) 'BlobGasUsed' + hh.PutUint64(e.BlobGasUsed) - // Field (16) 'ExcessDataGas' - hh.PutUint64(e.ExcessDataGas) + // Field (16) 'ExcessBlobGas' + hh.PutUint64(e.ExcessBlobGas) if ssz.EnableVectorizedHTR { hh.MerkleizeVectorizedHTR(indx) @@ -2064,11 +2064,11 @@ func (e *ExecutionPayloadHeaderDeneb) MarshalSSZTo(buf []byte) (dst []byte, err } dst = append(dst, e.WithdrawalsRoot...) - // Field (15) 'DataGasUsed' - dst = ssz.MarshalUint64(dst, e.DataGasUsed) + // Field (15) 'BlobGasUsed' + dst = ssz.MarshalUint64(dst, e.BlobGasUsed) - // Field (16) 'ExcessDataGas' - dst = ssz.MarshalUint64(dst, e.ExcessDataGas) + // Field (16) 'ExcessBlobGas' + dst = ssz.MarshalUint64(dst, e.ExcessBlobGas) // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { @@ -2172,11 +2172,11 @@ func (e *ExecutionPayloadHeaderDeneb) UnmarshalSSZ(buf []byte) error { } e.WithdrawalsRoot = append(e.WithdrawalsRoot, buf[536:568]...) - // Field (15) 'DataGasUsed' - e.DataGasUsed = ssz.UnmarshallUint64(buf[568:576]) + // Field (15) 'BlobGasUsed' + e.BlobGasUsed = ssz.UnmarshallUint64(buf[568:576]) - // Field (16) 'ExcessDataGas' - e.ExcessDataGas = ssz.UnmarshallUint64(buf[576:584]) + // Field (16) 'ExcessBlobGas' + e.ExcessBlobGas = ssz.UnmarshallUint64(buf[576:584]) // Field (10) 'ExtraData' { @@ -2309,11 +2309,11 @@ func (e *ExecutionPayloadHeaderDeneb) HashTreeRootWith(hh *ssz.Hasher) (err erro } hh.PutBytes(e.WithdrawalsRoot) - // Field (15) 'DataGasUsed' - hh.PutUint64(e.DataGasUsed) + // Field (15) 'BlobGasUsed' + hh.PutUint64(e.BlobGasUsed) - // Field (16) 'ExcessDataGas' - hh.PutUint64(e.ExcessDataGas) + // Field (16) 'ExcessBlobGas' + hh.PutUint64(e.ExcessBlobGas) if ssz.EnableVectorizedHTR { hh.MerkleizeVectorizedHTR(indx) diff --git a/proto/engine/v1/json_marshal_unmarshal.go b/proto/engine/v1/json_marshal_unmarshal.go index f9ee9a2a1c66..f35557e22fb1 100644 --- a/proto/engine/v1/json_marshal_unmarshal.go +++ b/proto/engine/v1/json_marshal_unmarshal.go @@ -37,8 +37,8 @@ type ExecutionBlock struct { Transactions []*gethtypes.Transaction `json:"transactions"` TotalDifficulty string `json:"totalDifficulty"` Withdrawals []*Withdrawal `json:"withdrawals"` - DataGasUsed *hexutil.Uint64 `json:"dataGasUsed"` - ExcessDataGas *hexutil.Uint64 `json:"excessDataGas"` + BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"` + ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"` } func (e *ExecutionBlock) MarshalJSON() ([]byte, error) { @@ -108,35 +108,35 @@ func (e *ExecutionBlock) UnmarshalJSON(enc []byte) error { } e.Withdrawals = ws - edg, has := decoded["excessDataGas"] + edg, has := decoded["excessBlobGas"] if has && edg != nil { e.Version = version.Deneb u := new(hexutil.Uint64) sedg, ok := edg.(string) if !ok { - return errors.Wrap(errExecutionUnmarshal, "excessDataGas is not a string, can not decode") + return errors.Wrap(errExecutionUnmarshal, "excessBlobGas is not a string, can not decode") } err = u.UnmarshalText([]byte(sedg)) if err != nil { - return errors.Wrap(err, "unable to unmarshal excessDataGas as hexutil.Uint64") + return errors.Wrap(err, "unable to unmarshal excessBlobGas as hexutil.Uint64") } - e.ExcessDataGas = u + e.ExcessBlobGas = u } - dgu, has := decoded["dataGasUsed"] + dgu, has := decoded["blobGasUsed"] log.Error(has, dgu != nil) if has && dgu != nil { e.Version = version.Deneb u := new(hexutil.Uint64) sdgu, ok := dgu.(string) if !ok { - return errors.Wrap(errExecutionUnmarshal, "dataGasUsed is not a string, can not decode") + return errors.Wrap(errExecutionUnmarshal, "blobGasUsed is not a string, can not decode") } err = u.UnmarshalText([]byte(sdgu)) if err != nil { - return errors.Wrap(err, "unable to unmarshal dataGasUsed as hexutil.Uint64") + return errors.Wrap(err, "unable to unmarshal blobGasUsed as hexutil.Uint64") } - e.DataGasUsed = u + e.BlobGasUsed = u } } @@ -293,8 +293,8 @@ type ExecutionPayloadDenebJSON struct { Timestamp *hexutil.Uint64 `json:"timestamp"` ExtraData hexutil.Bytes `json:"extraData"` BaseFeePerGas string `json:"baseFeePerGas"` - DataGasUsed *hexutil.Uint64 `json:"dataGasUsed"` - ExcessDataGas *hexutil.Uint64 `json:"excessDataGas"` + BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"` + ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"` BlockHash *common.Hash `json:"blockHash"` Transactions []hexutil.Bytes `json:"transactions"` Withdrawals []*Withdrawal `json:"withdrawals"` @@ -749,8 +749,8 @@ func (e *ExecutionPayloadDeneb) MarshalJSON() ([]byte, error) { if e.Withdrawals == nil { e.Withdrawals = make([]*Withdrawal, 0) } - dataGasUsed := hexutil.Uint64(e.DataGasUsed) - excessDataGas := hexutil.Uint64(e.ExcessDataGas) + blobGasUsed := hexutil.Uint64(e.BlobGasUsed) + excessBlobGas := hexutil.Uint64(e.ExcessBlobGas) return json.Marshal(ExecutionPayloadDenebJSON{ ParentHash: &pHash, @@ -768,8 +768,8 @@ func (e *ExecutionPayloadDeneb) MarshalJSON() ([]byte, error) { BlockHash: &bHash, Transactions: transactions, Withdrawals: e.Withdrawals, - DataGasUsed: &dataGasUsed, - ExcessDataGas: &excessDataGas, + BlobGasUsed: &blobGasUsed, + ExcessBlobGas: &excessBlobGas, }) } @@ -818,11 +818,11 @@ func (e *ExecutionPayloadDenebWithValueAndBlobsBundle) UnmarshalJSON(enc []byte) if dec.ExecutionPayload.GasLimit == nil { return errors.New("missing required field 'gasLimit' for ExecutionPayload") } - if dec.ExecutionPayload.DataGasUsed == nil { - return errors.New("missing required field 'dataGasUsed' for ExecutionPayload") + if dec.ExecutionPayload.BlobGasUsed == nil { + return errors.New("missing required field 'blobGasUsed' for ExecutionPayload") } - if dec.ExecutionPayload.ExcessDataGas == nil { - return errors.New("missing required field 'excessDataGas' for ExecutionPayload") + if dec.ExecutionPayload.ExcessBlobGas == nil { + return errors.New("missing required field 'excessBlobGas' for ExecutionPayload") } *e = ExecutionPayloadDenebWithValueAndBlobsBundle{Payload: &ExecutionPayloadDeneb{}} @@ -843,8 +843,8 @@ func (e *ExecutionPayloadDenebWithValueAndBlobsBundle) UnmarshalJSON(enc []byte) } e.Payload.BaseFeePerGas = bytesutil.PadTo(bytesutil.ReverseByteOrder(baseFee.Bytes()), fieldparams.RootLength) - e.Payload.ExcessDataGas = uint64(*dec.ExecutionPayload.ExcessDataGas) - e.Payload.DataGasUsed = uint64(*dec.ExecutionPayload.DataGasUsed) + e.Payload.ExcessBlobGas = uint64(*dec.ExecutionPayload.ExcessBlobGas) + e.Payload.BlobGasUsed = uint64(*dec.ExecutionPayload.BlobGasUsed) e.Payload.BlockHash = dec.ExecutionPayload.BlockHash.Bytes() transactions := make([][]byte, len(dec.ExecutionPayload.Transactions)) diff --git a/proto/engine/v1/json_marshal_unmarshal_test.go b/proto/engine/v1/json_marshal_unmarshal_test.go index a8599455e67e..ebed9e7975f1 100644 --- a/proto/engine/v1/json_marshal_unmarshal_test.go +++ b/proto/engine/v1/json_marshal_unmarshal_test.go @@ -218,8 +218,8 @@ func TestJsonMarshalUnmarshal(t *testing.T) { gl := hexutil.Uint64(2) gu := hexutil.Uint64(3) ts := hexutil.Uint64(4) - dgu := hexutil.Uint64(5) - edg := hexutil.Uint64(6) + bgu := hexutil.Uint64(5) + ebg := hexutil.Uint64(6) resp := &enginev1.GetPayloadV3ResponseJson{ BlobsBundle: &enginev1.BlobBundleJSON{ @@ -249,8 +249,8 @@ func TestJsonMarshalUnmarshal(t *testing.T) { Address: bytesutil.PadTo([]byte("address"), 20), Amount: 1, }}, - DataGasUsed: &dgu, - ExcessDataGas: &edg, + BlobGasUsed: &bgu, + ExcessBlobGas: &ebg, }, } enc, err := json.Marshal(resp) @@ -267,8 +267,8 @@ func TestJsonMarshalUnmarshal(t *testing.T) { require.DeepEqual(t, uint64(2), pb.Payload.GasLimit) require.DeepEqual(t, uint64(3), pb.Payload.GasUsed) require.DeepEqual(t, uint64(4), pb.Payload.Timestamp) - require.DeepEqual(t, uint64(5), pb.Payload.DataGasUsed) - require.DeepEqual(t, uint64(6), pb.Payload.ExcessDataGas) + require.DeepEqual(t, uint64(5), pb.Payload.BlobGasUsed) + require.DeepEqual(t, uint64(6), pb.Payload.ExcessBlobGas) require.DeepEqual(t, extra.Bytes(), pb.Payload.ExtraData) feePerGas := new(big.Int).SetBytes(pb.Payload.BaseFeePerGas) require.Equal(t, "15832716547479101977395928904157292820330083199902421483727713169783165812736", feePerGas.String()) @@ -583,13 +583,13 @@ func TestExecutionPayloadBody_MarshalUnmarshalJSON(t *testing.T) { pBody := &enginev1.ExecutionPayloadBodyV1{ Transactions: [][]byte{[]byte("random1"), []byte("random2"), []byte("random3")}, Withdrawals: []*enginev1.Withdrawal{ - &enginev1.Withdrawal{ + { Index: 200, ValidatorIndex: 20303, Amount: 3200000000, Address: bytesutil.PadTo([]byte("junk"), 20), }, - &enginev1.Withdrawal{ + { Index: 200, ValidatorIndex: 70303, Amount: 3200000800, diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go index 20b27aa5dbf0..e2214cd59133 100644 --- a/proto/eth/v1/generated.ssz.go +++ b/proto/eth/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: be585637bf02ff296cc47c64aa4c161246d51305b2c95ae51cac2687892b3617 +// Hash: e48b579f1c4ced0b36ba1329204c668ac6db966ce37b7bda314aabddbd5f1662 package v1 import ( diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go index 42630271220c..e7f74c63342c 100644 --- a/proto/eth/v2/generated.ssz.go +++ b/proto/eth/v2/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 5a8c4eabc02ae4d6ac8510d4c074cf03c31ae9ea4dab5666128a7353c95569e5 +// Hash: d835aa3a6a3cf037dfb4ffca7686e527835b94bb660983f23017bdb8a972f81d package eth import ( diff --git a/proto/migration/v1alpha1_to_v2.go b/proto/migration/v1alpha1_to_v2.go index e83641b7e153..5b47b47a44cc 100644 --- a/proto/migration/v1alpha1_to_v2.go +++ b/proto/migration/v1alpha1_to_v2.go @@ -1225,8 +1225,8 @@ func BeaconStateDenebToProto(st state.BeaconState) (*ethpbv2.BeaconStateDeneb, e Timestamp: sourceLatestExecutionPayloadHeader.Timestamp, ExtraData: bytesutil.SafeCopyBytes(sourceLatestExecutionPayloadHeader.ExtraData), BaseFeePerGas: bytesutil.SafeCopyBytes(sourceLatestExecutionPayloadHeader.BaseFeePerGas), - DataGasUsed: sourceLatestExecutionPayloadHeader.DataGasUsed, - ExcessDataGas: sourceLatestExecutionPayloadHeader.ExcessDataGas, + BlobGasUsed: sourceLatestExecutionPayloadHeader.BlobGasUsed, + ExcessBlobGas: sourceLatestExecutionPayloadHeader.ExcessBlobGas, BlockHash: bytesutil.SafeCopyBytes(sourceLatestExecutionPayloadHeader.BlockHash), TransactionsRoot: bytesutil.SafeCopyBytes(sourceLatestExecutionPayloadHeader.TransactionsRoot), WithdrawalsRoot: bytesutil.SafeCopyBytes(sourceLatestExecutionPayloadHeader.WithdrawalsRoot), diff --git a/proto/migration/v1alpha1_to_v2_test.go b/proto/migration/v1alpha1_to_v2_test.go index 1a8133fe3b67..5b56d3bd3b49 100644 --- a/proto/migration/v1alpha1_to_v2_test.go +++ b/proto/migration/v1alpha1_to_v2_test.go @@ -777,8 +777,8 @@ func TestBeaconStateDenebToProto(t *testing.T) { BlockHash: bytesutil.PadTo([]byte("blockhash"), 32), TransactionsRoot: bytesutil.PadTo([]byte("transactionsroot"), 32), WithdrawalsRoot: bytesutil.PadTo([]byte("withdrawalsroot"), 32), - DataGasUsed: 343, - ExcessDataGas: 676, + BlobGasUsed: 343, + ExcessBlobGas: 676, } state.NextWithdrawalIndex = 123 state.NextWithdrawalValidatorIndex = 123 @@ -883,8 +883,8 @@ func TestBeaconStateDenebToProto(t *testing.T) { assert.DeepEqual(t, bytesutil.PadTo([]byte("blockhash"), 32), resultLatestExecutionPayloadHeader.BlockHash) assert.DeepEqual(t, bytesutil.PadTo([]byte("transactionsroot"), 32), resultLatestExecutionPayloadHeader.TransactionsRoot) assert.DeepEqual(t, bytesutil.PadTo([]byte("withdrawalsroot"), 32), resultLatestExecutionPayloadHeader.WithdrawalsRoot) - assert.DeepEqual(t, uint64(343), resultLatestExecutionPayloadHeader.DataGasUsed) - assert.DeepEqual(t, uint64(676), resultLatestExecutionPayloadHeader.ExcessDataGas) + assert.DeepEqual(t, uint64(343), resultLatestExecutionPayloadHeader.BlobGasUsed) + assert.DeepEqual(t, uint64(676), resultLatestExecutionPayloadHeader.ExcessBlobGas) assert.Equal(t, uint64(123), result.NextWithdrawalIndex) assert.Equal(t, primitives.ValidatorIndex(123), result.NextWithdrawalValidatorIndex) assert.DeepEqual(t, bytesutil.PadTo([]byte("blocksummaryroot"), 32), result.HistoricalSummaries[0].BlockSummaryRoot) diff --git a/proto/prysm/v1alpha1/cloners.go b/proto/prysm/v1alpha1/cloners.go index 5dfa4fd2eed7..4228f6ec3a2f 100644 --- a/proto/prysm/v1alpha1/cloners.go +++ b/proto/prysm/v1alpha1/cloners.go @@ -812,8 +812,8 @@ func CopyExecutionPayloadHeaderDeneb(payload *enginev1.ExecutionPayloadHeaderDen GasLimit: payload.GasLimit, GasUsed: payload.GasUsed, Timestamp: payload.Timestamp, - DataGasUsed: payload.DataGasUsed, - ExcessDataGas: payload.ExcessDataGas, + BlobGasUsed: payload.BlobGasUsed, + ExcessBlobGas: payload.ExcessBlobGas, BaseFeePerGas: bytesutil.SafeCopyBytes(payload.BaseFeePerGas), ExtraData: bytesutil.SafeCopyBytes(payload.ExtraData), BlockHash: bytesutil.SafeCopyBytes(payload.BlockHash), @@ -838,8 +838,8 @@ func CopyExecutionPayloadDeneb(payload *enginev1.ExecutionPayloadDeneb) *enginev GasLimit: payload.GasLimit, GasUsed: payload.GasUsed, Timestamp: payload.Timestamp, - DataGasUsed: payload.DataGasUsed, - ExcessDataGas: payload.ExcessDataGas, + BlobGasUsed: payload.BlobGasUsed, + ExcessBlobGas: payload.ExcessBlobGas, ExtraData: bytesutil.SafeCopyBytes(payload.ExtraData), BaseFeePerGas: bytesutil.SafeCopyBytes(payload.BaseFeePerGas), BlockHash: bytesutil.SafeCopyBytes(payload.BlockHash), diff --git a/proto/prysm/v1alpha1/cloners_test.go b/proto/prysm/v1alpha1/cloners_test.go index 7e6a2fba29d4..363d222da5ac 100644 --- a/proto/prysm/v1alpha1/cloners_test.go +++ b/proto/prysm/v1alpha1/cloners_test.go @@ -1075,8 +1075,8 @@ func genPayloadDeneb() *enginev1.ExecutionPayloadDeneb { Amount: 456, }, }, - DataGasUsed: 5, - ExcessDataGas: 6, + BlobGasUsed: 5, + ExcessBlobGas: 6, } } @@ -1136,8 +1136,8 @@ func genPayloadHeaderDeneb() *enginev1.ExecutionPayloadHeaderDeneb { BlockHash: bytes(32), TransactionsRoot: bytes(32), WithdrawalsRoot: bytes(32), - DataGasUsed: 5, - ExcessDataGas: 6, + BlobGasUsed: 5, + ExcessBlobGas: 6, } } diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go index 1631027db34b..a9022b5a82a1 100644 --- a/proto/prysm/v1alpha1/generated.ssz.go +++ b/proto/prysm/v1alpha1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: de1a69d9126e429c6eb2c5d50c30bc7c3f9dfe5e2c08243da4fb23768c1f582f +// Hash: a4cef4276bc2874bce7cd893bfee3da13f3b3f3183686029b2ce9c6ef4a32817 package eth import ( diff --git a/runtime/interop/premine-state.go b/runtime/interop/premine-state.go index 9cb1060451db..68cfb35d9ad9 100644 --- a/runtime/interop/premine-state.go +++ b/runtime/interop/premine-state.go @@ -439,7 +439,8 @@ func (s *PremineGenesisConfig) setLatestBlockHeader(g state.BeaconState) error { BlockHash: make([]byte, 32), Transactions: make([][]byte, 0), Withdrawals: make([]*enginev1.Withdrawal, 0), - ExcessDataGas: 0, + ExcessBlobGas: 0, + BlobGasUsed: 0, }, BlsToExecutionChanges: make([]*ethpb.SignedBLSToExecutionChange, 0), BlobKzgCommitments: make([][]byte, 0), @@ -545,7 +546,8 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error { BlockHash: gb.Hash().Bytes(), Transactions: make([][]byte, 0), Withdrawals: make([]*enginev1.Withdrawal, 0), - ExcessDataGas: 0, + ExcessBlobGas: 0, + BlobGasUsed: 0, } wep, err := blocks.WrappedExecutionPayloadDeneb(payload, 0) if err != nil { diff --git a/testing/util/deneb.go b/testing/util/deneb.go index b9a23c1db68a..55f2a3690faa 100644 --- a/testing/util/deneb.go +++ b/testing/util/deneb.go @@ -47,7 +47,8 @@ func GenerateTestDenebBlockWithSidecar(t *testing.T, parent [32]byte, slot primi Timestamp: 0, ExtraData: make([]byte, 0), BaseFeePerGas: bytesutil.PadTo([]byte("baseFeePerGas"), fieldparams.RootLength), - ExcessDataGas: 0, + ExcessBlobGas: 0, + BlobGasUsed: 0, BlockHash: blockHash[:], Transactions: encodedBinaryTxs, }