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

Jump to bottom

Import tibc protocol #2668

Merged
merged 16 commits into from
Oct 9, 2021
Merged

Import tibc protocol #2668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5cf8191
update app
CoreyCheung Sep 9, 2021
80abee7
update simapp
CoreyCheung Sep 9, 2021
1eb2bac
fix
CoreyCheung Sep 9, 2021
2beb634
fix
CoreyCheung Sep 9, 2021
0b7c590
update ConfigureBech32Prefix
CoreyCheung Sep 10, 2021
4f79f28
update irismod version
CoreyCheung Sep 10, 2021
12ff04e
fix
CoreyCheung Sep 13, 2021
8dd543d
fix
CoreyCheung Sep 16, 2021
eae012f
fix
CoreyCheung Sep 16, 2021
f632edc
fix
CoreyCheung Sep 16, 2021
f4ab00f
add tibc module
CoreyCheung Sep 30, 2021
bf0a5d5
fix NewAccountKeeper
CoreyCheung Sep 30, 2021
64a0117
fix
CoreyCheung Sep 30, 2021
ab554d9
bformat
CoreyCheung Sep 30, 2021
0b9c0c8
fix
CoreyCheung Sep 30, 2021
a53089d
bump tibc version
CoreyCheung Sep 30, 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
102 changes: 72 additions & 30 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package app

import (
"github.com/cosmos/cosmos-sdk/x/feegrant"
CoreyCheung marked this conversation as resolved.
Show resolved Hide resolved
"io"
"os"
"path/filepath"
Expand Down Expand Up @@ -51,6 +52,7 @@ import (
evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
"github.com/cosmos/cosmos-sdk/x/gov"
Expand Down Expand Up @@ -122,6 +124,18 @@ import (
"github.com/irisnet/irismod/modules/farm"
farmkeeper "github.com/irisnet/irismod/modules/farm/keeper"
farmtypes "github.com/irisnet/irismod/modules/farm/types"

tibcnfttransfer "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer"
tibcnfttransferkeeper "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer/keeper"
tibcnfttypes "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer/types"
tibc "github.com/bianjieai/tibc-go/modules/tibc/core"
tibcclient "github.com/bianjieai/tibc-go/modules/tibc/core/02-client"
tibcclienttypes "github.com/bianjieai/tibc-go/modules/tibc/core/02-client/types"
tibchost "github.com/bianjieai/tibc-go/modules/tibc/core/24-host"
tibcrouting "github.com/bianjieai/tibc-go/modules/tibc/core/26-routing"
tibcroutingtypes "github.com/bianjieai/tibc-go/modules/tibc/core/26-routing/types"
tibckeeper "github.com/bianjieai/tibc-go/modules/tibc/core/keeper"
tibcmock "github.com/bianjieai/tibc-go/modules/tibc/testing/mock"
)

const appName = "IrisApp"
Expand Down Expand Up @@ -151,6 +165,10 @@ var (
distrclient.ProposalHandler,
upgradeclient.ProposalHandler,
upgradeclient.CancelProposalHandler,
tibcclient.CreateClientProposalHandler,
tibcclient.UpgradeClientProposalHandler,
tibcclient.RegisterRelayerProposalHandler,
tibcrouting.SetRoutingRulesProposalHandler,
),
params.AppModuleBasic{},
crisis.AppModuleBasic{},
Expand All @@ -160,6 +178,7 @@ var (
evidence.AppModuleBasic{},
transfer.AppModuleBasic{},
vesting.AppModuleBasic{},
feegrantmodule.AppModuleBasic{},

guardian.AppModuleBasic{},
token.AppModuleBasic{},
Expand All @@ -171,6 +190,8 @@ var (
oracle.AppModuleBasic{},
random.AppModuleBasic{},
farm.AppModuleBasic{},
tibc.AppModuleBasic{},
tibcnfttransfer.AppModuleBasic{},
)

// module account permissions
Expand All @@ -190,6 +211,7 @@ var (
servicetypes.FeeCollectorName: {authtypes.Burner},
farmtypes.ModuleName: nil,
farmtypes.RewardCollector: nil,
tibcnfttypes.ModuleName: nil,
}

nativeToken tokentypes.Token
Expand Down Expand Up @@ -217,7 +239,7 @@ type IrisApp struct {
memKeys map[string]*sdk.MemoryStoreKey

// keepers
feegrantKeeper feegrantkeeper.Keeper
feeGrantKeeper feegrantkeeper.Keeper
accountKeeper authkeeper.AccountKeeper
bankKeeper bankkeeper.Keeper
capabilityKeeper *capabilitykeeper.Keeper
Expand All @@ -234,20 +256,22 @@ type IrisApp struct {
transferKeeper ibctransferkeeper.Keeper

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
ScopedIBCMockKeeper capabilitykeeper.ScopedKeeper

guardianKeeper guardiankeeper.Keeper
tokenKeeper tokenkeeper.Keeper
recordKeeper recordkeeper.Keeper
nftKeeper nftkeeper.Keeper
htlcKeeper htlckeeper.Keeper
coinswapKeeper coinswapkeeper.Keeper
serviceKeeper servicekeeper.Keeper
oracleKeeper oraclekeeper.Keeper
randomKeeper randomkeeper.Keeper
farmkeeper farmkeeper.Keeper
scopedIBCKeeper capabilitykeeper.ScopedKeeper
scopedTransferKeeper capabilitykeeper.ScopedKeeper
scopedIBCMockKeeper capabilitykeeper.ScopedKeeper

guardianKeeper guardiankeeper.Keeper
tokenKeeper tokenkeeper.Keeper
recordKeeper recordkeeper.Keeper
nftKeeper nftkeeper.Keeper
htlcKeeper htlckeeper.Keeper
coinswapKeeper coinswapkeeper.Keeper
serviceKeeper servicekeeper.Keeper
oracleKeeper oraclekeeper.Keeper
randomKeeper randomkeeper.Keeper
farmkeeper farmkeeper.Keeper
tibcKeeper *tibckeeper.Keeper
nftTransferKeeper tibcnfttransferkeeper.Keeper

// the module manager
mm *module.Manager
Expand Down Expand Up @@ -326,7 +350,7 @@ func NewIrisApp(
evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
guardiantypes.StoreKey, tokentypes.StoreKey, nfttypes.StoreKey, htlctypes.StoreKey, recordtypes.StoreKey,
coinswaptypes.StoreKey, servicetypes.StoreKey, oracletypes.StoreKey, randomtypes.StoreKey,
farmtypes.StoreKey,
farmtypes.StoreKey, feegrant.StoreKey, tibchost.StoreKey, tibcnfttypes.StoreKey,
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
Expand All @@ -351,10 +375,11 @@ func NewIrisApp(
app.capabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey])
scopedIBCKeeper := app.capabilityKeeper.ScopeToModule(ibchost.ModuleName)
scopedTransferKeeper := app.capabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
scopedtibcKeeper := app.capabilityKeeper.ScopeToModule(tibchost.ModuleName)

// add keepers
app.feegrantKeeper = feegrantkeeper.NewKeeper(appCodec,
keys[farmtypes.StoreKey],
app.feeGrantKeeper = feegrantkeeper.NewKeeper(appCodec,
keys[feegrant.StoreKey],
app.accountKeeper,
)
app.accountKeeper = authkeeper.NewAccountKeeper(
Expand Down Expand Up @@ -392,19 +417,28 @@ func NewIrisApp(
app.ibcKeeper = ibckeeper.NewKeeper(
appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), app.stakingKeeper, app.upgradeKeeper, scopedIBCKeeper,
)

// register the proposal types
app.tibcKeeper = tibckeeper.NewKeeper(
appCodec, keys[tibchost.StoreKey], app.GetSubspace(tibchost.ModuleName), app.stakingKeeper, scopedtibcKeeper,
)

govRouter := govtypes.NewRouter()
govRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler).
AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.paramsKeeper)).
AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.distrKeeper)).
AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.upgradeKeeper)).
AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.ibcKeeper.ClientKeeper))
AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.ibcKeeper.ClientKeeper)).
AddRoute(tibcclienttypes.RouterKey, tibcclient.NewClientProposalHandler(app.tibcKeeper.ClientKeeper)).
AddRoute(tibcroutingtypes.RouterKey, tibcrouting.NewSetRoutingProposalHandler(app.tibcKeeper.RoutingKeeper))
app.govKeeper = govkeeper.NewKeeper(
appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.accountKeeper, app.bankKeeper,
&stakingKeeper, govRouter,
)

app.nftTransferKeeper = tibcnfttransferkeeper.NewKeeper(
appCodec, keys[tibcnfttypes.StoreKey], app.GetSubspace(tibcnfttypes.ModuleName),
app.accountKeeper, app.nftKeeper,
app.tibcKeeper.PacketKeeper, app.tibcKeeper.ClientKeeper,
)
// Create Transfer Keepers
app.transferKeeper = ibctransferkeeper.NewKeeper(
appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName),
Expand All @@ -418,6 +452,13 @@ func NewIrisApp(
ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferModule)
app.ibcKeeper.SetRouter(ibcRouter)

nfttransferModule := tibcnfttransfer.NewAppModule(app.nftTransferKeeper)
mockModule := tibcmock.NewAppModule()
CoreyCheung marked this conversation as resolved.
Show resolved Hide resolved
tibcRouter := tibcroutingtypes.NewRouter()
tibcRouter.AddRoute(tibcnfttypes.ModuleName, nfttransferModule)
tibcRouter.AddRoute(tibcmock.ModuleName, mockModule)
app.tibcKeeper.SetRouter(tibcRouter)

// create evidence keeper with router
evidenceKeeper := evidencekeeper.NewKeeper(
appCodec, keys[evidencetypes.StoreKey], &app.stakingKeeper, app.slashingKeeper,
Expand Down Expand Up @@ -515,7 +556,8 @@ func NewIrisApp(
staking.NewAppModule(appCodec, app.stakingKeeper, app.accountKeeper, app.bankKeeper),
upgrade.NewAppModule(app.upgradeKeeper),
evidence.NewAppModule(app.evidenceKeeper),
ibc.NewAppModule(app.ibcKeeper),
feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry),
ibc.NewAppModule(app.ibcKeeper), tibc.NewAppModule(app.tibcKeeper),
params.NewAppModule(app.paramsKeeper),
transferModule,
guardian.NewAppModule(appCodec, app.guardianKeeper),
Expand All @@ -537,11 +579,11 @@ func NewIrisApp(
app.mm.SetOrderBeginBlockers(
upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName,
slashingtypes.ModuleName, evidencetypes.ModuleName, stakingtypes.ModuleName,
ibchost.ModuleName, htlctypes.ModuleName, randomtypes.ModuleName, farmtypes.ModuleName,
ibchost.ModuleName, tibchost.ModuleName, htlctypes.ModuleName, randomtypes.ModuleName, farmtypes.ModuleName,
)
app.mm.SetOrderEndBlockers(
crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName,
servicetypes.ModuleName, farmtypes.ModuleName,
servicetypes.ModuleName, farmtypes.ModuleName, tibchost.ModuleName,
)

// NOTE: The genutils module must occur after staking so that pools are
Expand All @@ -551,7 +593,7 @@ func NewIrisApp(
// can do so safely.
app.mm.SetOrderInitGenesis(
capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, stakingtypes.ModuleName,
slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, crisistypes.ModuleName,
slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, crisistypes.ModuleName, feegrant.ModuleName,
ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, ibctransfertypes.ModuleName,
guardiantypes.ModuleName, tokentypes.ModuleName, nfttypes.ModuleName, htlctypes.ModuleName, recordtypes.ModuleName,
coinswaptypes.ModuleName, servicetypes.ModuleName, oracletypes.ModuleName, randomtypes.ModuleName, farmtypes.ModuleName,
Expand All @@ -571,6 +613,7 @@ func NewIrisApp(
capability.NewAppModule(appCodec, *app.capabilityKeeper),
gov.NewAppModule(appCodec, app.govKeeper, app.accountKeeper, app.bankKeeper),
mint.NewAppModule(appCodec, app.mintKeeper),
feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry),
staking.NewAppModule(appCodec, app.stakingKeeper, app.accountKeeper, app.bankKeeper),
distr.NewAppModule(appCodec, app.distrKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper),
slashing.NewAppModule(appCodec, app.slashingKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper),
Expand All @@ -588,6 +631,7 @@ func NewIrisApp(
oracle.NewAppModule(appCodec, app.oracleKeeper, app.accountKeeper, app.bankKeeper),
random.NewAppModule(appCodec, app.randomKeeper, app.accountKeeper, app.bankKeeper),
farm.NewAppModule(appCodec, app.farmkeeper, app.accountKeeper, app.bankKeeper),
tibc.NewAppModule(app.tibcKeeper),
)

app.sm.RegisterStoreDecoders()
Expand All @@ -603,7 +647,7 @@ func NewIrisApp(
app.SetAnteHandler(NewAnteHandler(
app.accountKeeper,
app.bankKeeper,
app.feegrantKeeper,
app.feeGrantKeeper,
app.tokenKeeper,
app.oracleKeeper,
app.guardianKeeper,
Expand All @@ -629,7 +673,7 @@ func NewIrisApp(

app.RegisterUpgradePlan(
"v1.2", &store.StoreUpgrades{
Added: []string{farmtypes.StoreKey},
Added: []string{farmtypes.StoreKey, feegrant.StoreKey, tibchost.StoreKey, tibcnfttypes.StoreKey},
},
func(ctx sdk.Context, plan sdkupgrade.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// migrate coinswap
Expand Down Expand Up @@ -662,9 +706,6 @@ func NewIrisApp(
app.capabilityKeeper.Seal()
}

app.ScopedIBCKeeper = scopedIBCKeeper
app.ScopedTransferKeeper = scopedTransferKeeper

return app
}

Expand Down Expand Up @@ -856,6 +897,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(servicetypes.ModuleName)
paramsKeeper.Subspace(ibchost.ModuleName)
paramsKeeper.Subspace(farmtypes.ModuleName)
paramsKeeper.Subspace(tibchost.ModuleName)

return paramsKeeper
}
15 changes: 8 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,28 @@ module github.com/irisnet/irishub
go 1.15

require (
github.com/bianjieai/tibc-go v0.1.1-0.20210929101645-6adebdbb39f7
github.com/cosmos/cosmos-sdk v0.44.0
github.com/cosmos/ibc-go v1.1.0
github.com/gogo/protobuf v1.3.3
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/irisnet/irismod v1.4.1-0.20210910063133-8e019ad3a7af
github.com/irisnet/irismod v1.4.1-0.20210910095539-475575886daf
github.com/olebedev/config v0.0.0-20190528211619-364964f3a8e4
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
github.com/spf13/cast v1.3.1
github.com/spf13/cobra v1.1.3
github.com/spf13/cast v1.4.0
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.8.0
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
github.com/tendermint/tendermint v0.34.12
github.com/tendermint/tm-db v0.6.4
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
google.golang.org/grpc v1.38.0
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67
google.golang.org/grpc v1.39.0
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
Loading