Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

improve error message in SendTransaction json-rpc api (backport #786) #789

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 26, 2021

This is an automatic backport of pull request #786 done by Mergify.
Cherry-pick of c8d4d3f has failed:

On branch mergify/bp/release/v0.7.x/pr-786
Your branch is up to date with 'origin/release/v0.7.x'.

You are currently cherry-picking commit c8d4d3f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/ante/ante.go
	modified:   go.sum
	modified:   rpc/ethereum/backend/backend.go
	modified:   rpc/ethereum/namespaces/miner/api.go
	modified:   x/evm/keeper/grpc_query.go
	modified:   x/evm/keeper/msg_server.go
	modified:   x/evm/keeper/utils.go
	modified:   x/evm/types/chain_config.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/ante/eth.go
	both modified:   go.mod
	both modified:   rpc/ethereum/namespaces/eth/api.go
	both modified:   x/evm/keeper/keeper.go
	both modified:   x/evm/keeper/state_transition.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix error message in `SendTransaction` json-rpc api

Closes: #785

Solution:
- Remove `stacktrace.Propagate`s, and recover error message in jsonrpc server

changelog

fix error messages

* Update x/evm/keeper/msg_server.go

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit c8d4d3f)

# Conflicts:
#	CHANGELOG.md
#	app/ante/eth.go
#	go.mod
#	rpc/ethereum/namespaces/eth/api.go
#	x/evm/keeper/keeper.go
#	x/evm/keeper/state_transition.go
@codecov
Copy link

codecov bot commented Nov 26, 2021

Codecov Report

Merging #789 (c8d4d3f) into release/v0.7.x (39c49c6) will increase coverage by 0.43%.
The diff coverage is 36.25%.

❗ Current head c8d4d3f differs from pull request most recent head 7da009f. Consider uploading reports for the commit 7da009f to get more accurate results
Impacted file tree graph

@@                Coverage Diff                 @@
##           release/v0.7.x     #789      +/-   ##
==================================================
+ Coverage           56.87%   57.30%   +0.43%     
==================================================
  Files                  64       71       +7     
  Lines                5352     6041     +689     
==================================================
+ Hits                 3044     3462     +418     
- Misses               2153     2377     +224     
- Partials              155      202      +47     
Impacted Files Coverage Δ
app/export.go 13.38% <0.00%> (-0.10%) ⬇️
app/test_helpers.go 0.00% <0.00%> (ø)
client/keys.go 0.00% <0.00%> (ø)
client/testnet.go 0.00% <0.00%> (ø)
rpc/ethereum/pubsub/pubsub.go 78.48% <ø> (+78.48%) ⬆️
rpc/ethereum/types/addrlock.go 0.00% <ø> (ø)
rpc/ethereum/types/block.go 50.46% <ø> (+1.37%) ⬆️
rpc/ethereum/types/query_client.go 0.00% <ø> (ø)
rpc/ethereum/types/utils.go 0.00% <0.00%> (ø)
x/evm/client/cli/query.go 0.00% <ø> (ø)
... and 66 more

@fedekunze fedekunze closed this Dec 7, 2021
@mergify mergify bot deleted the mergify/bp/release/v0.7.x/pr-786 branch December 7, 2021 16:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants