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.

Sign up for GitHub

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

Make wasm hooks importable #3850

Merged
merged 8 commits into from
Dec 23, 2022
Merged

Make wasm hooks importable #3850

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e52e3b
moved ibc-hooks to its own go.mod
nicolaslara Dec 23, 2022
4ff7393
updated ibc hooks version
nicolaslara Dec 23, 2022
4e3cb0c
go sum
nicolaslara Dec 23, 2022
01124e0
Merge branch 'main' into nicolas/importable-ibc-hooks-2
ValarDragon Dec 23, 2022
18bb465
add ics23 patch into x/ibc-hooks
ValarDragon Dec 23, 2022
9d2007c
Fix wasm import version conflict
ValarDragon Dec 23, 2022
0b21122
Update x/ibc-hooks to osmoutils v0.0.2
ValarDragon Dec 23, 2022
1335dbd
Update versions
ValarDragon Dec 23, 2022
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
2 changes: 1 addition & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import (
v8 "github.com/osmosis-labs/osmosis/v13/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v13/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v13/client/docs/statik"
ibc_hooks "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks"
ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
)

const appName = "OsmosisApp"
Expand Down
6 changes: 3 additions & 3 deletions app/keepers/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ import (

downtimedetector "github.com/osmosis-labs/osmosis/v13/x/downtime-detector"
downtimetypes "github.com/osmosis-labs/osmosis/v13/x/downtime-detector/types"
ibchooks "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks"
ibchookskeeper "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks/keeper"
ibchookstypes "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks/types"
ibcratelimit "github.com/osmosis-labs/osmosis/v13/x/ibc-rate-limit"
ibcratelimittypes "github.com/osmosis-labs/osmosis/v13/x/ibc-rate-limit/types"
"github.com/osmosis-labs/osmosis/v13/x/swaprouter"
swaproutertypes "github.com/osmosis-labs/osmosis/v13/x/swaprouter/types"
ibchooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"

icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host"
icahostkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/keeper"
Expand Down
2 changes: 1 addition & 1 deletion app/keepers/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
downtimemodule "github.com/osmosis-labs/osmosis/v13/x/downtime-detector/module"
"github.com/osmosis-labs/osmosis/v13/x/epochs"
"github.com/osmosis-labs/osmosis/v13/x/gamm"
ibc_hooks "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks"
ibc_rate_limit "github.com/osmosis-labs/osmosis/v13/x/ibc-rate-limit"
"github.com/osmosis-labs/osmosis/v13/x/incentives"
"github.com/osmosis-labs/osmosis/v13/x/lockup"
Expand All @@ -46,6 +45,7 @@ import (
"github.com/osmosis-labs/osmosis/v13/x/twap/twapmodule"
"github.com/osmosis-labs/osmosis/v13/x/txfees"
valsetprefmodule "github.com/osmosis-labs/osmosis/v13/x/valset-pref/valpref-module"
ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
)

// AppModuleBasics returns ModuleBasics for the module BasicManager.
Expand Down
4 changes: 2 additions & 2 deletions app/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"

ibchookstypes "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks/types"
ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"

ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts"
icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"

downtimemodule "github.com/osmosis-labs/osmosis/v13/x/downtime-detector/module"
downtimetypes "github.com/osmosis-labs/osmosis/v13/x/downtime-detector/types"

ibc_hooks "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks"
ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"

"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v13/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v13_test

import (
"fmt"
ibchookstypes "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks/types"
ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
"testing"

ibcratelimittypes "github.com/osmosis-labs/osmosis/v13/x/ibc-rate-limit/types"
Expand All @@ -13,7 +13,7 @@ import (
abci "github.com/tendermint/tendermint/abci/types"

"github.com/osmosis-labs/osmosis/v13/app/apptesting"
ibc_hooks "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks"
ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v14/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v14

import (
store "github.com/cosmos/cosmos-sdk/store/types"
ibchookstypes "github.com/osmosis-labs/osmosis/v13/x/ibc-hooks/types"
ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"

"github.com/osmosis-labs/osmosis/v13/app/upgrades"
downtimetypes "github.com/osmosis-labs/osmosis/v13/x/downtime-detector/types"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/osmosis-labs/osmosis/v13
go 1.18

require (
github.com/CosmWasm/wasmd v0.29.2-osmo-v13
github.com/CosmWasm/wasmd v0.29.2
github.com/cosmos/cosmos-proto v1.0.0-alpha8
github.com/cosmos/cosmos-sdk v0.46.7
github.com/cosmos/go-bip39 v1.0.0
Expand All @@ -19,6 +19,7 @@ require (
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
github.com/osmosis-labs/osmosis/osmomath v0.0.2
github.com/osmosis-labs/osmosis/osmoutils v0.0.1
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.3
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.5.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,8 @@ github.com/osmosis-labs/osmosis/osmomath v0.0.2 h1:8vTobkYfoRTCJCie+jE7gzXvqUUfo
github.com/osmosis-labs/osmosis/osmomath v0.0.2/go.mod h1:IpoXO7lvmfsBFfQzaqovs541hpqtrnM+GJSZDi/TZtc=
github.com/osmosis-labs/osmosis/osmoutils v0.0.1 h1:iANKdKa6cCgX1NJAldzfedwUPmeaKNrMu/atBCWtGg8=
github.com/osmosis-labs/osmosis/osmoutils v0.0.1/go.mod h1:T7CCZKYhKWASnv5mRE8u3m0gst3NZ/sU16Brjmv4UPw=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.3 h1:H5S0ZJ1PXOAAgrk9lUeVDjgmrI7lNIUlXlzrBHo7W5Y=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.3/go.mod h1:bASDMbNQ0vD+2YRsEqlKXg8NiEsJpQ8B8p3nR8kB+hA=
github.com/osmosis-labs/wasmd v0.29.2-osmo-v13 h1:HvxAks1ctB3nBx1cXqcmfA0g0BKe7Og77OA2j2rxaJk=
github.com/osmosis-labs/wasmd v0.29.2-osmo-v13/go.mod h1:UlLBU5vuHncwQUM9W8lw+2mEptEMFxxfVWupZ6sXtn4=
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
Expand Down
1 change: 1 addition & 0 deletions go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ go 1.18

use ./osmomath
use ./osmoutils
use ./x/ibc-hooks
use .
Loading