Skip to content

Commit

Permalink
chore: bump nibi go package version to v2 (#1999)
Browse files Browse the repository at this point in the history
* chore: bump nibi go package version to v2

* chore: update changelog

* chore: update nibi imports

* chore: proto files - upgrade to version v2
  • Loading branch information
ruslan-sh-r authored Aug 13, 2024
1 parent 53a2d71 commit 7a20389
Show file tree
Hide file tree
Showing 436 changed files with 2,177 additions and 2,167 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#1899](https://github.com/NibiruChain/nibiru/pull/1899) - build(deps): cometbft v0.37.5, cosmos-sdk v0.47.11, proto-builder v0.14.0
- [#1913](https://github.com/NibiruChain/nibiru/pull/1913) - fix(tests): race condition from heavy Network tests
- [#1992](https://github.com/NibiruChain/nibiru/pull/1992) - chore: enabled grpc for localnet
- [#1999](https://github.com/NibiruChain/nibiru/pull/1999) - chore: update nibi go package version to v2

### Dependencies

Expand Down
6 changes: 3 additions & 3 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

authante "github.com/cosmos/cosmos-sdk/x/auth/ante"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/app/evmante"
devgasante "github.com/NibiruChain/nibiru/x/devgas/v1/ante"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/app/evmante"
devgasante "github.com/NibiruChain/nibiru/v2/x/devgas/v1/ante"
)

// NewAnteHandler returns and AnteHandler that checks and increments sequence
Expand Down
6 changes: 3 additions & 3 deletions app/ante/commission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

codectypes "github.com/cosmos/cosmos-sdk/codec/types"

"github.com/NibiruChain/nibiru/app"
"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/x/common/testutil"
"github.com/NibiruChain/nibiru/v2/app"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/x/common/testutil"
)

func (s *AnteTestSuite) TestAnteDecoratorStakingCommission() {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/fixed_gas.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdkerrors "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"

oracletypes "github.com/NibiruChain/nibiru/x/oracle/types"
oracletypes "github.com/NibiruChain/nibiru/v2/x/oracle/types"
)

const OracleMessageGas = 500
Expand Down
10 changes: 5 additions & 5 deletions app/ante/fixed_gas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/bank/types"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/app/appconst"
"github.com/NibiruChain/nibiru/x/common/testutil"
"github.com/NibiruChain/nibiru/x/common/testutil/testapp"
oracletypes "github.com/NibiruChain/nibiru/x/oracle/types"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/app/appconst"
"github.com/NibiruChain/nibiru/v2/x/common/testutil"
"github.com/NibiruChain/nibiru/v2/x/common/testutil/testapp"
oracletypes "github.com/NibiruChain/nibiru/v2/x/oracle/types"
)

func (suite *AnteTestSuite) TestOraclePostPriceTransactionsHaveFixedPrice() {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/gas_wanted.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/v2/eth"
)

// AnteDecoratorGasWanted keeps track of the gasWanted amount on the current block in
Expand Down
4 changes: 2 additions & 2 deletions app/ante/gas_wanted_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *AnteTestSuite) TestGasWantedDecorator() {
Expand Down
6 changes: 3 additions & 3 deletions app/ante/handler_opts.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"

devgasante "github.com/NibiruChain/nibiru/x/devgas/v1/ante"
devgaskeeper "github.com/NibiruChain/nibiru/x/devgas/v1/keeper"
evmkeeper "github.com/NibiruChain/nibiru/x/evm/keeper"
devgasante "github.com/NibiruChain/nibiru/v2/x/devgas/v1/ante"
devgaskeeper "github.com/NibiruChain/nibiru/v2/x/devgas/v1/keeper"
evmkeeper "github.com/NibiruChain/nibiru/v2/x/evm/keeper"
)

type AnteHandlerOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/reject_ethereum_tx_msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

// AnteDecoratorPreventEtheruemTxMsgs prevents invalid msg types from being executed
Expand Down
4 changes: 2 additions & 2 deletions app/ante/reject_ethereum_tx_msgs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ante_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *AnteTestSuite) TestAnteDecoratorPreventEtheruemTxMsgs() {
Expand Down
6 changes: 3 additions & 3 deletions app/ante/testutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (

tmproto "github.com/cometbft/cometbft/proto/tendermint/types"

"github.com/NibiruChain/nibiru/app"
nibiruante "github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/x/common/testutil/testapp"
"github.com/NibiruChain/nibiru/v2/app"
nibiruante "github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/x/common/testutil/testapp"
)

// AnteTestSuite is a test suite to be used with ante handler tests.
Expand Down
6 changes: 3 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/app/wasmext"
"github.com/NibiruChain/nibiru/x/evm/precompile"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/app/wasmext"
"github.com/NibiruChain/nibiru/v2/x/evm/precompile"

dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
Expand Down
2 changes: 1 addition & 1 deletion app/appconst/appconst_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/suite"

"github.com/NibiruChain/nibiru/app/appconst"
"github.com/NibiruChain/nibiru/v2/app/appconst"
)

type TestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/NibiruChain/nibiru/app/codec"
"github.com/NibiruChain/nibiru/v2/app/codec"
)

// EncodingConfig specifies the concrete encoding types to use for a given app.
Expand Down
4 changes: 2 additions & 2 deletions app/evmante/evmante_can_transfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
gethcommon "github.com/ethereum/go-ethereum/common"
gethcore "github.com/ethereum/go-ethereum/core/types"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

// CanTransferDecorator checks if the sender is allowed to transfer funds according to the EVM block
Expand Down
10 changes: 5 additions & 5 deletions app/evmante/evmante_can_transfer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package evmante_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/x/common/testutil/testapp"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/eth"
"github.com/NibiruChain/nibiru/v2/x/common/testutil/testapp"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

func (s *TestSuite) TestCanTransferDecorator() {
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_emit_event.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

// EthEmitEventDecorator emit events in ante handler in case of tx execution failed (out of block gas limit).
Expand Down
8 changes: 4 additions & 4 deletions app/evmante/evmante_emit_event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm"

"github.com/NibiruChain/nibiru/x/evm/evmtest"
tf "github.com/NibiruChain/nibiru/x/tokenfactory/types"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
tf "github.com/NibiruChain/nibiru/v2/x/tokenfactory/types"
)

func (s *TestSuite) TestEthEmitEventDecorator() {
Expand Down
6 changes: 3 additions & 3 deletions app/evmante/evmante_gas_consume.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
gethcommon "github.com/ethereum/go-ethereum/common"

"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/keeper"
"github.com/NibiruChain/nibiru/v2/eth"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/keeper"
)

// AnteDecEthGasConsume validates enough intrinsic gas for the transaction and
Expand Down
10 changes: 5 additions & 5 deletions app/evmante/evmante_gas_consume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

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

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/eth"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

func (s *TestSuite) TestAnteDecEthGasConsume() {
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package evmante
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/v2/app/ante"
)

// NewAnteHandlerEVM creates the default ante handler for Ethereum transactions
Expand Down
12 changes: 6 additions & 6 deletions app/evmante/evmante_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"

"github.com/NibiruChain/nibiru/app/ante"
"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/eth"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

func (s *TestSuite) TestAnteHandlerEVM() {
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_increment_sender_seq.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
gethcommon "github.com/ethereum/go-ethereum/common"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

// AnteDecEthIncrementSenderSequence increments the sequence of the signers.
Expand Down
6 changes: 3 additions & 3 deletions app/evmante/evmante_increment_sender_seq_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

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

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

func (s *TestSuite) TestAnteDecEthIncrementSenderSequence() {
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_mempool_fees.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

var _ sdk.AnteDecorator = MempoolGasPriceDecorator{}
Expand Down
4 changes: 2 additions & 2 deletions app/evmante/evmante_mempool_fees_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *TestSuite) TestMempoolGasFeeDecorator() {
Expand Down
4 changes: 2 additions & 2 deletions app/evmante/evmante_setup_ctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *TestSuite) TestEthSetupContextDecorator() {
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_sigverify.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
gethcore "github.com/ethereum/go-ethereum/core/types"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

// EthSigVerificationDecorator validates an ethereum signatures
Expand Down
6 changes: 3 additions & 3 deletions app/evmante/evmante_sigverify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
tf "github.com/NibiruChain/nibiru/x/tokenfactory/types"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
tf "github.com/NibiruChain/nibiru/v2/x/tokenfactory/types"
)

var InvalidChainID = big.NewInt(987654321)
Expand Down
2 changes: 1 addition & 1 deletion app/evmante/evmante_validate_basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
gethcore "github.com/ethereum/go-ethereum/core/types"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm"
)

// EthValidateBasicDecorator is adapted from ValidateBasicDecorator from cosmos-sdk, it ignores ErrNoSignatures
Expand Down
10 changes: 5 additions & 5 deletions app/evmante/evmante_validate_basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/ethereum/go-ethereum/common"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/eth"
"github.com/NibiruChain/nibiru/x/common/testutil"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/eth"
"github.com/NibiruChain/nibiru/v2/x/common/testutil"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *TestSuite) TestEthValidateBasicDecorator() {
Expand Down
6 changes: 3 additions & 3 deletions app/evmante/evmante_verify_eth_acc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
gethcommon "github.com/ethereum/go-ethereum/common"

"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/keeper"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/keeper"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

// AnteDecVerifyEthAcc validates an account balance checks
Expand Down
8 changes: 4 additions & 4 deletions app/evmante/evmante_verify_eth_acc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

gethparams "github.com/ethereum/go-ethereum/params"

"github.com/NibiruChain/nibiru/app/evmante"
"github.com/NibiruChain/nibiru/x/evm"
"github.com/NibiruChain/nibiru/x/evm/evmtest"
"github.com/NibiruChain/nibiru/x/evm/statedb"
"github.com/NibiruChain/nibiru/v2/app/evmante"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
)

func (s *TestSuite) TestAnteDecoratorVerifyEthAcc_CheckTx() {
Expand Down
Loading

0 comments on commit 7a20389

Please sign in to comment.