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

Commit 83d247d

Browse files
danburckfedekunze
danburck
authored and
fedekunze
committed
rpc: restructure JSON-RPC directory and rename server config (#612)
* Restructure ethermint/rpc repo structure and change import statements * Add #400 to changelog * fix filepath in util and json_rpc * Move #400 to unreleased section
1 parent 6d56a2d commit 83d247d

38 files changed

+61
-38
lines changed

‎CHANGELOG.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
3737

3838
## Unreleased
3939

40+
### API Breaking
41+
42+
* (rpc) [tharsis#400](https://github.com/tharsis/ethermint/issues/400) Restructure JSON-RPC directory and rename server config
43+
4044
### Improvements
4145

4246
* (deps) [tharsis#610](https://github.com/tharsis/ethermint/pull/610) Bump Cosmos SDK to [v0.44.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.1).
@@ -82,6 +86,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
8286
* (rpc, evm) [tharsis#587](https://github.com/tharsis/ethermint/pull/587) Apply bloom filter when query ethlogs with range of blocks
8387
* (evm) [tharsis#586](https://github.com/tharsis/ethermint/pull/586) Benchmark evm keeper
8488

89+
8590
## [v0.5.0] - 2021-08-20
8691

8792
### State Machine Breaking
@@ -158,12 +163,12 @@ the Tracer type used to collect execution traces from the EVM transaction execut
158163
* (evm) [\#767](https://github.com/cosmos/ethermint/issues/767) Fix error of timeout when using Truffle to deploy contract.
159164
* (evm) [\#751](https://github.com/cosmos/ethermint/issues/751) Fix misused method to calculate block hash in evm related function.
160165
* (evm) [\#721](https://github.com/cosmos/ethermint/issues/721) Fix mismatch block hash in rpc response when use eht.getBlock.
161-
* (evm) [\#730](https://github.com/cosmos/ethermint/issues/730) Fix 'EIP2028' not open when Istanbul version has been enabled.
166+
* (evm) [\#730](https://github.com/cosmos/ethermint/issues/730) Fix 'EIP2028' not open when Istanbul version has been enabled.
162167
* (evm) [\#749](https://github.com/cosmos/ethermint/issues/749) Fix panic in `AnteHandler` when gas price larger than 100000
163168
* (evm) [\#747](https://github.com/cosmos/ethermint/issues/747) Fix format errors in String() of QueryETHLogs
164-
* (evm) [\#742](https://github.com/cosmos/ethermint/issues/742) Add parameter check for evm query func.
165-
* (evm) [\#687](https://github.com/cosmos/ethermint/issues/687) Fix nonce check to explicitly check for the correct nonce, rather than a simple 'greater than' comparison.
166-
* (api) [\#687](https://github.com/cosmos/ethermint/issues/687) Returns error for a transaction with an incorrect nonce.
169+
* (evm) [\#742](https://github.com/cosmos/ethermint/issues/742) Add parameter check for evm query func.
170+
* (evm) [\#687](https://github.com/cosmos/ethermint/issues/687) Fix nonce check to explicitly check for the correct nonce, rather than a simple 'greater than' comparison.
171+
* (api) [\#687](https://github.com/cosmos/ethermint/issues/687) Returns error for a transaction with an incorrect nonce.
167172
* (evm) [\#674](https://github.com/cosmos/ethermint/issues/674) Reset all cache after account data has been committed in `EndBlock` to make sure every node state consistent.
168173
* (evm) [\#672](https://github.com/cosmos/ethermint/issues/672) Fix panic of `wrong Block.Header.AppHash` when restart a node with snapshot.
169174
* (evm) [\#775](https://github.com/cosmos/ethermint/issues/775) MisUse of headHash as blockHash when create EVM context.

‎go.sum

+18
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
228228
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
229229
github.com/coinbase/rosetta-sdk-go v0.6.10 h1:rgHD/nHjxLh0lMEdfGDqpTtlvtSBwULqrrZ2qPdNaCM=
230230
github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo=
231+
github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
231232
github.com/confio/ics23/go v0.6.3/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
232233
github.com/confio/ics23/go v0.6.6 h1:pkOy18YxxJ/r0XFDCnrl4Bjv6h4LkBSpLS6F38mrKL8=
233234
github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
@@ -258,6 +259,10 @@ github.com/cosmos/cosmos-sdk v0.44.1/go.mod h1:fwQJdw+aECatpTvQTo1tSfHEsxACdZYU8
258259
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
259260
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
260261
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
262+
github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE=
263+
github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I=
264+
github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4=
265+
github.com/cosmos/iavl v0.16.0/go.mod h1:2A8O/Jz9YwtjqXMO0CjnnbTYEEaovE8jWcwrakH3PoE=
261266
github.com/cosmos/iavl v0.17.1 h1:b/Cl8h1PRMvsu24+TYNlKchIu7W6tmxIBGe6E9u2Ybw=
262267
github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk=
263268
github.com/cosmos/ibc-go v1.2.0 h1:0RgxmKzCzIH9SwDp4ckL5VrzlO1KJ5hO0AsOAzOiWE4=
@@ -289,6 +294,7 @@ github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0
289294
github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA=
290295
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I=
291296
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE=
297+
github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
292298
github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k=
293299
github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
294300
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
@@ -577,6 +583,7 @@ github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1
577583
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
578584
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
579585
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
586+
github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI=
580587
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI=
581588
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
582589
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
@@ -585,6 +592,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
585592
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
586593
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
587594
github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c=
595+
github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU=
588596
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
589597
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
590598
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
@@ -1072,6 +1080,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
10721080
github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE=
10731081
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
10741082
github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
1083+
github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
10751084
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4=
10761085
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
10771086
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -1177,9 +1186,15 @@ github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RM
11771186
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk=
11781187
github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E=
11791188
github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
1189+
github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4=
1190+
github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg=
1191+
github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ=
1192+
github.com/tendermint/tendermint v0.34.10/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
11801193
github.com/tendermint/tendermint v0.34.12/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
11811194
github.com/tendermint/tendermint v0.34.13 h1:fu+tsHudbOr5PvepjH0q47Jae59hQAvn3IqAHv2EbC8=
11821195
github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI=
1196+
github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=
1197+
github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8=
11831198
github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ=
11841199
github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw=
11851200
github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
@@ -1307,6 +1322,7 @@ golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPh
13071322
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
13081323
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
13091324
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1325+
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
13101326
golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
13111327
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
13121328
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1756,6 +1772,7 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D
17561772
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
17571773
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
17581774
google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
1775+
google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
17591776
google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
17601777
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
17611778
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -1805,6 +1822,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
18051822
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
18061823
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
18071824
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1825+
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
18081826
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
18091827
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
18101828
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=

‎ethereum/rpc/apis.go renamed to ‎rpc/apis.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import (
88

99
"github.com/ethereum/go-ethereum/rpc"
1010

11-
"github.com/tharsis/ethermint/ethereum/rpc/backend"
12-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/debug"
13-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/eth"
14-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/eth/filters"
15-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/miner"
16-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/net"
17-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/personal"
18-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/txpool"
19-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/web3"
20-
"github.com/tharsis/ethermint/ethereum/rpc/types"
11+
"github.com/tharsis/ethermint/rpc/ethereum/backend"
12+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/debug"
13+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth"
14+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth/filters"
15+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/miner"
16+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/net"
17+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/personal"
18+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/txpool"
19+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/web3"
20+
"github.com/tharsis/ethermint/rpc/ethereum/types"
2121

2222
rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
2323
)

‎ethereum/rpc/doc.go renamed to ‎rpc/doc.go

File renamed without changes.

‎ethereum/rpc/backend/backend.go renamed to ‎rpc/ethereum/backend/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/ethereum/go-ethereum/common/hexutil"
3131
ethtypes "github.com/ethereum/go-ethereum/core/types"
3232

33-
"github.com/tharsis/ethermint/ethereum/rpc/namespaces/eth/filters"
34-
"github.com/tharsis/ethermint/ethereum/rpc/types"
33+
"github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth/filters"
34+
"github.com/tharsis/ethermint/rpc/ethereum/types"
3535
"github.com/tharsis/ethermint/server/config"
3636
ethermint "github.com/tharsis/ethermint/types"
3737
evmtypes "github.com/tharsis/ethermint/x/evm/types"

‎ethereum/rpc/backend/utils.go renamed to ‎rpc/ethereum/backend/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/tendermint/tendermint/libs/log"
1515

1616
"github.com/ethereum/go-ethereum/common/hexutil"
17-
"github.com/tharsis/ethermint/ethereum/rpc/types"
17+
"github.com/tharsis/ethermint/rpc/ethereum/types"
1818
evmtypes "github.com/tharsis/ethermint/x/evm/types"
1919
)
2020

‎ethereum/rpc/namespaces/debug/api.go renamed to ‎rpc/ethereum/namespaces/debug/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/cosmos/cosmos-sdk/server"
2323
"github.com/ethereum/go-ethereum/common"
2424
"github.com/tendermint/tendermint/libs/log"
25-
"github.com/tharsis/ethermint/ethereum/rpc/backend"
26-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
25+
"github.com/tharsis/ethermint/rpc/ethereum/backend"
26+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
2727
)
2828

2929
// HandlerT keeps track of the cpu profiler and trace execution

‎ethereum/rpc/namespaces/debug/trace.go renamed to ‎rpc/ethereum/namespaces/debug/trace.go

File renamed without changes.

‎ethereum/rpc/namespaces/debug/trace_fallback.go renamed to ‎rpc/ethereum/namespaces/debug/trace_fallback.go

File renamed without changes.

‎ethereum/rpc/namespaces/debug/utils.go renamed to ‎rpc/ethereum/namespaces/debug/utils.go

File renamed without changes.

‎ethereum/rpc/namespaces/eth/api.go renamed to ‎rpc/ethereum/namespaces/eth/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/ethereum/go-ethereum/crypto"
3131

3232
"github.com/tharsis/ethermint/crypto/hd"
33-
"github.com/tharsis/ethermint/ethereum/rpc/backend"
34-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
33+
"github.com/tharsis/ethermint/rpc/ethereum/backend"
34+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
3535
ethermint "github.com/tharsis/ethermint/types"
3636
evmtypes "github.com/tharsis/ethermint/x/evm/types"
3737
)

‎ethereum/rpc/namespaces/eth/filters/api.go renamed to ‎rpc/ethereum/namespaces/eth/filters/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77
"time"
88

9-
"github.com/tharsis/ethermint/ethereum/rpc/types"
9+
"github.com/tharsis/ethermint/rpc/ethereum/types"
1010

1111
"github.com/tendermint/tendermint/libs/log"
1212

‎ethereum/rpc/namespaces/eth/filters/filter_system.go renamed to ‎rpc/ethereum/namespaces/eth/filters/filter_system.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
sdk "github.com/cosmos/cosmos-sdk/types"
2424

25-
"github.com/tharsis/ethermint/ethereum/rpc/pubsub"
25+
"github.com/tharsis/ethermint/rpc/ethereum/pubsub"
2626
evmtypes "github.com/tharsis/ethermint/x/evm/types"
2727
)
2828

‎ethereum/rpc/namespaces/eth/filters/filters.go renamed to ‎rpc/ethereum/namespaces/eth/filters/filters.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/binary"
66
"math/big"
77

8-
"github.com/tharsis/ethermint/ethereum/rpc/types"
8+
"github.com/tharsis/ethermint/rpc/ethereum/types"
99

1010
"github.com/pkg/errors"
1111
"github.com/tendermint/tendermint/libs/log"

‎ethereum/rpc/namespaces/eth/filters/subscription.go renamed to ‎rpc/ethereum/namespaces/eth/filters/subscription.go

File renamed without changes.

‎ethereum/rpc/namespaces/eth/filters/utils.go renamed to ‎rpc/ethereum/namespaces/eth/filters/utils.go

File renamed without changes.

‎ethereum/rpc/namespaces/miner/api.go renamed to ‎rpc/ethereum/namespaces/miner/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/tendermint/tendermint/libs/log"
2222
tmtypes "github.com/tendermint/tendermint/types"
2323

24-
"github.com/tharsis/ethermint/ethereum/rpc/backend"
25-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
24+
"github.com/tharsis/ethermint/rpc/ethereum/backend"
25+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
2626
"github.com/tharsis/ethermint/server/config"
2727
)
2828

‎ethereum/rpc/namespaces/miner/unsupported.go renamed to ‎rpc/ethereum/namespaces/miner/unsupported.go

File renamed without changes.

‎ethereum/rpc/namespaces/net/api.go renamed to ‎rpc/ethereum/namespaces/net/api.go

File renamed without changes.

‎ethereum/rpc/namespaces/personal/api.go renamed to ‎rpc/ethereum/namespaces/personal/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77
"time"
88

9-
"github.com/tharsis/ethermint/ethereum/rpc/backend"
9+
"github.com/tharsis/ethermint/rpc/ethereum/backend"
1010

1111
"github.com/cosmos/cosmos-sdk/client"
1212

@@ -25,7 +25,7 @@ import (
2525
"github.com/ethereum/go-ethereum/crypto"
2626

2727
"github.com/tharsis/ethermint/crypto/ethsecp256k1"
28-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
28+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
2929
)
3030

3131
// PrivateAccountAPI is the personal_ prefixed set of APIs in the Web3 JSON-RPC spec.

‎ethereum/rpc/namespaces/txpool/api.go renamed to ‎rpc/ethereum/namespaces/txpool/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/ethereum/go-ethereum/common/hexutil"
77

8-
"github.com/tharsis/ethermint/ethereum/rpc/types"
8+
"github.com/tharsis/ethermint/rpc/ethereum/types"
99
)
1010

1111
// PublicAPI offers and API for the transaction pool. It only operates on data that is non-confidential.

‎ethereum/rpc/namespaces/web3/api.go renamed to ‎rpc/ethereum/namespaces/web3/api.go

File renamed without changes.

‎ethereum/rpc/pubsub/pubsub.go renamed to ‎rpc/ethereum/pubsub/pubsub.go

File renamed without changes.

‎ethereum/rpc/pubsub/pubsub_test.go renamed to ‎rpc/ethereum/pubsub/pubsub_test.go

File renamed without changes.

‎ethereum/rpc/types/addrlock.go renamed to ‎rpc/ethereum/types/addrlock.go

File renamed without changes.

‎ethereum/rpc/types/block.go renamed to ‎rpc/ethereum/types/block.go

File renamed without changes.

‎ethereum/rpc/types/block_test.go renamed to ‎rpc/ethereum/types/block_test.go

File renamed without changes.

‎ethereum/rpc/types/query_client.go renamed to ‎rpc/ethereum/types/query_client.go

File renamed without changes.

‎ethereum/rpc/types/types.go renamed to ‎rpc/ethereum/types/types.go

File renamed without changes.

‎ethereum/rpc/types/utils.go renamed to ‎rpc/ethereum/types/utils.go

File renamed without changes.

‎ethereum/rpc/websockets.go renamed to ‎rpc/websockets.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
2525
tmtypes "github.com/tendermint/tendermint/types"
2626

27-
rpcfilters "github.com/tharsis/ethermint/ethereum/rpc/namespaces/eth/filters"
28-
"github.com/tharsis/ethermint/ethereum/rpc/types"
27+
rpcfilters "github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth/filters"
28+
"github.com/tharsis/ethermint/rpc/ethereum/types"
2929
"github.com/tharsis/ethermint/server/config"
3030
evmtypes "github.com/tharsis/ethermint/x/evm/types"
3131
)

‎server/json_rpc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cosmos/cosmos-sdk/server"
1212
"github.com/cosmos/cosmos-sdk/server/types"
1313
ethrpc "github.com/ethereum/go-ethereum/rpc"
14-
"github.com/tharsis/ethermint/ethereum/rpc"
14+
"github.com/tharsis/ethermint/rpc"
1515

1616
"github.com/tharsis/ethermint/server/config"
1717
)

‎server/start.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import (
4141
sdk "github.com/cosmos/cosmos-sdk/types"
4242

4343
ethlog "github.com/ethereum/go-ethereum/log"
44-
ethdebug "github.com/tharsis/ethermint/ethereum/rpc/namespaces/debug"
4544
"github.com/tharsis/ethermint/log"
45+
ethdebug "github.com/tharsis/ethermint/rpc/ethereum/namespaces/debug"
4646
"github.com/tharsis/ethermint/server/config"
4747
srvflags "github.com/tharsis/ethermint/server/flags"
4848
)

‎tests/rpc/rpc_pending_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/ethereum/go-ethereum/common/hexutil"
1616
"github.com/stretchr/testify/require"
1717

18-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
18+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
1919
)
2020

2121
// func TestMain(m *testing.M) {

‎tests/rpc/rpc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
"github.com/stretchr/testify/require"
2121

22-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
22+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
2323
ethermint "github.com/tharsis/ethermint/types"
2424
evmtypes "github.com/tharsis/ethermint/x/evm/types"
2525

‎testutil/network/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
3131
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
3232

33-
"github.com/tharsis/ethermint/ethereum/rpc"
33+
"github.com/tharsis/ethermint/rpc"
3434
ethsrv "github.com/tharsis/ethermint/server"
3535
ethermint "github.com/tharsis/ethermint/types"
3636
)

‎x/evm/client/cli/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cli
22

33
import (
44
"github.com/spf13/cobra"
5-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
5+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
66

77
"github.com/cosmos/cosmos-sdk/client"
88
"github.com/cosmos/cosmos-sdk/client/flags"

‎x/evm/client/rest/rest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/cosmos/cosmos-sdk/types/rest"
1515
authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
1616

17-
rpctypes "github.com/tharsis/ethermint/ethereum/rpc/types"
17+
rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types"
1818

1919
"github.com/ethereum/go-ethereum/common"
2020
)

0 commit comments

Comments
 (0)