Skip to content

Commit 867df9f

Browse files
k-yangk-yang
committed
clean up imports
1 parent e5e7229 commit 867df9f

File tree

8 files changed

+51
-39
lines changed

8 files changed

+51
-39
lines changed

‎app/ante.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import (
55

66
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
77
sdk "github.com/cosmos/cosmos-sdk/types"
8-
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
9-
108
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
9+
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
1110

1211
"github.com/NibiruChain/nibiru/v2/app/ante"
1312
"github.com/NibiruChain/nibiru/v2/app/evmante"

‎app/upgrades/v1_0_1/constants.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package v1_0_1
22

33
import (
4-
"github.com/cosmos/cosmos-sdk/store/types"
4+
"cosmossdk.io/store/types"
5+
upgradetypes "cosmossdk.io/x/upgrade/types"
56
sdk "github.com/cosmos/cosmos-sdk/types"
67
"github.com/cosmos/cosmos-sdk/types/module"
7-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
8+
clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
99

1010
"github.com/NibiruChain/nibiru/v2/app/upgrades"
1111
)

‎app/upgrades/v1_0_2/constants.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package v1_0_2
22

33
import (
4-
"github.com/cosmos/cosmos-sdk/store/types"
4+
"cosmossdk.io/store/types"
5+
upgradetypes "cosmossdk.io/x/upgrade/types"
56
sdk "github.com/cosmos/cosmos-sdk/types"
67
"github.com/cosmos/cosmos-sdk/types/module"
7-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
8+
clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
99

1010
"github.com/NibiruChain/nibiru/v2/app/upgrades"
1111
)

‎app/upgrades/v1_0_3/constants.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package v1_0_3
22

33
import (
4-
"github.com/cosmos/cosmos-sdk/store/types"
4+
"cosmossdk.io/store/types"
5+
upgradetypes "cosmossdk.io/x/upgrade/types"
56
sdk "github.com/cosmos/cosmos-sdk/types"
67
"github.com/cosmos/cosmos-sdk/types/module"
7-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
8+
clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
99

1010
"github.com/NibiruChain/nibiru/v2/app/upgrades"
1111
)

‎app/upgrades/v1_5_0/constants.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package v1_5_0
22

33
import (
4-
"github.com/cosmos/cosmos-sdk/store/types"
4+
"cosmossdk.io/store/types"
5+
upgradetypes "cosmossdk.io/x/upgrade/types"
56
sdk "github.com/cosmos/cosmos-sdk/types"
67
"github.com/cosmos/cosmos-sdk/types/module"
7-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
8+
clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
99

1010
"github.com/NibiruChain/nibiru/v2/app/upgrades"
1111
)

‎app/upgrades/v2_0_0/constants.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package v2_0_0
22

33
import (
4-
"github.com/cosmos/cosmos-sdk/store/types"
4+
"cosmossdk.io/store/types"
5+
upgradetypes "cosmossdk.io/x/upgrade/types"
56
sdk "github.com/cosmos/cosmos-sdk/types"
67
"github.com/cosmos/cosmos-sdk/types/module"
7-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
8+
clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
99

1010
"github.com/NibiruChain/nibiru/v2/app/upgrades"
1111
evmtypes "github.com/NibiruChain/nibiru/v2/x/evm"

‎proto/eth/evm/v1/query.proto

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ service Query {
2121

2222
// ValidatorAccount queries an Ethereum account's from a validator consensus
2323
// Address.
24-
rpc ValidatorAccount(QueryValidatorAccountRequest) returns (QueryValidatorAccountResponse) {
25-
option (google.api.http).get = "/nibiru/evm/v1/validator_account/{cons_address}";
24+
rpc ValidatorAccount(QueryValidatorAccountRequest)
25+
returns (QueryValidatorAccountResponse) {
26+
option (google.api.http).get =
27+
"/nibiru/evm/v1/validator_account/{cons_address}";
2628
}
2729

2830
// Balance queries the balance of a the EVM denomination for a single
@@ -61,7 +63,8 @@ service Query {
6163
option (google.api.http).get = "/nibiru/evm/v1/trace_tx";
6264
}
6365

64-
// TraceBlock implements the `debug_traceBlockByNumber` and `debug_traceBlockByHash` rpc api
66+
// TraceBlock implements the `debug_traceBlockByNumber` and
67+
// `debug_traceBlockByHash` rpc api
6568
rpc TraceBlock(QueryTraceBlockRequest) returns (QueryTraceBlockResponse) {
6669
option (google.api.http).get = "/nibiru/evm/v1/trace_block";
6770
}
@@ -77,7 +80,8 @@ service Query {
7780
option (google.api.http).get = "/nibiru/evm/v1/base_fee";
7881
}
7982

80-
rpc FunTokenMapping(QueryFunTokenMappingRequest) returns (QueryFunTokenMappingResponse) {
83+
rpc FunTokenMapping(QueryFunTokenMappingRequest)
84+
returns (QueryFunTokenMappingResponse) {
8185
option (google.api.http).get = "/nibiru/evm/v1/funtoken/{token}";
8286
}
8387
}
@@ -87,11 +91,13 @@ message QueryEthAccountRequest {
8791
option (gogoproto.equal) = false;
8892
option (gogoproto.goproto_getters) = false;
8993

90-
// address is the Ethereum hex address or nibi Bech32 address to query the account for.
94+
// address is the Ethereum hex address or nibi Bech32 address to query the
95+
// account for.
9196
string address = 1;
9297
}
9398

94-
// QueryEthAccountResponse is the response type for the Query/EthAccount RPC method.
99+
// QueryEthAccountResponse is the response type for the Query/EthAccount RPC
100+
// method.
95101
message QueryEthAccountResponse {
96102
// balance is the balance of unibi (micronibi).
97103
string balance = 1;
@@ -102,8 +108,8 @@ message QueryEthAccountResponse {
102108
// nonce is the account's sequence number.
103109
uint64 nonce = 4;
104110

105-
// eth_address: The hexadecimal-encoded string representing the 20 byte address
106-
// of a Nibiru EVM account.
111+
// eth_address: The hexadecimal-encoded string representing the 20 byte
112+
// address of a Nibiru EVM account.
107113
string eth_address = 5;
108114

109115
// bech32_address is the nibi-prefixed address of the account that can receive
@@ -209,7 +215,7 @@ message QueryParamsRequest {}
209215
// QueryParamsResponse defines the response type for querying x/evm parameters.
210216
message QueryParamsResponse {
211217
// params define the evm module parameters.
212-
Params params = 1 [(gogoproto.nullable) = false];
218+
Params params = 1 [ (gogoproto.nullable) = false ];
213219
}
214220

215221
// EthCallRequest defines EthCall request
@@ -219,7 +225,8 @@ message EthCallRequest {
219225
// gas_cap defines the default gas cap to be used
220226
uint64 gas_cap = 2;
221227
// proposer_address of the requested block in hex format
222-
bytes proposer_address = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
228+
bytes proposer_address = 3
229+
[ (gogoproto.casttype) = "cosmossdk.io/types.ConsAddress" ];
223230
// chain_id is the eip155 chain id parsed from the requested block header
224231
int64 chain_id = 4;
225232
}
@@ -247,9 +254,11 @@ message QueryTraceTxRequest {
247254
// block_hash of requested transaction
248255
string block_hash = 6;
249256
// block_time of requested transaction
250-
google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
257+
google.protobuf.Timestamp block_time = 7
258+
[ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ];
251259
// proposer_address is the proposer of the requested block
252-
bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
260+
bytes proposer_address = 8
261+
[ (gogoproto.casttype) = "cosmossdk.io/types.ConsAddress" ];
253262
// chain_id is the the eip155 chain id parsed from the requested block header
254263
int64 chain_id = 9;
255264
// block_max_gas of the block of the requested transaction
@@ -273,9 +282,11 @@ message QueryTraceBlockRequest {
273282
// block_hash (hex) of the traced block
274283
string block_hash = 6;
275284
// block_time of the traced block
276-
google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
285+
google.protobuf.Timestamp block_time = 7
286+
[ (gogoproto.nullable) = false, (gogoproto.stdtime) = true ];
277287
// proposer_address is the address of the requested block
278-
bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
288+
bytes proposer_address = 8
289+
[ (gogoproto.casttype) = "cosmossdk.io/types.ConsAddress" ];
279290
// chain_id is the eip155 chain id parsed from the requested block header
280291
int64 chain_id = 9;
281292
// block_max_gas of the traced block
@@ -293,26 +304,28 @@ message QueryTraceBlockResponse {
293304
message QueryBaseFeeRequest {}
294305

295306
// QueryBaseFeeResponse returns the EIP1559 base fee.
296-
// See https://github.com/ethereum/EIPs/blob/ba6c342c23164072adb500c3136e3ae6eabff306/EIPS/eip-1559.md.
307+
// See
308+
// https://github.com/ethereum/EIPs/blob/ba6c342c23164072adb500c3136e3ae6eabff306/EIPS/eip-1559.md.
297309
message QueryBaseFeeResponse {
298310
// base_fee is the EIP1559 base fee in units of wei.
299-
string base_fee = 1 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
311+
string base_fee = 1 [ (gogoproto.customtype) = "cosmossdk.io/math.Int" ];
300312
// base_fee is the EIP1559 base fee in units of micronibi ("unibi").
301-
string base_fee_unibi = 2 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
313+
string base_fee_unibi = 2
314+
[ (gogoproto.customtype) = "cosmossdk.io/math.Int" ];
302315
}
303316

304317
message QueryFunTokenMappingRequest {
305318
option (gogoproto.equal) = false;
306319
option (gogoproto.goproto_getters) = false;
307320

308-
// Either the hexadecimal-encoded ERC20 contract address or denomination of the
309-
// Bank Coin.
321+
// Either the hexadecimal-encoded ERC20 contract address or denomination of
322+
// the Bank Coin.
310323
string token = 1;
311324
}
312325

313326
message QueryFunTokenMappingResponse {
314327
option (gogoproto.equal) = false;
315-
option (gogoproto.goproto_getters) = false;
328+
option (gogoproto.goproto_getters) = false;
316329

317330
// fun_token is a mapping between the Bank Coin and the ERC20 contract address
318331
eth.evm.v1.FunToken fun_token = 1;

‎proto/nibiru/inflation/v1/query.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ message QueryEpochMintProvisionResponse {
6565
// epoch_mint_provision is the current minting per epoch provision value.
6666
cosmos.base.v1beta1.DecCoin epoch_mint_provision = 1 [
6767
(gogoproto.nullable) = false,
68-
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"
68+
(gogoproto.castrepeated) = "cosmossdk.io/types.DecCoins"
6969
];
7070
}
7171

@@ -91,7 +91,7 @@ message QueryCirculatingSupplyResponse {
9191
// circulating_supply is the total amount of coins in circulation
9292
cosmos.base.v1beta1.DecCoin circulating_supply = 1 [
9393
(gogoproto.nullable) = false,
94-
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"
94+
(gogoproto.castrepeated) = "cosmossdk.io/types.DecCoins"
9595
];
9696
}
9797

0 commit comments

Comments
 (0)