mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 22:26:42 +00:00
fix(blob clients): nil pointer with unexpected blob client response (#1195)
* fix nil pointer with unexpected blob client response * chore: auto version bump [bot]
This commit is contained in:
parent
cdd77c1659
commit
7fbc35db18
3 changed files with 13 additions and 1 deletions
|
|
@ -24,7 +24,7 @@ import (
|
||||||
const (
|
const (
|
||||||
VersionMajor = 5 // Major version component of the current release
|
VersionMajor = 5 // Major version component of the current release
|
||||||
VersionMinor = 8 // Minor version component of the current release
|
VersionMinor = 8 // Minor version component of the current release
|
||||||
VersionPatch = 51 // Patch version component of the current release
|
VersionPatch = 52 // Patch version component of the current release
|
||||||
VersionMeta = "mainnet" // Version metadata to append to the version string
|
VersionMeta = "mainnet" // Version metadata to append to the version string
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,12 @@ func (c *BlobScanClient) GetBlobByVersionedHashAndBlockTime(ctx context.Context,
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to decode result into struct, err: %w", err)
|
return nil, fmt.Errorf("failed to decode result into struct, err: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check that blob data is not empty
|
||||||
|
if len(result.Data) < 2 {
|
||||||
|
return nil, fmt.Errorf("blob data is too short to be valid, expected at least 2 characters, got: %s, versioned hash: %s", result.Data, versionedHash.String())
|
||||||
|
}
|
||||||
|
|
||||||
blobBytes, err := hex.DecodeString(result.Data[2:])
|
blobBytes, err := hex.DecodeString(result.Data[2:])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to decode data to bytes, err: %w", err)
|
return nil, fmt.Errorf("failed to decode data to bytes, err: %w", err)
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,12 @@ func (c *BlockNativeClient) GetBlobByVersionedHashAndBlockTime(ctx context.Conte
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to decode result into struct, err: %w", err)
|
return nil, fmt.Errorf("failed to decode result into struct, err: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check that blob data is not empty
|
||||||
|
if len(result.Blob.Data) < 2 {
|
||||||
|
return nil, fmt.Errorf("blob data is too short to be valid, expected at least 2 characters, got: %s, versioned hash: %s", result.Blob.Data, versionedHash.String())
|
||||||
|
}
|
||||||
|
|
||||||
blobBytes, err := hex.DecodeString(result.Blob.Data[2:])
|
blobBytes, err := hex.DecodeString(result.Blob.Data[2:])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to decode data to bytes, err: %w", err)
|
return nil, fmt.Errorf("failed to decode data to bytes, err: %w", err)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue