Skip to content

w3vm: include underlying error that caused ErrFetch #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lmittmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

w3vm: include underlying error that caused ErrFetch #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions w3vm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ func (vm *VM) ApplyTx(tx *types.Transaction, hooks ...*tracing.Hooks) (*Receipt,
}

func (v *VM) apply(msg *w3types.Message, isCall bool, hooks *tracing.Hooks) (*Receipt, error) {
if v.db.Error() != nil {
return nil, ErrFetch
if err := v.db.Error(); err != nil {
return nil, fmt.Errorf("%w: %w", ErrFetch, err)
}

var db vm.StateDB
Expand Down Expand Up @@ -216,8 +216,8 @@ func (cff *CallFuncFactory) Returns(returns ...any) error {
// Nonce returns the nonce of the given address.
func (vm *VM) Nonce(addr common.Address) (uint64, error) {
nonce := vm.db.GetNonce(addr)
if vm.db.Error() != nil {
return 0, fmt.Errorf("%w: failed to fetch nonce of %s", ErrFetch, addr)
if err := vm.db.Error(); err != nil {
return 0, fmt.Errorf("%w: nonce of %s: %v", ErrFetch, addr, err)
}
return nonce, nil
}
Expand All @@ -230,8 +230,8 @@ func (vm *VM) SetNonce(addr common.Address, nonce uint64) {
// Balance returns the balance of the given address.
func (vm *VM) Balance(addr common.Address) (*big.Int, error) {
balance := vm.db.GetBalance(addr)
if vm.db.Error() != nil {
return nil, fmt.Errorf("%w: failed to fetch balance of %s", ErrFetch, addr)
if err := vm.db.Error(); err != nil {
return nil, fmt.Errorf("%w: balance of %s: %v", ErrFetch, addr, err)
}
return balance.ToBig(), nil
}
Expand All @@ -244,8 +244,8 @@ func (vm *VM) SetBalance(addr common.Address, balance *big.Int) {
// Code returns the code of the given address.
func (vm *VM) Code(addr common.Address) ([]byte, error) {
code := vm.db.GetCode(addr)
if vm.db.Error() != nil {
return nil, fmt.Errorf("%w: failed to fetch code of %s", ErrFetch, addr)
if err := vm.db.Error(); err != nil {
return nil, fmt.Errorf("%w: code of %s: %v", ErrFetch, addr, err)
}
return code, nil
}
Expand All @@ -258,8 +258,8 @@ func (vm *VM) SetCode(addr common.Address, code []byte) {
// StorageAt returns the state of the given address at the give storage slot.
func (vm *VM) StorageAt(addr common.Address, slot common.Hash) (common.Hash, error) {
val := vm.db.GetState(addr, slot)
if vm.db.Error() != nil {
return w3.Hash0, fmt.Errorf("%w: failed to fetch storage of %s at %s", ErrFetch, addr, slot)
if err := vm.db.Error(); err != nil {
return w3.Hash0, fmt.Errorf("%w: storage of %s at %s: %v", ErrFetch, addr, slot, err)
}
return val, nil
}
Expand Down
Loading