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

Christianborst/ica controller module #1

Open
wants to merge 86 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
9ab1963
chore: add v9 changelog (#2047) (#2049)
mergify[bot] Jan 20, 2023
ffb38ab
Update testnet tutorial for v8-Rho upgrade (#2045) (#2057)
mergify[bot] Jan 23, 2023
861aee0
chore: bump ibc ics and pfm for ibc v4 (#2054) (#2055)
mergify[bot] Jan 23, 2023
407c62e
Update changelog for v9-rc1 (#2058) (#2059)
mergify[bot] Jan 23, 2023
0d5776f
add rc tag in release.yml (#2044) (#2061)
mergify[bot] Jan 23, 2023
4b1e218
Update final v8 changelog (#2069) (#2071)
mergify[bot] Jan 23, 2023
cc5070c
Reintroduce missing code for rest endpoint wiring (#2080) (#2099)
mergify[bot] Jan 30, 2023
fc32da4
feat: Add go version check (#2095) (#2103)
mergify[bot] Jan 30, 2023
036b5d0
chore: Update changelog for v8-rc4 (#2093) (#2101)
mergify[bot] Jan 30, 2023
bc269ee
chore: Update changelog for v8-rc5 (#2104) (#2106)
mergify[bot] Jan 30, 2023
d7e5ceb
chore: Update changelog for v8 final release (#2108) (#2110)
mergify[bot] Jan 31, 2023
e18d912
Update v8 release date on changelog (#2114) (#2118)
mergify[bot] Jan 31, 2023
2d87127
docs: bypass messages (#2091) (#2123)
mergify[bot] Jan 31, 2023
0e5e20e
bump ics to rc4 (#2127)
shaspitz Feb 2, 2023
4faf980
Revert "bump ics to rc4 (#2127)" (#2133)
glnro Feb 2, 2023
a2e0656
Bump ics to rc4 (#2132) (#2135)
mergify[bot] Feb 2, 2023
ec61841
Update changelog (#2137) (#2140)
mergify[bot] Feb 2, 2023
d0950f1
Removed Stargazer, now depreciated (#2136) (#2139)
mergify[bot] Feb 2, 2023
8ed22b3
Update cosmos-hub-roadmap-2.0.md (backport #2113) (#2120)
mergify[bot] Feb 3, 2023
0a9813d
Bump pfm from 4.0.1 to 4.0.3, refactor RouterKeeper api (#2121) (#2141)
mergify[bot] Feb 6, 2023
df38e0c
Bump tendermint patch and update indirect btcsuite dependency for sdk…
mergify[bot] Feb 6, 2023
9c0968f
chore: update dependencies for v9 (#2155) (#2157)
mergify[bot] Feb 6, 2023
779ce4a
Update changelog for rc3 v9 (#2156) (#2158)
mergify[bot] Feb 6, 2023
c1a051d
Bump pfm to v4.0.4 (#2161) (#2162)
mergify[bot] Feb 7, 2023
794dd32
chore: update CHANGELOG.md (#2164) (#2166)
mergify[bot] Feb 9, 2023
a6e1fd8
bump cosmos-sdk to v0.45.13-ics (#2163) (#2165)
mergify[bot] Feb 9, 2023
257954e
Updated mlc_config.json to ignore http status responses of 0 and 403 …
mergify[bot] Feb 9, 2023
5d8badf
bump ics (#2174) (#2176)
mergify[bot] Feb 10, 2023
ce659af
chore: update CHANGELOG.md (#2175) (#2177)
mergify[bot] Feb 10, 2023
273d347
fix: invalid links (#2172) (#2178)
mergify[bot] Feb 13, 2023
d66484b
Fix missing equivocation prop (#2179) (#2180)
mergify[bot] Feb 13, 2023
78d56f3
Update team codeowners (#2046) (#2181)
mergify[bot] Feb 14, 2023
4a7ba29
chore: Update required versions outside of replace (#2188) (#2189)
mergify[bot] Feb 15, 2023
843b749
fix ICS equivocation proposal (#2197) (#2199)
mergify[bot] Feb 15, 2023
00ea733
chore: Revert ibc-go to 4.2 (backport #2190) (#2198)
mergify[bot] Feb 15, 2023
9848dfb
Updated Joining Testnet Tutorial (#2170) (#2193)
mergify[bot] Feb 15, 2023
5624cbd
docs: First pass with Rho docs (#2196) (#2202)
mergify[bot] Feb 16, 2023
6c83d98
Update docs Toc (#2203) (#2205)
mergify[bot] Feb 16, 2023
aa57bb4
chore: V8 update docs (#2206) (#2208)
mergify[bot] Feb 16, 2023
f6ea176
Update changelog for v9 rc7 (#2219) (#2220)
mergify[bot] Feb 17, 2023
45da207
Update v8.0.1 changelog (#2221) (#2223)
mergify[bot] Feb 17, 2023
04bd60e
Consistently generate build tags on newer Make (#2018) (#2226)
mergify[bot] Feb 20, 2023
0e40fbd
Update v9 changelog and mod (#2231) (#2232)
mergify[bot] Feb 21, 2023
682770f
chore: Update changelog (#2234) (#2235)
mergify[bot] Feb 21, 2023
66e77c8
add spam prevention antehandler (#2262) (#2276)
mergify[bot] Mar 9, 2023
4b14265
Update CHANGELOG.md (#2278) (#2279)
mergify[bot] Mar 9, 2023
b27e8df
chore: Add upgrade v9 migration docs (#2240) (#2271)
mergify[bot] Mar 10, 2023
1b902c2
cleanup changelog (#2295)
mpoke Mar 16, 2023
4e73cf6
docs: update quick-start docs for v9 (backport #2267) (#2293)
mergify[bot] Mar 17, 2023
6b733d1
Fix broken links (backport #2297) (#2303)
mergify[bot] Mar 17, 2023
ea8f2f5
change bypass-min-fee-types parsing; change defaults (backport #2092)…
mergify[bot] Mar 21, 2023
7a11c69
Update v9 changelog (#2306)
mpoke Mar 24, 2023
81cf8b5
bump ics to v1.1.0 (#2331) (#2332)
mergify[bot] Mar 24, 2023
b0b42fc
update linter workflow (backport #2324) (#2333)
mergify[bot] Mar 24, 2023
a4c06bc
chore: Update changelog for v9.0.2 (#2335) (#2341)
mergify[bot] Mar 27, 2023
7766135
Update changelog for release (#2349) (#2350)
mergify[bot] Apr 3, 2023
75ebf22
fix typo (#2257) (#2354)
mergify[bot] Apr 3, 2023
f3f8178
update ditrosless image url in Dockerfiles (#2372) (#2373)
mergify[bot] Apr 5, 2023
014499d
remove Trust Wallet (#2380) (#2382)
mergify[bot] Apr 6, 2023
fe36437
adding back trust wallet (#2384) (#2386)
mergify[bot] Apr 11, 2023
56844d5
docs: update changelog for v9.0.0 (#2301) (#2395)
mergify[bot] Apr 12, 2023
ec88d59
Update makefile linting targets (#2377) (#2396)
mergify[bot] Apr 12, 2023
7e30d6f
Update comet and sdk (#2399)
glnro Apr 14, 2023
9c7af12
remove logger in app.go (#2416) (#2417)
mergify[bot] Apr 19, 2023
c38e4e7
update changelog for rc (#2418) (#2419)
mergify[bot] Apr 19, 2023
05b6b87
update changelog for rc 2 (backport #2421) (#2422)
mergify[bot] Apr 19, 2023
108cb9b
deps: bump ICS to v1.1.1 (backport #2442) (#2454)
mergify[bot] May 3, 2023
c1d0fb5
fix!: multisig + distribution fix (#2474)
mpoke May 8, 2023
321d15a
update changelog for v9.1.0
mpoke May 8, 2023
d6410b7
deps: bump IBC to 4.2.1 (#2542)
mpoke May 25, 2023
66494d1
docs: update changelog for v9.1.1 (#2545)
yaruwangway May 25, 2023
7894456
IBC v4.3.1 (4.2.1 retracted)
ChristianBorst Jun 5, 2023
435d45f
Update third_party sdk and ibc protos
ChristianBorst Jun 5, 2023
c2fba82
Add ICAAuth, ICA Controller, update for builds
ChristianBorst Jun 5, 2023
7ea4224
Update workflows to use Golang 1.19
ChristianBorst Jun 6, 2023
7dc59c2
Properly declare icaauth protos
ChristianBorst Jun 6, 2023
a44d4d5
Add all interchain accounts query
ChristianBorst Jun 7, 2023
e8ab748
Fix proto generation
ChristianBorst Jun 7, 2023
8310a7a
Implement all interchain accounts query
ChristianBorst Jun 7, 2023
cbe7fae
Remove Response's Equal, since RegisteredInterchainAccount does not h…
ChristianBorst Jun 7, 2023
51b1e35
Add accounts command to icaauth query
ChristianBorst Jun 7, 2023
fe91e97
Fix icaauth router registration
ChristianBorst Jun 8, 2023
90c53c4
Fix missing icaauth app module basic
ChristianBorst Jun 8, 2023
6778eca
Register Gravity Amino/Proto for ICA Controller
ChristianBorst Jun 9, 2023
ee6274c
Prevent debug symbol stripping in Makefile
ChristianBorst Jun 9, 2023
036e37c
Fix Gravity version, lock critical dependencies in go.mod
ChristianBorst Jun 9, 2023
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
Prev Previous commit
Next Next commit
Add ICAAuth, ICA Controller, update for builds
ChristianBorst committed Jun 5, 2023
commit c2fba826dfea9e1be1cb33bf743dd5bd4dafcf75
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ BUILDDIR ?= $(CURDIR)/build
TEST_DOCKER_REPO=cosmos/contrib-gaiatest

GO_SYSTEM_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1-2)
REQUIRE_GO_VERSION = 1.18
REQUIRE_GO_VERSION = 1.19

export GO111MODULE = on

@@ -95,19 +95,14 @@ include contrib/devtools/Makefile
### Build ###
###############################################################################

check_version:
ifneq ($(GO_SYSTEM_VERSION), $(REQUIRE_GO_VERSION))
@echo "ERROR: Go version 1.18 is required for $(VERSION) of Gaia."
exit 1
endif

all: install lint run-tests test-e2e vulncheck
all: install run-tests test-e2e vulncheck

BUILD_TARGETS := build install

build: BUILD_ARGS=-o $(BUILDDIR)/

$(BUILD_TARGETS): check_version go.sum $(BUILDDIR)/
$(BUILD_TARGETS): go.sum $(BUILDDIR)/
go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...

$(BUILDDIR)/:
2 changes: 1 addition & 1 deletion ante/ante.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import (
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"

gaiafeeante "github.com/cosmos/gaia/v9/x/globalfee/ante"
gaiafeeante "github.com/althea-net/ibc-test-chain/v9/x/globalfee/ante"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
6 changes: 3 additions & 3 deletions ante/gov_ante_test.go
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/stretchr/testify/suite"

"github.com/althea-net/ibc-test-chain/v9/ante"
gaiahelpers "github.com/althea-net/ibc-test-chain/v9/app/helpers"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
"github.com/cosmos/gaia/v9/ante"
gaiahelpers "github.com/cosmos/gaia/v9/app/helpers"
tmrand "github.com/tendermint/tendermint/libs/rand"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

gaiaapp "github.com/cosmos/gaia/v9/app"
gaiaapp "github.com/althea-net/ibc-test-chain/v9/app"
)

var (
12 changes: 6 additions & 6 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -41,12 +41,12 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"

gaiaante "github.com/cosmos/gaia/v9/ante"
"github.com/cosmos/gaia/v9/app/keepers"
gaiaappparams "github.com/cosmos/gaia/v9/app/params"
"github.com/cosmos/gaia/v9/app/upgrades"
v9 "github.com/cosmos/gaia/v9/app/upgrades/v9"
"github.com/cosmos/gaia/v9/x/globalfee"
gaiaante "github.com/althea-net/ibc-test-chain/v9/ante"
"github.com/althea-net/ibc-test-chain/v9/app/keepers"
gaiaappparams "github.com/althea-net/ibc-test-chain/v9/app/params"
"github.com/althea-net/ibc-test-chain/v9/app/upgrades"
v9 "github.com/althea-net/ibc-test-chain/v9/app/upgrades/v9"
"github.com/althea-net/ibc-test-chain/v9/x/globalfee"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
4 changes: 2 additions & 2 deletions app/app_test.go
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ package gaia_test
import (
"testing"

gaia "github.com/althea-net/ibc-test-chain/v9/app"
gaiahelpers "github.com/althea-net/ibc-test-chain/v9/app/helpers"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
gaia "github.com/cosmos/gaia/v9/app"
gaiahelpers "github.com/cosmos/gaia/v9/app/helpers"
"github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/libs/log"
db "github.com/tendermint/tm-db"
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package gaia
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/cosmos/gaia/v9/app/params"
"github.com/althea-net/ibc-test-chain/v9/app/params"
)

// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
2 changes: 1 addition & 1 deletion app/helpers/test_helpers.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"

gaiaapp "github.com/cosmos/gaia/v9/app"
gaiaapp "github.com/althea-net/ibc-test-chain/v9/app"
)

// SimAppChainID hardcoded chainID for simulation
87 changes: 63 additions & 24 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
@@ -41,8 +41,10 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/cosmos/gaia/v9/x/globalfee"
ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
icacontroller "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller"
icacontrollerkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/keeper"
icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
@@ -62,6 +64,11 @@ import (
routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v4/router/keeper"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"

"github.com/althea-net/ibc-test-chain/v9/x/globalfee"
"github.com/althea-net/ibc-test-chain/v9/x/icaauth"
icaauthkeeper "github.com/althea-net/ibc-test-chain/v9/x/icaauth/keeper"
icaauthtypes "github.com/althea-net/ibc-test-chain/v9/x/icaauth/types"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
)
@@ -85,30 +92,37 @@ type AppKeepers struct {
UpgradeKeeper upgradekeeper.Keeper
ParamsKeeper paramskeeper.Keeper
// IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
IBCKeeper *ibckeeper.Keeper
ICAHostKeeper icahostkeeper.Keeper
EvidenceKeeper evidencekeeper.Keeper
TransferKeeper ibctransferkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
AuthzKeeper authzkeeper.Keeper
LiquidityKeeper liquiditykeeper.Keeper
IBCKeeper *ibckeeper.Keeper
ICAControllerKeeper icacontrollerkeeper.Keeper
ICAHostKeeper icahostkeeper.Keeper
ICAAuthKeeper icaauthkeeper.Keeper
EvidenceKeeper evidencekeeper.Keeper
TransferKeeper ibctransferkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
AuthzKeeper authzkeeper.Keeper
LiquidityKeeper liquiditykeeper.Keeper

// ICS
ProviderKeeper ibcproviderkeeper.Keeper

RouterKeeper *routerkeeper.Keeper

// Modules
ICAModule ica.AppModule
TransferModule transfer.AppModule
RouterModule router.AppModule
ProviderModule ibcprovider.AppModule
ICAModule ica.AppModule
ICAAuthModule icaauth.AppModule
ICAHostIBCModule icahost.IBCModule
ICAAuthIBCModule icaauth.IBCModule
TransferModule transfer.AppModule
RouterModule router.AppModule
ProviderModule ibcprovider.AppModule

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
ScopedICAHostKeeper capabilitykeeper.ScopedKeeper
ScopedIBCProviderKeeper capabilitykeeper.ScopedKeeper
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper
ScopedICAHostKeeper capabilitykeeper.ScopedKeeper
ScopedICAAuthKeeper capabilitykeeper.ScopedKeeper
ScopedIBCProviderKeeper capabilitykeeper.ScopedKeeper
}

func NewAppKeeper(
@@ -152,7 +166,9 @@ func NewAppKeeper(
appKeepers.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, appKeepers.keys[capabilitytypes.StoreKey], appKeepers.memKeys[capabilitytypes.MemStoreKey])
appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
appKeepers.ScopedICAControllerKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
appKeepers.ScopedICAHostKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
appKeepers.ScopedICAAuthKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icaauthtypes.ModuleName)
appKeepers.ScopedIBCProviderKeeper = appKeepers.CapabilityKeeper.ScopeToModule(providertypes.ModuleName)

appKeepers.CapabilityKeeper.Seal()
@@ -343,6 +359,16 @@ func NewAppKeeper(

appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper)

appKeepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
appCodec, appKeepers.keys[icacontrollertypes.StoreKey],
appKeepers.GetSubspace(icacontrollertypes.SubModuleName),
appKeepers.IBCKeeper.ChannelKeeper,
appKeepers.IBCKeeper.ChannelKeeper,
&appKeepers.IBCKeeper.PortKeeper,
appKeepers.ScopedICAControllerKeeper,
bApp.MsgServiceRouter(),
)

appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper(
appCodec, appKeepers.keys[icahosttypes.StoreKey],
appKeepers.GetSubspace(icahosttypes.SubModuleName),
@@ -353,15 +379,25 @@ func NewAppKeeper(
bApp.MsgServiceRouter(),
)

appKeepers.ICAModule = ica.NewAppModule(nil, &appKeepers.ICAHostKeeper)
icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper)
appKeepers.ICAAuthKeeper = icaauthkeeper.NewKeeper(
appCodec, appKeepers.keys[icaauthtypes.ModuleName],
appKeepers.ICAControllerKeeper,
appKeepers.ScopedICAAuthKeeper,
)

appKeepers.ICAAuthModule = icaauth.NewAppModule(appCodec, appKeepers.ICAAuthKeeper)
appKeepers.ICAAuthIBCModule = icaauth.NewIBCModule(appKeepers.ICAAuthKeeper)

appKeepers.ICAModule = ica.NewAppModule(&appKeepers.ICAControllerKeeper, &appKeepers.ICAHostKeeper)
icaControllerStack := icacontroller.NewIBCMiddleware(appKeepers.ICAAuthIBCModule, appKeepers.ICAControllerKeeper)
appKeepers.ICAHostIBCModule = icahost.NewIBCModule(appKeepers.ICAHostKeeper)

appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper)

var ibcStack porttypes.IBCModule
ibcStack = transfer.NewIBCModule(appKeepers.TransferKeeper)
ibcStack = router.NewIBCMiddleware(
ibcStack,
var ibcTransferStack porttypes.IBCModule
ibcTransferStack = transfer.NewIBCModule(appKeepers.TransferKeeper)
ibcTransferStack = router.NewIBCMiddleware(
ibcTransferStack,
appKeepers.RouterKeeper,
0,
routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
@@ -370,8 +406,10 @@ func NewAppKeeper(

// create static IBC router, add transfer route, then set and seal it
ibcRouter := porttypes.NewRouter().
AddRoute(icahosttypes.SubModuleName, icaHostIBCModule).
AddRoute(ibctransfertypes.ModuleName, ibcStack).
AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
AddRoute(icahosttypes.SubModuleName, appKeepers.ICAHostIBCModule).
AddRoute(icaauthtypes.ModuleName, appKeepers.ICAAuthIBCModule).
AddRoute(ibctransfertypes.ModuleName, ibcTransferStack).
AddRoute(providertypes.ModuleName, appKeepers.ProviderModule)

appKeepers.IBCKeeper.SetRouter(ibcRouter)
@@ -403,6 +441,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino

paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable())
paramsKeeper.Subspace(icahosttypes.SubModuleName)
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
paramsKeeper.Subspace(globalfee.ModuleName)
paramsKeeper.Subspace(providertypes.ModuleName)

5 changes: 4 additions & 1 deletion app/keepers/keys.go
Original file line number Diff line number Diff line change
@@ -16,12 +16,15 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"

icaauthtypes "github.com/althea-net/ibc-test-chain/v9/x/icaauth/types"
)

func (appKeepers *AppKeepers) GenerateKeys() {
@@ -33,7 +36,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
evidencetypes.StoreKey, liquiditytypes.StoreKey, ibctransfertypes.StoreKey,
capabilitytypes.StoreKey, feegrant.StoreKey, authzkeeper.StoreKey, routertypes.StoreKey,
icahosttypes.StoreKey, providertypes.StoreKey,
icahosttypes.StoreKey, providertypes.StoreKey, icacontrollertypes.StoreKey, icaauthtypes.StoreKey,
)

// Define transient store keys
10 changes: 8 additions & 2 deletions app/modules.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gaia

import (
"github.com/althea-net/ibc-test-chain/v9/x/icaauth"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
@@ -53,8 +54,8 @@ import (
"github.com/strangelove-ventures/packet-forward-middleware/v4/router"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"

gaiaappparams "github.com/cosmos/gaia/v9/app/params"
"github.com/cosmos/gaia/v9/x/globalfee"
gaiaappparams "github.com/althea-net/ibc-test-chain/v9/app/params"
"github.com/althea-net/ibc-test-chain/v9/x/globalfee"
)

var maccPerms = map[string][]string{
@@ -105,6 +106,7 @@ var ModuleBasics = module.NewBasicManager(
liquidity.AppModuleBasic{},
router.AppModuleBasic{},
ica.AppModuleBasic{},
icaauth.AppModuleBasic{},
globalfee.AppModule{},
ibcprovider.AppModuleBasic{},
)
@@ -143,6 +145,7 @@ func appModules(
globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)),
app.TransferModule,
app.ICAModule,
app.ICAAuthModule,
app.RouterModule,
app.ProviderModule,
}
@@ -207,6 +210,7 @@ func orderBeginBlockers() []string {
ibctransfertypes.ModuleName,
ibchost.ModuleName,
icatypes.ModuleName,
icaauth.ModuleName,
routertypes.ModuleName,
genutiltypes.ModuleName,
authz.ModuleName,
@@ -235,6 +239,7 @@ func orderEndBlockers() []string {
ibctransfertypes.ModuleName,
ibchost.ModuleName,
icatypes.ModuleName,
icaauth.ModuleName,
routertypes.ModuleName,
capabilitytypes.ModuleName,
authtypes.ModuleName,
@@ -277,6 +282,7 @@ func orderInitBlockers() []string {
ibctransfertypes.ModuleName,
ibchost.ModuleName,
icatypes.ModuleName,
icaauth.ModuleName,
evidencetypes.ModuleName,
liquiditytypes.ModuleName,
authz.ModuleName,
2 changes: 1 addition & 1 deletion app/sim/sim_state.go
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import (
"os"
"time"

"github.com/cosmos/gaia/v9/app"
gaia "github.com/althea-net/ibc-test-chain/v9/app"

tmjson "github.com/tendermint/tendermint/libs/json"
tmtypes "github.com/tendermint/tendermint/types"
2 changes: 1 addition & 1 deletion app/sim/sim_utils.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (
"fmt"
"os"

"github.com/cosmos/gaia/v9/app"
gaia "github.com/althea-net/ibc-test-chain/v9/app"

"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"
8 changes: 4 additions & 4 deletions app/sim_test.go
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ import (
"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"

gaia "github.com/cosmos/gaia/v9/app"
"github.com/cosmos/gaia/v9/app/helpers"
"github.com/cosmos/gaia/v9/app/params"
"github.com/cosmos/gaia/v9/app/sim"
gaia "github.com/althea-net/ibc-test-chain/v9/app"
"github.com/althea-net/ibc-test-chain/v9/app/helpers"
"github.com/althea-net/ibc-test-chain/v9/app/params"
"github.com/althea-net/ibc-test-chain/v9/app/sim"
)

func init() {
2 changes: 1 addition & 1 deletion app/upgrades/types.go
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v9/app/keepers"
"github.com/althea-net/ibc-test-chain/v9/app/keepers"
)

// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal
2 changes: 1 addition & 1 deletion app/upgrades/v7/constants.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
store "github.com/cosmos/cosmos-sdk/store/types"
icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"

"github.com/cosmos/gaia/v9/app/upgrades"
"github.com/althea-net/ibc-test-chain/v9/app/upgrades"
)

const (
Loading