(cherry picked from commit 64a6c2c1b6c81fddccc7d3d728b7a05c5814124b) Conflicts: cmd/geth/js.go internal/web3ext/web3ext.go