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

Updated bech32ibc version #345

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Updated bech32ibc version #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42df373
bech32 ibc initialization from osmosis repo
antstalepresh Sep 14, 2021
ccf9262
remove copied code
antstalepresh Sep 15, 2021
db26d92
add bech32ibc package with upgraded sdk version
antstalepresh Sep 15, 2021
e5e497a
upgrade bech32ibc version to latest
antstalepresh Oct 4, 2021
0e4968a
Merge branch 'main' into bech32ibc
antstalepresh Oct 4, 2021
42d2804
go mod tidy
antstalepresh Oct 4, 2021
6bcc2ef
update to use upgraded bech32ibc and bech32ics20
antstalepresh Oct 13, 2021
68f077b
update bech32-ibc version
antstalepresh Oct 13, 2021
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
14 changes: 4 additions & 10 deletions module/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ import (
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
"github.com/osmosis-labs/bech32-ibc/x/bech32ics20"
bech32ics20keeper "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/keeper"
bech32ics20types "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/types"

tmversion "github.com/tendermint/tendermint/proto/tendermint/version"

Expand Down Expand Up @@ -380,8 +379,9 @@ func NewGravityApp(
)

app.bech32ICS20Keeper = *bech32ics20keeper.NewKeeper(
app.ibcKeeper.ChannelKeeper,
app.bankKeeper, app.transferKeeper,
app.bech32IBCKeeper, appCodec,
app.bech32IBCKeeper, app.transferKeeper, appCodec,
)

ibcRouter := porttypes.NewRouter()
Expand Down Expand Up @@ -436,11 +436,7 @@ func NewGravityApp(
app.accountKeeper,
app.bankKeeper,
),
bank.NewAppModule(
appCodec,
app.bankKeeper,
app.accountKeeper,
),
bech32ics20.NewAppModule(appCodec, app.bech32ICS20Keeper),
capability.NewAppModule(
appCodec,
*app.capabilityKeeper,
Expand Down Expand Up @@ -489,7 +485,6 @@ func NewGravityApp(
app.bankKeeper,
),
bech32ibc.NewAppModule(appCodec, app.bech32IBCKeeper),
bech32ics20.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper),
)

app.mm.SetOrderBeginBlockers(
Expand Down Expand Up @@ -523,7 +518,6 @@ func NewGravityApp(
ibctransfertypes.ModuleName,
gravitytypes.ModuleName,
bech32ibctypes.ModuleName,
bech32ics20types.ModuleName,
)

app.mm.RegisterInvariants(&app.crisisKeeper)
Expand All @@ -532,7 +526,7 @@ func NewGravityApp(

app.sm = module.NewSimulationManager(
auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts),
bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper),
bech32ics20.NewAppModule(appCodec, app.bech32ICS20Keeper),
capability.NewAppModule(appCodec, *app.capabilityKeeper),
gov.NewAppModule(appCodec, app.govKeeper, app.accountKeeper, app.bankKeeper),
mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper),
Expand Down
4 changes: 3 additions & 1 deletion module/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/osmosis-labs/bech32-ibc v0.0.0-20210915162724-f0f541e2d029
github.com/osmosis-labs/bech32-ibc v0.0.0-20211013145320-6811905090c9
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
github.com/regen-network/cosmos-proto v0.3.1
Expand All @@ -26,3 +26,5 @@ require (
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4

replace google.golang.org/grpc => google.golang.org/grpc v1.33.2

replace github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.42.10-0.20211013141003-de25c0edf532
Loading