Skip to content

Commit

Permalink
fix: ensure ics27 channels are owned by icahost submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
johnletey committed Nov 20, 2024
1 parent 1a21212 commit a9fcc88
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 570 deletions.
13 changes: 0 additions & 13 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ import (
// IBC Modules
pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper"
transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
Expand Down Expand Up @@ -305,19 +304,7 @@ func (app *App) RegisterUpgradeHandler() error {
upgrade.CreateUpgradeHandler(
app.ModuleManager,
app.Configurator(),
app.appCodec,
app.interfaceRegistry,
app.Logger(),
app.GetKey(capabilitytypes.ModuleName),
app.AccountKeeper,
app.AuthorityKeeper,
app.BankKeeper,
app.CapabilityKeeper,
app.IBCKeeper.ClientKeeper,
app.ConsensusKeeper,
app.GlobalFeeKeeper,
app.ParamsKeeper,
app.StakingKeeper,
),
)

Expand Down
9 changes: 6 additions & 3 deletions e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ require (
github.com/ethereum/go-ethereum v1.14.8
github.com/monerium/module-noble/v2 v2.0.0
github.com/noble-assets/authority v1.0.0
github.com/noble-assets/globalfee v1.0.0
github.com/noble-assets/halo/v2 v2.0.0
github.com/noble-assets/noble/v8 v8.0.0-rc.3
github.com/ondoprotocol/usdy-noble/v2 v2.0.0
github.com/strangelove-ventures/interchaintest/v8 v8.8.0
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -115,7 +113,9 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.3 // indirect
Expand Down Expand Up @@ -167,6 +167,7 @@ require (
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-libp2p v0.31.0 // indirect
Expand Down Expand Up @@ -197,6 +198,7 @@ require (
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/onsi/gomega v1.34.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand Down Expand Up @@ -246,6 +248,7 @@ require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand Down
266 changes: 1 addition & 265 deletions e2e/go.sum

Large diffs are not rendered by default.

75 changes: 0 additions & 75 deletions e2e/upgrade_test.go

This file was deleted.

10 changes: 1 addition & 9 deletions upgrade/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,4 @@
package upgrade

// UpgradeName is the name of this specific software upgrade used on-chain.
const UpgradeName = "helium"

const UpgradeASCII = `
_ _ _ _
| | | | ___| (_)_ _ _ __ ___
| |_| |/ _ \ | | | | | _ _ \
| _ | __/ | | |_| | | | | | |
|_| |_|\___|_|_|\__,_|_| |_| |_|
`
const UpgradeName = "v8.1"
18 changes: 1 addition & 17 deletions upgrade/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,10 @@
package upgrade

import (
storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"
"github.com/cosmos/cosmos-sdk/baseapp"
consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
authoritytypes "github.com/noble-assets/authority/types"
globalfeetypes "github.com/noble-assets/globalfee/types"
)

func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{
// Cosmos Modules
consensustypes.StoreKey,
crisistypes.StoreKey,
// Noble Modules
authoritytypes.ModuleName,
globalfeetypes.ModuleName,
},
}

return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
return upgradetypes.UpgradeStoreLoader(upgradeHeight, nil)
}
Loading

0 comments on commit a9fcc88

Please sign in to comment.