Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: go mod version is not bumped #829

Merged
merged 5 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ lint-nix:
### Releasing ###
###############################################################################

PACKAGE_NAME:=github.com/crypto-org-chain/cronos
PACKAGE_NAME:=github.com/crypto-org-chain/cronos/v2
GOLANG_CROSS_VERSION = v1.18
release-dry-run:
docker run \
Expand Down Expand Up @@ -162,7 +162,7 @@ release:
### Sim Test ###
###############################################################################

SIMAPP = github.com/crypto-org-chain/cronos/app
SIMAPP = github.com/crypto-org-chain/cronos/v2/app

# Install the runsim binary with a temporary workaround of entering an outside
# directory as the "go get" command ignores the -mod option and will polute the
Expand Down
16 changes: 8 additions & 8 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"path/filepath"

"github.com/crypto-org-chain/cronos/x/cronos/middleware"
"github.com/crypto-org-chain/cronos/v2/x/cronos/middleware"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec/types"
Expand Down Expand Up @@ -121,21 +121,21 @@ import (

// this line is used by starport scaffolding # stargate/app/moduleImport

"github.com/crypto-org-chain/cronos/x/cronos"
cronosclient "github.com/crypto-org-chain/cronos/x/cronos/client"
cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
evmhandlers "github.com/crypto-org-chain/cronos/x/cronos/keeper/evmhandlers"
cronostypes "github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos"
cronosclient "github.com/crypto-org-chain/cronos/v2/x/cronos/client"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
evmhandlers "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/evmhandlers"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"

// unnamed import of statik for swagger UI support
_ "github.com/crypto-org-chain/cronos/client/docs/statik"
_ "github.com/crypto-org-chain/cronos/v2/client/docs/statik"

// Force-load the tracer engines to trigger registration
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
_ "github.com/ethereum/go-ethereum/eth/tracers/native"

// force register the extension json-rpc.
_ "github.com/crypto-org-chain/cronos/x/cronos/rpc"
_ "github.com/crypto-org-chain/cronos/v2/x/cronos/rpc"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/prefix.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
sdk "github.com/cosmos/cosmos-sdk/types"
cmdcfg "github.com/crypto-org-chain/cronos/cmd/cronosd/config"
cmdcfg "github.com/crypto-org-chain/cronos/v2/cmd/cronosd/config"
ethcfg "github.com/evmos/ethermint/cmd/config"
)

Expand Down
2 changes: 1 addition & 1 deletion app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

cronosmoduletypes "github.com/crypto-org-chain/cronos/x/cronos/types"
cronosmoduletypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

// Get flags every time the simulator is run
Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/crypto-org-chain/cronos/x/cronos"
cronostypes "github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/cronosd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

"github.com/crypto-org-chain/cronos/cmd/cronosd/experimental"
"github.com/crypto-org-chain/cronos/x/cronos"
"github.com/crypto-org-chain/cronos/v2/cmd/cronosd/experimental"
"github.com/crypto-org-chain/cronos/v2/x/cronos"

"github.com/cosmos/cosmos-sdk/simapp/params"
"github.com/cosmos/cosmos-sdk/snapshots"
Expand Down Expand Up @@ -45,7 +45,7 @@ import (
servercfg "github.com/evmos/ethermint/server/config"
ethermint "github.com/evmos/ethermint/types"

"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/v2/app"
// this line is used by starport scaffolding # stargate/root/import
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cronosd/experimental/util.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package experimental

import (
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/v2/app"
gravitycmd "github.com/peggyjv/gravity-bridge/module/v2/cmd/gravity/cmd"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/cronosd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/cmd"
"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/v2/cmd/cronosd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/crypto-org-chain/cronos
module github.com/crypto-org-chain/cronos/v2

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion proto/cronos/cronos.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cronos;

import "gogoproto/gogo.proto";

option go_package = "github.com/crypto-org-chain/cronos/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/v2/x/cronos/types";

// Params defines the parameters for the cronos module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/cronos/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "cronos/cronos.proto";

// this line is used by starport scaffolding # genesis/proto/import

option go_package = "github.com/crypto-org-chain/cronos/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/v2/x/cronos/types";

// GenesisState defines the cronos module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/cronos/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "ethermint/evm/v1/tx.proto";
import "cronos/cronos.proto";
// this line is used by starport scaffolding # 1

option go_package = "github.com/crypto-org-chain/cronos/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/v2/x/cronos/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/cronos/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cronos/cronos.proto";

option go_package = "github.com/crypto-org-chain/cronos/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/v2/x/cronos/types";

// Msg defines the Cronos Msg service
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion scripts/protocgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ done
cd ..

# move proto files to the right places
cp -r github.com/crypto-org-chain/cronos/* ./
cp -r github.com/crypto-org-chain/cronos/v2/* ./
rm -rf github.com

go mod tidy -compat=1.17
2 changes: 1 addition & 1 deletion testutil/simapp/simapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
tmdb "github.com/tendermint/tm-db"

"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/v2/app"
)

// New creates application instance with in-memory database and disabled logging.
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"

"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

// GetQueryCmd returns the cli query commands for this module
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/client/cli/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
// "github.com/cosmos/cosmos-sdk/client/flags"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

// GetTxCmd returns the transaction commands for this module
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/client/proposal_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client
import (
govclient "github.com/cosmos/cosmos-sdk/x/gov/client"

"github.com/crypto-org-chain/cronos/x/cronos/client/cli"
"github.com/crypto-org-chain/cronos/v2/x/cronos/client/cli"
)

// ProposalHandler is the token mapping change proposal handler.
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
4 changes: 2 additions & 2 deletions x/cronos/genesis_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cronos_test

import (
"github.com/crypto-org-chain/cronos/x/cronos"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

func (suite *CronosTestSuite) TestInitGenesis() {
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/handler.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"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

// NewHandler for Cronos
Expand Down
6 changes: 3 additions & 3 deletions x/cronos/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/x/cronos"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/v2/x/cronos"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/stretchr/testify/suite"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/keeper/evm.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
evmtypes "github.com/evmos/ethermint/x/evm/types"

"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

// DefaultGasCap defines the gas limit used to run internal evm call
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/keeper/evm_hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/big"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
10 changes: 5 additions & 5 deletions x/cronos/keeper/evm_hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"fmt"
"math/big"

handlers "github.com/crypto-org-chain/cronos/x/cronos/keeper/evmhandlers"
handlers "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/evmhandlers"

gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types"

"github.com/crypto-org-chain/cronos/app"
keepertest "github.com/crypto-org-chain/cronos/x/cronos/keeper/mock"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/app"
keepertest "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/mock"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"

sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
cronosmodulekeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
cronosmodulekeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/keeper/evm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
"math/big"

"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ethereum/go-ethereum/common"
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/cancel_send_to_evm_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = CancelSendToEvmChainHandler{}
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/send_cro_to_ibc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = SendCroToIbcHandler{}
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/send_to_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = SendToAccountHandler{}
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/send_to_evm_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = SendToEvmChainHandler{}
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/send_to_ibc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = SendToIbcHandler{}
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/keeper/evmhandlers/send_to_ibc_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
)

var _ types.EvmLogHandler = SendToIbcV2Handler{}
Expand Down
10 changes: 5 additions & 5 deletions x/cronos/keeper/evmhandlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/crypto-org-chain/cronos/app"
cronosmodulekeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
evmhandlers "github.com/crypto-org-chain/cronos/x/cronos/keeper/evmhandlers"
keepertest "github.com/crypto-org-chain/cronos/x/cronos/keeper/mock"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/crypto-org-chain/cronos/v2/app"
cronosmodulekeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
evmhandlers "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/evmhandlers"
keepertest "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/mock"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
gravitykeeper "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/keeper"
gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types"
Expand Down
Loading