diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 678e923a..7b14e197 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -70,6 +70,11 @@ import ( atomonegovkeeper "github.com/atomone-hub/atomone/x/gov/keeper" photonkeeper "github.com/atomone-hub/atomone/x/photon/keeper" photontypes "github.com/atomone-hub/atomone/x/photon/types" + + ibcprovider "github.com/allinbits/vaas/x/vaas/provider" + ibcproviderkeeper "github.com/allinbits/vaas/x/vaas/provider/keeper" + providertypes "github.com/allinbits/vaas/x/vaas/provider/types" + vaastypes "github.com/allinbits/vaas/x/vaas/types" ) type AppKeepers struct { @@ -101,6 +106,7 @@ type AppKeepers struct { PhotonKeeper *photonkeeper.Keeper DynamicfeeKeeper *dynamicfeekeeper.Keeper CoreDaosKeeper *coredaoskeeper.Keeper + ProviderKeeper ibcproviderkeeper.Keeper EpochsKeeper epochskeeper.Keeper // Modules @@ -125,6 +131,7 @@ func NewAppKeeper( ) AppKeepers { authorityStr := authtypes.NewModuleAddress(govtypes.ModuleName).String() addressCodec := addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()) + consAddressCodec := addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()) appKeepers := AppKeepers{} // Set keys KVStoreKey, TransientStoreKey, MemoryStoreKey @@ -277,6 +284,22 @@ func NewAppKeeper( appKeepers.GovKeeperWrapper = atomonegovkeeper.NewKeeper(appKeepers.GovKeeper) + appKeepers.ProviderKeeper = ibcproviderkeeper.NewKeeper( + appCodec, + runtime.NewKVStoreService(appKeepers.keys[providertypes.StoreKey]), + appKeepers.IBCKeeper.ClientKeeper, + appKeepers.IBCKeeper.ClientV2Keeper, + appKeepers.StakingKeeper, + appKeepers.SlashingKeeper, + appKeepers.AccountKeeper, + appKeepers.BankKeeper, + *appKeepers.GovKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + appCodec.InterfaceRegistry().SigningContext().ValidatorAddressCodec(), + consAddressCodec, + authtypes.FeeCollectorName, + ) + appKeepers.CoreDaosKeeper = coredaoskeeper.NewKeeper( appCodec, runtime.NewKVStoreService(appKeepers.keys[coredaostypes.StoreKey]), @@ -374,7 +397,8 @@ func NewAppKeeper( AddRoute(ibctransfertypes.ModuleName, transferStack) ibcv2Router := ibcapi.NewRouter(). - AddRoute(ibctransfertypes.PortID, transferStackV2) + AddRoute(ibctransfertypes.PortID, transferStackV2). + AddRoute(vaastypes.ProviderAppID, ibcprovider.NewIBCModule(&appKeepers.ProviderKeeper)) appKeepers.IBCKeeper.SetRouter(ibcRouter) appKeepers.IBCKeeper.SetRouterV2(ibcv2Router) diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 3a02804a..e9225603 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -1,6 +1,7 @@ package keepers import ( + providertypes "github.com/allinbits/vaas/x/vaas/provider/types" icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" @@ -52,6 +53,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { photontypes.StoreKey, dynamicfeetypes.StoreKey, coredaostypes.StoreKey, + providertypes.StoreKey, epochstypes.StoreKey, ) diff --git a/app/modules.go b/app/modules.go index 9ba689a8..95f2b7e5 100644 --- a/app/modules.go +++ b/app/modules.go @@ -34,7 +34,6 @@ import ( dynamicfeetypes "github.com/cosmos/cosmos-sdk/x/dynamicfee/types" "github.com/cosmos/cosmos-sdk/x/epochs" epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types" - "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/cosmos/cosmos-sdk/x/gov" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -44,7 +43,6 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/slashing" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/atomone-hub/atomone/x/coredaos" @@ -53,6 +51,11 @@ import ( atomonegovv1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/photon" photontypes "github.com/atomone-hub/atomone/x/photon/types" + + no_valupdates_genutil "github.com/allinbits/vaas/x/vaas/no_valupdates_genutil" + no_valupdates_staking "github.com/allinbits/vaas/x/vaas/no_valupdates_staking" + ibcprovider "github.com/allinbits/vaas/x/vaas/provider" + providertypes "github.com/allinbits/vaas/x/vaas/provider/types" ) var maccPerms = map[string][]string{ @@ -93,7 +96,7 @@ func appModules( )} return []module.AppModule{ - genutil.NewAppModule( + no_valupdates_genutil.NewAppModule( app.AccountKeeper, app.StakingKeeper, app.BaseApp, @@ -107,7 +110,7 @@ func appModules( mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)), slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName), app.interfaceRegistry), distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), + no_valupdates_staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), photon.NewAppModule(appCodec, *app.PhotonKeeper, app.BankKeeper, app.AccountKeeper, app.StakingKeeper), upgrade.NewAppModule(app.UpgradeKeeper, app.AccountKeeper.AddressCodec()), evidence.NewAppModule(app.EvidenceKeeper), @@ -118,6 +121,7 @@ func appModules( consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), dynamicfee.NewAppModule(appCodec, *app.DynamicfeeKeeper), coredaos.NewAppModule(appCodec, *app.CoreDaosKeeper, app.GovKeeperWrapper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + ibcprovider.NewAppModule(&app.ProviderKeeper), epochs.NewAppModule(&app.EpochsKeeper), app.TransferModule, @@ -163,6 +167,7 @@ func orderBeginBlockers() []string { vestingtypes.ModuleName, consensusparamtypes.ModuleName, coredaostypes.ModuleName, + providertypes.ModuleName, } } @@ -197,6 +202,7 @@ func orderEndBlockers() []string { vestingtypes.ModuleName, consensusparamtypes.ModuleName, coredaostypes.ModuleName, + providertypes.ModuleName, epochstypes.ModuleName, } } @@ -231,6 +237,7 @@ func orderInitBlockers() []string { consensusparamtypes.ModuleName, dynamicfeetypes.ModuleName, coredaostypes.ModuleName, + providertypes.ModuleName, epochstypes.ModuleName, } } diff --git a/go.mod b/go.mod index 3f02387e..82df2241 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module github.com/atomone-hub/atomone -go 1.26.1 +go 1.26.0 replace ( + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.1.1 cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/upgrade => github.com/atomone-hub/cosmos-sdk/x/upgrade v0.1.5-atomone.2 + github.com/allinbits/vaas => github.com/allinbits/vaas v0.0.0-20260503080943-6ab89ddcfeec github.com/cosmos/cosmos-sdk => github.com/atomone-hub/cosmos-sdk v0.500.0-rc.1 github.com/cosmos/ibc-go/v10 => github.com/cosmos/ibc-go/v10 v10.5.0 ) @@ -20,10 +22,11 @@ require ( cosmossdk.io/math v1.5.3 cosmossdk.io/store v1.1.2 cosmossdk.io/tools/confix v0.1.2 - cosmossdk.io/x/evidence v0.1.1 + cosmossdk.io/x/evidence v0.2.0 cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/tx v0.14.0 cosmossdk.io/x/upgrade v0.2.0 + github.com/allinbits/vaas v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v0.38.21 github.com/cosmos/cosmos-db v1.1.3 github.com/cosmos/cosmos-proto v1.0.0-beta.5 diff --git a/go.sum b/go.sum index 301cfee7..fa2ca945 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/allinbits/vaas v0.0.0-20260503080943-6ab89ddcfeec h1:fb9SilS8Tve0PdmTKCty44wJmcLjnq1hgFf8Edgqk3k= +github.com/allinbits/vaas v0.0.0-20260503080943-6ab89ddcfeec/go.mod h1:qMnVr9Yg/NhN4eMXiHNjboin6lYxTKVX1zxX3iNUYsw= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=