mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
Merge branch 'api/blob' of github.com:s1na/go-ethereum into api/blob
This commit is contained in:
commit
5b85d6c9e6
2 changed files with 3 additions and 4 deletions
|
|
@ -314,9 +314,9 @@ func (st *StateTransition) preCheck() error {
|
||||||
}
|
}
|
||||||
// Check the blob version validity
|
// Check the blob version validity
|
||||||
if msg.BlobHashes != nil {
|
if msg.BlobHashes != nil {
|
||||||
// The to field of a blob tx type is mandatory.
|
// The to field of a blob tx type is mandatory, and a `BlobTx` transaction internally
|
||||||
// However messages created through RPC (eth_call)
|
// has it as a non-nillable value, so any msg derived from blob transaction has it non-nil.
|
||||||
// don't have this restriction.
|
// However, messages created through RPC (eth_call) don't have this restriction.
|
||||||
if msg.To == nil {
|
if msg.To == nil {
|
||||||
return ErrBlobTxCreate
|
return ErrBlobTxCreate
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -478,7 +478,6 @@ func (s *PersonalAccountAPI) SendTransaction(ctx context.Context, args Transacti
|
||||||
log.Warn("Failed transaction send attempt", "from", args.from(), "to", args.To, "value", args.Value.ToInt(), "err", err)
|
log.Warn("Failed transaction send attempt", "from", args.from(), "to", args.To, "value", args.Value.ToInt(), "err", err)
|
||||||
return common.Hash{}, err
|
return common.Hash{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return SubmitTransaction(ctx, s.b, signed)
|
return SubmitTransaction(ctx, s.b, signed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue