Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* [#1872](https://github.com/crypto-org-chain/cronos/pull/1872) Support 4byteTracer for tracer
* [#1875](https://github.com/crypto-org-chain/cronos/pull/1875) Support for preinstalls
* [#1882](https://github.com/crypto-org-chain/cronos/pull/1882) Support for eip2935
* [#1880](https://github.com/crypto-org-chain/cronos/pull/1880) Move module from v2 to v1 to follow semver convention
* [#1888](https://github.com/crypto-org-chain/cronos/pull/1888) Patch comet bft (GHSA-hrhf-2vcr-ghch)

*Sep 4, 2025*
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ release-dry-run:
### Sim Test ###
###############################################################################

SIMAPP = github.com/crypto-org-chain/cronos/v2/app
SIMAPP = github.com/crypto-org-chain/cronos/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
26 changes: 13 additions & 13 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ import (
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
"github.com/crypto-org-chain/cronos/client/docs"
memiavlstore "github.com/crypto-org-chain/cronos/store"
"github.com/crypto-org-chain/cronos/v2/client/docs"
"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"
cronosprecompiles "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/precompiles"
"github.com/crypto-org-chain/cronos/v2/x/cronos/middleware"
"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"
cronosprecompiles "github.com/crypto-org-chain/cronos/x/cronos/keeper/precompiles"
"github.com/crypto-org-chain/cronos/x/cronos/middleware"
// force register the extension json-rpc.
_ "github.com/crypto-org-chain/cronos/v2/x/cronos/rpc"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
e2ee "github.com/crypto-org-chain/cronos/v2/x/e2ee"
e2eekeeper "github.com/crypto-org-chain/cronos/v2/x/e2ee/keeper"
e2eekeyring "github.com/crypto-org-chain/cronos/v2/x/e2ee/keyring"
e2eetypes "github.com/crypto-org-chain/cronos/v2/x/e2ee/types"
_ "github.com/crypto-org-chain/cronos/x/cronos/rpc"
cronostypes "github.com/crypto-org-chain/cronos/x/cronos/types"
e2ee "github.com/crypto-org-chain/cronos/x/e2ee"
e2eekeeper "github.com/crypto-org-chain/cronos/x/e2ee/keeper"
e2eekeyring "github.com/crypto-org-chain/cronos/x/e2ee/keyring"
e2eetypes "github.com/crypto-org-chain/cronos/x/e2ee/types"
"github.com/ethereum/go-ethereum/common"
// Force-load the tracer engines to trigger registration
"github.com/ethereum/go-ethereum/core/vm"
Expand Down
2 changes: 1 addition & 1 deletion app/bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
tmtypes "github.com/cometbft/cometbft/types"
dbm "github.com/cosmos/cosmos-db"
memiavlstore "github.com/crypto-org-chain/cronos/store"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
Expand Down
2 changes: 1 addition & 1 deletion app/block_address.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"fmt"

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

"cosmossdk.io/errors"

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

import (
icaauthtypes "github.com/crypto-org-chain/cronos/v2/app/legacy/icaauth/types"
icaauthtypes "github.com/crypto-org-chain/cronos/app/legacy/icaauth/types"

"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
2 changes: 1 addition & 1 deletion app/prefix.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

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

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
dbm "github.com/cosmos/cosmos-db"
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
cronosmoduletypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
cronosmoduletypes "github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/evmos/ethermint/ante/cache"
evmante "github.com/evmos/ethermint/evmd/ante"
evmtypes "github.com/evmos/ethermint/x/evm/types"
Expand Down
2 changes: 1 addition & 1 deletion app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
tmtypes "github.com/cometbft/cometbft/types"
dbm "github.com/cosmos/cosmos-db"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
cronostypes "github.com/crypto-org-chain/cronos/x/cronos/types"
app "github.com/evmos/ethermint/evmd"
"github.com/stretchr/testify/require"

Expand Down
8 changes: 4 additions & 4 deletions cmd/cronosd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
cmtcli "github.com/cometbft/cometbft/libs/cli"
dbm "github.com/cosmos/cosmos-db"
rosettaCmd "github.com/cosmos/rosetta/cmd"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
memiavlcfg "github.com/crypto-org-chain/cronos/store/config"
"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/v2/cmd/cronosd/opendb"
"github.com/crypto-org-chain/cronos/v2/x/cronos"
e2eecli "github.com/crypto-org-chain/cronos/v2/x/e2ee/client/cli"
"github.com/crypto-org-chain/cronos/x/cronos"
e2eecli "github.com/crypto-org-chain/cronos/x/e2ee/client/cli"
ethermintclient "github.com/evmos/ethermint/client"
"github.com/evmos/ethermint/crypto/hd"
ethermintserver "github.com/evmos/ethermint/server"
Expand Down
4 changes: 2 additions & 2 deletions cmd/cronosd/cmd/versiondb.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cmd
import (
"sort"

"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/v2/cmd/cronosd/opendb"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
versiondbclient "github.com/crypto-org-chain/cronos/versiondb/client"
"github.com/linxGnu/grocksdb"
"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 @@ -3,8 +3,8 @@ package main
import (
"os"

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

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
)
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/v2
module github.com/crypto-org-chain/cronos

go 1.23.12

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/v2/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/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/v2/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/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/v2/x/cronos/types";
option go_package = "github.com/crypto-org-chain/cronos/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 @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cronos/cronos.proto";

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

// Msg defines the Cronos Msg service
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion proto/e2ee/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package e2ee;

import "gogoproto/gogo.proto";

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

// EncryptionKeyEntry is a type that contains the owner and the public key.
message EncryptionKeyEntry {
Expand Down
2 changes: 1 addition & 1 deletion proto/e2ee/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package e2ee;

import "google/api/annotations.proto";

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

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/e2ee/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package e2ee;

import "cosmos/msg/v1/msg.proto";

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

// Msg defines the e2ee 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/v2/* ./
cp -r github.com/crypto-org-chain/cronos/* ./
cp -r github.com/crypto-org-chain/cronos/memiavl/* ./memiavl/
rm -rf github.com

Expand Down
2 changes: 1 addition & 1 deletion testutil/simapp/simapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
tmtypes "github.com/cometbft/cometbft/types"
tmdb "github.com/cosmos/cosmos-db"
"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/app"

"cosmossdk.io/log"

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 @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
rpctypes "github.com/evmos/ethermint/rpc/types"
"github.com/spf13/cobra"

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 @@ -10,7 +10,7 @@ import (

icagenesistypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/genesis/types"
icatypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/client/proposal_handler.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

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

govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
)
Expand Down
4 changes: 2 additions & 2 deletions x/cronos/events/decoders.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
"github.com/crypto-org-chain/cronos/v2/x/cronos/events/bindings/cosmos/lib"
generated "github.com/crypto-org-chain/cronos/v2/x/cronos/events/bindings/cosmos/precompile/relayer"
"github.com/crypto-org-chain/cronos/x/cronos/events/bindings/cosmos/lib"
generated "github.com/crypto-org-chain/cronos/x/cronos/events/bindings/cosmos/precompile/relayer"
"github.com/ethereum/go-ethereum/common"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
6 changes: 3 additions & 3 deletions x/cronos/events/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package events
import (
transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types"
ica "github.com/crypto-org-chain/cronos/v2/x/cronos/events/bindings/cosmos/precompile/ica"
relayer "github.com/crypto-org-chain/cronos/v2/x/cronos/events/bindings/cosmos/precompile/relayer"
cronoseventstypes "github.com/crypto-org-chain/cronos/v2/x/cronos/events/types"
ica "github.com/crypto-org-chain/cronos/x/cronos/events/bindings/cosmos/precompile/ica"
relayer "github.com/crypto-org-chain/cronos/x/cronos/events/bindings/cosmos/precompile/relayer"
cronoseventstypes "github.com/crypto-org-chain/cronos/x/cronos/events/types"
"github.com/ethereum/go-ethereum/accounts/abi"
ethtypes "github.com/ethereum/go-ethereum/core/types"

Expand Down
4 changes: 2 additions & 2 deletions x/cronos/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cronos
import (
"fmt"

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

sdk "github.com/cosmos/cosmos-sdk/types"
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/v2/x/cronos"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos"
"github.com/crypto-org-chain/cronos/x/cronos/types"
)

func (suite *CronosTestSuite) TestInitGenesis() {
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 @@ -6,9 +6,9 @@ import (
"time"

tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/crypto-org-chain/cronos/v2/app"
"github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/stretchr/testify/suite"

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 @@ -4,7 +4,7 @@ import (
"fmt"
"math/big"

"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/vm"
Expand Down
2 changes: 1 addition & 1 deletion x/cronos/keeper/evm_hooks.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/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
8 changes: 4 additions & 4 deletions x/cronos/keeper/evm_hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"math/big"

cronosmodulekeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
handlers "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"
cronosmodulekeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
handlers "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/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/v2/x/cronos/types"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
"github.com/evmos/ethermint/crypto/ethsecp256k1"

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 @@ -3,8 +3,8 @@ package evmhandler
import (
"math/big"

cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

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 @@ -4,8 +4,8 @@ import (
"fmt"
"math/big"

cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

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 @@ -4,8 +4,8 @@ import (
"fmt"
"math/big"

cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"

Expand Down
Loading
Loading