Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cosmic-horizon/QWOYN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.2.0
Choose a base ref
...
head repository: cosmic-horizon/QWOYN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Dec 5, 2023

  1. Copy the full SHA
    854f812 View commit details
  2. update to sdk 0.47.6

    dpdanpittman committed Dec 5, 2023
    Copy the full SHA
    2968513 View commit details
  3. tidy up go.sum

    dpdanpittman committed Dec 5, 2023
    Copy the full SHA
    a2f8137 View commit details
  4. Merge pull request #57 from cosmic-horizon/develop

    update go.mod and go.sum for ledger fix and 0.47.6 update
    dpdanpittman authored Dec 5, 2023
    Copy the full SHA
    b69361a View commit details

Commits on Dec 16, 2023

  1. add upgrade handler

    dpdanpittman committed Dec 16, 2023
    Copy the full SHA
    e0499ac View commit details
  2. Copy the full SHA
    7a9980d View commit details
  3. add upgrade handler

    dpdanpittman committed Dec 16, 2023
    Copy the full SHA
    4e21f29 View commit details
  4. added upgrade handler

    dpdanpittman committed Dec 16, 2023
    Copy the full SHA
    ac09eea View commit details
  5. added upgrade handler

    dpdanpittman committed Dec 16, 2023
    Copy the full SHA
    2cbe65f View commit details

Commits on Jan 11, 2024

  1. Copy the full SHA
    73cb161 View commit details
  2. Merge pull request #59 from cosmic-horizon/feature/legacy_amino_codec…

    …_transfer_and_custom_modules
    
    Fix legacy amino issue for ibc-transfer, aquifer, game, intertx
    dpdanpittman authored Jan 11, 2024
    Copy the full SHA
    65fb180 View commit details
  3. Merge pull request #60 from cosmic-horizon/develop

    fix legacy amino issue for ibc-transfer, aquifer, game, intertx
    dpdanpittman authored Jan 11, 2024
    Copy the full SHA
    f46bc7d View commit details
  4. add 5.4 upgrade handler

    dpdanpittman committed Jan 11, 2024
    Copy the full SHA
    53a116e View commit details
  5. Merge pull request #61 from cosmic-horizon/develop

    UPGRADE: add 5.4 upgrade handler
    dpdanpittman authored Jan 11, 2024
    Copy the full SHA
    399c3c5 View commit details
  6. UPGRADE: update app.go

    dpdanpittman committed Jan 11, 2024
    Copy the full SHA
    ee15011 View commit details
  7. Copy the full SHA
    6c22e05 View commit details
  8. Merge pull request #62 from cosmic-horizon/develop

    UPGRADE: update app.go
    dpdanpittman authored Jan 11, 2024
    Copy the full SHA
    f950695 View commit details

Commits on Jan 17, 2024

  1. patch cosmwasm

    dpdanpittman committed Jan 17, 2024
    Copy the full SHA
    687621c View commit details
  2. Merge pull request #63 from cosmic-horizon/develop

    UPGRADE: patch cosmwasm
    dpdanpittman authored Jan 17, 2024
    Copy the full SHA
    017aeec View commit details
  3. bump qwoynd to v5.4.1

    dpdanpittman committed Jan 17, 2024
    Copy the full SHA
    9a0c5f5 View commit details
  4. Merge pull request #64 from cosmic-horizon/develop

    bump qwoynd to v5.4.1
    dpdanpittman authored Jan 17, 2024
    Copy the full SHA
    9a082a7 View commit details

Commits on Mar 5, 2024

  1. provider chain work

    jqwoyn committed Mar 5, 2024
    Copy the full SHA
    eed7c31 View commit details
  2. Copy the full SHA
    f98fda7 View commit details

Commits on Mar 28, 2024

  1. IBC hot fix

    dpdanpittman committed Mar 28, 2024
    Copy the full SHA
    694247e View commit details

Commits on Mar 29, 2024

  1. fixed version

    dpdanpittman committed Mar 29, 2024
    Copy the full SHA
    48f9328 View commit details

Commits on Apr 18, 2024

  1. Merge pull request #65 from cosmic-horizon/provider_chain

    Provider chain work
    dpdanpittman authored Apr 18, 2024
    Copy the full SHA
    d09e6c4 View commit details
  2. Copy the full SHA
    a9b78c0 View commit details
  3. Copy the full SHA
    b642fd3 View commit details
  4. Copy the full SHA
    4a28583 View commit details
  5. Copy the full SHA
    6d47cf9 View commit details
  6. Oumuamua Upgrade, v6.0.0

    dpdanpittman committed Apr 18, 2024
    Copy the full SHA
    32f2479 View commit details
79 changes: 62 additions & 17 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ import (
"github.com/cosmic-horizon/qwoyn/app/upgrades"
v5_1 "github.com/cosmic-horizon/qwoyn/app/upgrades/v5_1"
v5_2 "github.com/cosmic-horizon/qwoyn/app/upgrades/v5_2"
v5_3 "github.com/cosmic-horizon/qwoyn/app/upgrades/v5_3"
v5_4 "github.com/cosmic-horizon/qwoyn/app/upgrades/v5_4"
v6_0 "github.com/cosmic-horizon/qwoyn/app/upgrades/v6_0"
intertx "github.com/cosmic-horizon/qwoyn/x/intertx"
intertxkeeper "github.com/cosmic-horizon/qwoyn/x/intertx/keeper"
intertxtypes "github.com/cosmic-horizon/qwoyn/x/intertx/types"
@@ -124,6 +127,10 @@ import (
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"

ibcprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider"
ibcproviderkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"

stimulus "github.com/cosmic-horizon/qwoyn/x/stimulus"
stimuluskeeper "github.com/cosmic-horizon/qwoyn/x/stimulus/keeper"
stimulustypes "github.com/cosmic-horizon/qwoyn/x/stimulus/types"
@@ -192,7 +199,7 @@ var (
// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

Upgrades = []upgrades.Upgrade{v5_1.Upgrade, v5_2.Upgrade}
Upgrades = []upgrades.Upgrade{v5_1.Upgrade, v5_2.Upgrade, v5_3.Upgrade, v5_4.Upgrade, v6_0.Upgrade}

// ModuleBasics defines the module BasicManager is in charge of setting up basic,
// non-dependant module elements, such as codec registration
@@ -316,6 +323,7 @@ func New(
stimulustypes.StoreKey,
aquifertypes.StoreKey,
gametypes.StoreKey,
providertypes.StoreKey,
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -347,6 +355,7 @@ func New(
// grant capabilities for the ibc and ibc-transfer modules
app.ScopedIBCKeeper = app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
app.ScopedTransferKeeper = app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
app.ScopedIBCProviderKeeper = app.CapabilityKeeper.ScopeToModule(providertypes.ModuleName)
scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
app.ScopedICAControllerKeeper = app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
app.ScopedInterTxKeeper = app.CapabilityKeeper.ScopeToModule(intertxtypes.ModuleName)
@@ -362,11 +371,12 @@ func New(
Bech32Prefix,
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)
moduleAddrs := app.ModuleAccountAddrs()
app.BankKeeper = bankkeeper.NewBaseKeeper(
appCodec,
keys[banktypes.StoreKey],
app.AccountKeeper,
app.ModuleAccountAddrs(),
app.BlockedModuleAccountAddrs(moduleAddrs),
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)
app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper)
@@ -416,7 +426,11 @@ func New(
// register the staking hooks
// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
app.StakingKeeper.SetHooks(
stakingtypes.NewMultiStakingHooks(app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()),
stakingtypes.NewMultiStakingHooks(
app.DistrKeeper.Hooks(),
app.SlashingKeeper.Hooks(),
app.ProviderKeeper.Hooks(),
),
)

// get skipUpgradeHeights from the app options
@@ -456,7 +470,8 @@ func New(
govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper))
AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
AddRoute(providertypes.RouterKey, ibcprovider.NewProviderProposalHandler(app.ProviderKeeper))

// Create Transfer Keepers
app.TransferKeeper = ibctransferkeeper.NewKeeper(
@@ -573,16 +588,6 @@ func New(
wasmStack = wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCFeeKeeper)
wasmStack = ibcfee.NewIBCMiddleware(wasmStack, app.IBCFeeKeeper)

// Create static IBC router, add transfer route, then set and seal it
ibcRouter := porttypes.NewRouter()
ibcRouter.AddRoute(aquifertypes.ModuleName, aquiferStack)
ibcRouter.AddRoute(intertxtypes.ModuleName, interTxIBCModule)
ibcRouter.AddRoute(icacontrollertypes.SubModuleName, aquiferStack)
ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostIBCModule)
ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferIBCModule)
ibcRouter.AddRoute(wasm.ModuleName, wasmStack)
app.IBCKeeper.SetRouter(ibcRouter)

govConfig := govtypes.DefaultConfig()
govKeeper := govkeeper.NewKeeper(
appCodec,
@@ -597,6 +602,36 @@ func New(
govKeeper.SetLegacyRouter(govRouter)
app.GovKeeper = *govKeeper

app.ProviderKeeper = ibcproviderkeeper.NewKeeper(
appCodec,
app.keys[providertypes.StoreKey],
app.GetSubspace(providertypes.ModuleName),
app.ScopedIBCProviderKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.IBCKeeper.ConnectionKeeper,
app.IBCKeeper.ClientKeeper,
app.StakingKeeper,
app.SlashingKeeper,
app.AccountKeeper,
app.DistrKeeper,
app.BankKeeper,
app.GovKeeper,
authtypes.FeeCollectorName,
)
providerModule := ibcprovider.NewAppModule(&app.ProviderKeeper, app.GetSubspace(providertypes.ModuleName))

// Create static IBC router, add transfer route, then set and seal it
ibcRouter := porttypes.NewRouter()
ibcRouter.AddRoute(aquifertypes.ModuleName, aquiferStack)
ibcRouter.AddRoute(intertxtypes.ModuleName, interTxIBCModule)
ibcRouter.AddRoute(icacontrollertypes.SubModuleName, aquiferStack)
ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostIBCModule)
ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferIBCModule)
ibcRouter.AddRoute(providertypes.ModuleName, providerModule)
ibcRouter.AddRoute(wasm.ModuleName, wasmStack)
app.IBCKeeper.SetRouter(ibcRouter)

app.GameKeeper = *gamekeeper.NewKeeper(
appCodec,
keys[gametypes.StoreKey],
@@ -847,15 +882,24 @@ func (app *App) LoadHeight(height int64) error {
func (app *App) ModuleAccountAddrs() map[string]bool {
modAccAddrs := make(map[string]bool)
for acc := range maccPerms {
if acc == aquifertypes.ModuleName {
continue
}
modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true
}

return modAccAddrs
}

// BlockedModuleAccountAddrs returns all the app's blocked module account
// addresses.
func (app *App) BlockedModuleAccountAddrs(modAccAddrs map[string]bool) map[string]bool {
// remove module accounts that are ALLOWED to received funds
delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String())

// Remove the ConsumerRewardsPool from the group of blocked recipient addresses in bank
delete(modAccAddrs, authtypes.NewModuleAddress(providertypes.ConsumerRewardsPool).String())

return modAccAddrs
}

// LegacyAmino returns SimApp's amino codec.
//
// NOTE: This is solely to be used for testing purposes as it may be desirable
@@ -986,6 +1030,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(aquifertypes.ModuleName)
paramsKeeper.Subspace(gametypes.ModuleName)
paramsKeeper.Subspace(wasm.ModuleName)
paramsKeeper.Subspace(providertypes.ModuleName)

return paramsKeeper
}
4 changes: 4 additions & 0 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ import (
ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper"
ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ibcproviderkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
)

type AppKeepers struct {
@@ -57,6 +58,8 @@ type AppKeepers struct {
AquiferKeeper aquiferkeeper.Keeper
GameKeeper gamekeeper.Keeper

ProviderKeeper ibcproviderkeeper.Keeper

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
@@ -65,4 +68,5 @@ type AppKeepers struct {
ScopedInterTxKeeper capabilitykeeper.ScopedKeeper
ScopedAquiferKeeper capabilitykeeper.ScopedKeeper
ScopedWasmKeeper capabilitykeeper.ScopedKeeper
ScopedIBCProviderKeeper capabilitykeeper.ScopedKeeper
}
15 changes: 15 additions & 0 deletions app/upgrades/v5_3/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package v5_3

import (
"github.com/cosmic-horizon/qwoyn/app/upgrades"
)

const (
// UpgradeName defines the on-chain upgrade name.
UpgradeName = "v5.3.0"
)

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
}
18 changes: 18 additions & 0 deletions app/upgrades/v5_3/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package v5_3

import (
"github.com/cosmic-horizon/qwoyn/app/keepers"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
keepers keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, vm)
}
}
15 changes: 15 additions & 0 deletions app/upgrades/v5_4/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package v5_4

import (
"github.com/cosmic-horizon/qwoyn/app/upgrades"
)

const (
// UpgradeName defines the on-chain upgrade name.
UpgradeName = "v5.4.1"
)

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
}
18 changes: 18 additions & 0 deletions app/upgrades/v5_4/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package v5_4

import (
"github.com/cosmic-horizon/qwoyn/app/keepers"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
keepers keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, vm)
}
}
20 changes: 20 additions & 0 deletions app/upgrades/v6_0/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package v6_0

import (
"github.com/cosmic-horizon/qwoyn/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
)

const (
// UpgradeName defines the on-chain upgrade name.
UpgradeName = "v6.0.0"
)

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{providertypes.StoreKey},
},
}
18 changes: 18 additions & 0 deletions app/upgrades/v6_0/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package v6_0

import (
"github.com/cosmic-horizon/qwoyn/app/keepers"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
keepers keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, vm)
}
}
Loading