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
4 changes: 2 additions & 2 deletions app/consumer-democracy/ante/forbidden_proposals_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
"github.com/cosmos/cosmos-sdk/x/params/types/proposal"

app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
"github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
app "github.com/allinbits/interchain-security/app/consumer-democracy"
"github.com/allinbits/interchain-security/app/consumer-democracy/ante"
)

// in SDKv47 parameter updates full params object is required
Expand Down
6 changes: 3 additions & 3 deletions app/consumer-democracy/ante_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

democracyante "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
democracyante "github.com/allinbits/interchain-security/app/consumer-democracy/ante"
consumerante "github.com/allinbits/interchain-security/app/consumer/ante"
ibcconsumerkeeper "github.com/allinbits/interchain-security/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
18 changes: 9 additions & 9 deletions app/consumer-democracy/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ import (
tmos "github.com/cometbft/cometbft/libs/os"
dbm "github.com/cosmos/cosmos-db"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
consumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
ccvdistr "github.com/cosmos/interchain-security/v5/x/ccv/democracy/distribution"
ccvgov "github.com/cosmos/interchain-security/v5/x/ccv/democracy/governance"
ccvstaking "github.com/cosmos/interchain-security/v5/x/ccv/democracy/staking"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
appencoding "github.com/allinbits/interchain-security/app/encoding"
testutil "github.com/allinbits/interchain-security/testutil/integration"
consumer "github.com/allinbits/interchain-security/x/ccv/consumer"
consumerkeeper "github.com/allinbits/interchain-security/x/ccv/consumer/keeper"
consumertypes "github.com/allinbits/interchain-security/x/ccv/consumer/types"
ccvdistr "github.com/allinbits/interchain-security/x/ccv/democracy/distribution"
ccvgov "github.com/allinbits/interchain-security/x/ccv/democracy/governance"
ccvstaking "github.com/allinbits/interchain-security/x/ccv/democracy/staking"
ccvtypes "github.com/allinbits/interchain-security/x/ccv/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/disabled_modules_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"

"github.com/cosmos/interchain-security/v5/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
"github.com/allinbits/interchain-security/app/consumer/ante"
appencoding "github.com/allinbits/interchain-security/app/encoding"
)

func TestDisabledModulesDecorator(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/msg_filter_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

"github.com/cosmos/interchain-security/v5/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
"github.com/allinbits/interchain-security/app/consumer/ante"
appencoding "github.com/allinbits/interchain-security/app/encoding"
)

type consumerKeeper struct {
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
consumerante "github.com/allinbits/interchain-security/app/consumer/ante"
ibcconsumerkeeper "github.com/allinbits/interchain-security/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
14 changes: 7 additions & 7 deletions app/consumer/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"

"github.com/allinbits/interchain-security/app/common"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/runtime"
Expand Down Expand Up @@ -81,7 +82,6 @@ import (
"github.com/cosmos/cosmos-sdk/x/slashing"
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
"github.com/cosmos/interchain-security/v5/app/common"

// IBC v10: Capability module removed

Expand All @@ -91,12 +91,12 @@ import (
tmos "github.com/cometbft/cometbft/libs/os"
dbm "github.com/cosmos/cosmos-db"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
ibcconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
appencoding "github.com/allinbits/interchain-security/app/encoding"
testutil "github.com/allinbits/interchain-security/testutil/integration"
ibcconsumer "github.com/allinbits/interchain-security/x/ccv/consumer"
ibcconsumerkeeper "github.com/allinbits/interchain-security/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/allinbits/interchain-security/x/ccv/consumer/types"
ccvtypes "github.com/allinbits/interchain-security/x/ccv/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"github.com/spf13/cobra"
"golang.org/x/exp/maps"

consumerTypes "github.com/allinbits/interchain-security/x/ccv/consumer/types"
"github.com/allinbits/interchain-security/x/ccv/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"
consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
"github.com/cosmos/interchain-security/v5/x/ccv/types"
)

// The genesis state of the blockchain is represented here as a map of raw json
Expand Down
6 changes: 3 additions & 3 deletions app/consumer/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/x/auth/types"

app "github.com/cosmos/interchain-security/v5/app/consumer"
consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
app "github.com/allinbits/interchain-security/app/consumer"
consumerTypes "github.com/allinbits/interchain-security/x/ccv/consumer/types"
ccvtypes "github.com/allinbits/interchain-security/x/ccv/types"
)

const (
Expand Down
16 changes: 8 additions & 8 deletions app/provider/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ import (
tmos "github.com/cometbft/cometbft/libs/os"
dbm "github.com/cosmos/cosmos-db"

"github.com/cosmos/interchain-security/v5/app/common"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
ibcprovider "github.com/cosmos/interchain-security/v5/x/ccv/provider"
ibcproviderclient "github.com/cosmos/interchain-security/v5/x/ccv/provider/client"
ibcproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
"github.com/allinbits/interchain-security/app/common"
appencoding "github.com/allinbits/interchain-security/app/encoding"
testutil "github.com/allinbits/interchain-security/testutil/integration"
ibcprovider "github.com/allinbits/interchain-security/x/ccv/provider"
ibcproviderclient "github.com/allinbits/interchain-security/x/ccv/provider/client"
ibcproviderkeeper "github.com/allinbits/interchain-security/x/ccv/provider/keeper"
providertypes "github.com/allinbits/interchain-security/x/ccv/provider/types"
ccvtypes "github.com/allinbits/interchain-security/x/ccv/types"

"github.com/cosmos/cosmos-sdk/testutil/testdata/testpb"
sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
Expand Down
4 changes: 2 additions & 2 deletions app/sovereign/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ import (
tmos "github.com/cometbft/cometbft/libs/os"
dbm "github.com/cosmos/cosmos-db"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
appencoding "github.com/allinbits/interchain-security/app/encoding"
testutil "github.com/allinbits/interchain-security/testutil/integration"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/pruning"
"github.com/cosmos/cosmos-sdk/client/rpc"
addresscodec "github.com/cosmos/cosmos-sdk/codec/address"

// IBC v10: keyring import removed as Keyring field removed from autocli.AppOptions
"github.com/cosmos/cosmos-sdk/server"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
Expand All @@ -32,8 +33,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
dbm "github.com/cosmos/cosmos-db"

consumer "github.com/cosmos/interchain-security/v5/app/consumer"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
consumer "github.com/allinbits/interchain-security/app/consumer"
appencoding "github.com/allinbits/interchain-security/app/encoding"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down Expand Up @@ -289,7 +290,6 @@ func appExport(
return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
}


// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter
func genesisCommand(encodingConfig appencoding.EncodingConfig, cmds ...*cobra.Command) *cobra.Command {
cmd := genutilcli.GenesisCoreCommand(encodingConfig.TxConfig, consumer.ModuleBasics, consumer.DefaultNodeHome)
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v5/app/consumer"
appparams "github.com/cosmos/interchain-security/v5/app/params"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cd/cmd"
app "github.com/allinbits/interchain-security/app/consumer"
appparams "github.com/allinbits/interchain-security/app/params"
"github.com/allinbits/interchain-security/cmd/interchain-security-cd/cmd"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cdd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/rpc"
"github.com/cosmos/cosmos-sdk/codec"
addresscodec "github.com/cosmos/cosmos-sdk/codec/address"

// IBC v10: keyring import removed as Keyring field removed from autocli.AppOptions
"github.com/cosmos/cosmos-sdk/server"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
Expand All @@ -36,8 +37,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
dbm "github.com/cosmos/cosmos-db"

cdd "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
cdd "github.com/allinbits/interchain-security/app/consumer-democracy"
appencoding "github.com/allinbits/interchain-security/app/encoding"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down Expand Up @@ -311,7 +312,6 @@ func appExport(
return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
}


// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter
func genesisCommand(encodingConfig appencoding.EncodingConfig, cmds ...*cobra.Command) *cobra.Command {
cmd := genutilcli.GenesisCoreCommand(encodingConfig.TxConfig, cdd.ModuleBasics, cdd.DefaultNodeHome)
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cdd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
appparams "github.com/cosmos/interchain-security/v5/app/params"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cdd/cmd"
app "github.com/allinbits/interchain-security/app/consumer-democracy"
appparams "github.com/allinbits/interchain-security/app/params"
"github.com/allinbits/interchain-security/cmd/interchain-security-cdd/cmd"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-pd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/rpc"
"github.com/cosmos/cosmos-sdk/codec"
addresscodec "github.com/cosmos/cosmos-sdk/codec/address"

// IBC v10: keyring import removed as Keyring field removed from autocli.AppOptions
"github.com/cosmos/cosmos-sdk/server"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
Expand All @@ -36,8 +37,8 @@ import (
cmtcfg "github.com/cometbft/cometbft/config"
dbm "github.com/cosmos/cosmos-db"

appEncoding "github.com/cosmos/interchain-security/v5/app/encoding"
providerApp "github.com/cosmos/interchain-security/v5/app/provider"
appEncoding "github.com/allinbits/interchain-security/app/encoding"
providerApp "github.com/allinbits/interchain-security/app/provider"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down Expand Up @@ -234,7 +235,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig appEncoding.EncodingConf
)
}


func queryCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "query",
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-pd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

appparams "github.com/cosmos/interchain-security/v5/app/params"
app "github.com/cosmos/interchain-security/v5/app/provider"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-pd/cmd"
appparams "github.com/allinbits/interchain-security/app/params"
app "github.com/allinbits/interchain-security/app/provider"
"github.com/allinbits/interchain-security/cmd/interchain-security-pd/cmd"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-sd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/rpc"
"github.com/cosmos/cosmos-sdk/codec"
addresscodec "github.com/cosmos/cosmos-sdk/codec/address"

// IBC v10: keyring import removed as Keyring field removed from autocli.AppOptions
"github.com/cosmos/cosmos-sdk/server"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
Expand All @@ -36,8 +37,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
dbm "github.com/cosmos/cosmos-db"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
sovereignApp "github.com/cosmos/interchain-security/v5/app/sovereign"
appencoding "github.com/allinbits/interchain-security/app/encoding"
sovereignApp "github.com/allinbits/interchain-security/app/sovereign"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down Expand Up @@ -314,7 +315,6 @@ func appExport(
return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
}


// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter
func genesisCommand(encodingConfig appencoding.EncodingConfig, cmds ...*cobra.Command) *cobra.Command {
cmd := genutilcli.GenesisCoreCommand(encodingConfig.TxConfig, sovereignApp.ModuleBasics, sovereignApp.DefaultNodeHome)
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-sd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v5/app/sovereign"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-sd/cmd"
app "github.com/allinbits/interchain-security/app/sovereign"
"github.com/allinbits/interchain-security/cmd/interchain-security-sd/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/cosmos/interchain-security/v5
module github.com/allinbits/interchain-security

go 1.24.5

Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/consumer.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package interchain_security.ccv.consumer.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/consumer/types";

import "google/protobuf/any.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package interchain_security.ccv.consumer.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/consumer/types";

import "interchain_security/ccv/v1/shared_consumer.proto";
import "ibc/lightclients/tendermint/v1/tendermint.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package interchain_security.ccv.consumer.v1;
import "interchain_security/ccv/v1/shared_consumer.proto";
option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/consumer/types";

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";
package interchain_security.ccv.consumer.v1;
option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/consumer/types";

import "amino/amino.proto";
import "google/api/annotations.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/provider/types";

import "gogoproto/gogo.proto";
import "interchain_security/ccv/v1/shared_consumer.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/provider.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/allinbits/interchain-security/x/ccv/provider/types";

import "interchain_security/ccv/v1/wire.proto";
import "gogoproto/gogo.proto";
Expand Down
Loading
Loading