From a3a3ddc08e04208e7bb6abc4a5cfa7790c2284db Mon Sep 17 00:00:00 2001 From: tnv1 Date: Mon, 15 Apr 2024 13:02:43 +0700 Subject: [PATCH 1/3] Add feeabs module --- app/ante.go | 6 ++++++ app/app.go | 41 +++++++++++++++++++++++++++++++++++++++-- go.mod | 1 + go.sum | 2 ++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/ante.go b/app/ante.go index 0a51df5c..638aa71f 100644 --- a/app/ante.go +++ b/app/ante.go @@ -14,6 +14,9 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" + + feeabsante "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/ante" + feeabskeeper "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -26,6 +29,7 @@ type HandlerOptions struct { BankKeeper bankkeeper.Keeper WasmConfig *wasmTypes.WasmConfig TXCounterStoreKey storetypes.StoreKey + FeeabsKeeper feeabskeeper.Keeper } func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { @@ -59,10 +63,12 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit), // after setup context to enforce limits early wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey), ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker), + feeabsante.NewFeeAbstrationMempoolFeeDecorator(options.FeeabsKeeper), ante.NewValidateBasicDecorator(), ante.NewTxTimeoutHeightDecorator(), ante.NewValidateMemoDecorator(options.AccountKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), + feeabsante.NewFeeAbstractionDeductFeeDecorate(options.AccountKeeper, options.BankKeeper, options.FeeabsKeeper, options.FeegrantKeeper), feeburnAnte.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker, *options.FeeburnKeeper), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), diff --git a/app/app.go b/app/app.go index 544b1945..84dad8cc 100644 --- a/app/app.go +++ b/app/app.go @@ -137,6 +137,10 @@ import ( feeburnmodulekeeper "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/x/feeburn/keeper" feeburnmoduletypes "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/x/feeburn/types" + feeabsmodule "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs" + feeabskeeper "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/keeper" + feeabstypes "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types" + // Note: please do your research before using this in production app, this is a demo and not an officially // supported IBC team implementation. It has no known issues, but do your own research before using it. @@ -224,6 +228,7 @@ var ( ica.AppModuleBasic{}, ibcfee.AppModuleBasic{}, feeburnmodule.AppModuleBasic{}, + feeabsmodule.AppModuleBasic{}, ) // module account permissions @@ -242,6 +247,7 @@ var ( tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, alliancemoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner}, alliancemoduletypes.RewardsPoolName: nil, + feeabstypes.ModuleName: nil, } ) @@ -296,6 +302,8 @@ type MigalooApp struct { ConsensusParamsKeeper consensusparamkeeper.Keeper FeeBurnKeeper feeburnmodulekeeper.Keeper + FeeabsKeeper feeabskeeper.Keeper + // IBC hooks IBCHooksKeeper *ibchookskeeper.Keeper TransferStack *ibcporttypes.IBCModule @@ -307,6 +315,7 @@ type MigalooApp struct { ScopedTransferKeeper capabilitykeeper.ScopedKeeper ScopedIBCFeeKeeper capabilitykeeper.ScopedKeeper ScopedWasmKeeper capabilitykeeper.ScopedKeeper + ScopedFeeabsKeeper capabilitykeeper.ScopedKeeper // Middleware wrapper Ics20WasmHooks *ibchooks.WasmHooks @@ -364,6 +373,7 @@ func NewMigalooApp( alliancemoduletypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, ibchookstypes.StoreKey, feeburnmoduletypes.StoreKey, + feeabstypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) @@ -404,6 +414,7 @@ func NewMigalooApp( scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) + scopedFeeabsKeeper := app.CapabilityKeeper.ScopeToModule(feeabstypes.ModuleName) // add keepers app.AccountKeeper = authkeeper.NewAccountKeeper( @@ -530,6 +541,19 @@ func NewMigalooApp( authtypes.NewModuleAddress(govtypes.ModuleName), ) + app.FeeabsKeeper = feeabskeeper.NewKeeper( + appCodec, + app.keys[feeabstypes.StoreKey], + app.GetSubspace(feeabstypes.ModuleName), + app.StakingKeeper, + app.AccountKeeper, + app.BankKeeper, + app.TransferKeeper, + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, + app.ScopedFeeabsKeeper, + ) + // Register the proposal types // Deprecated: Avoid adding new handlers, instead use the new proposal flow // by granting the governance module the right to execute the message. @@ -540,7 +564,8 @@ func NewMigalooApp( AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)). AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)). AddRoute(alliancemoduletypes.RouterKey, alliancemodule.NewAllianceProposalHandler(app.AllianceKeeper)). - AddRoute(feeburnmoduletypes.RouterKey, feeburnmodule.NewFeeBurnProposalHandler(app.FeeBurnKeeper)) + AddRoute(feeburnmoduletypes.RouterKey, feeburnmodule.NewFeeBurnProposalHandler(app.FeeBurnKeeper)). + AddRoute(feeabstypes.RouterKey, feeabsmodule.NewHostZoneProposal(app.FeeabsKeeper)) // Configure the hooks keeper hooksKeeper := ibchookskeeper.NewKeeper( @@ -714,7 +739,8 @@ func NewMigalooApp( AddRoute(icahosttypes.SubModuleName, icaHostStack). AddRoute(ibctransfertypes.ModuleName, *app.TransferStack). AddRoute(wasmtypes.ModuleName, wasmStack). - AddRoute(icqtypes.ModuleName, icqStack) + AddRoute(icqtypes.ModuleName, icqStack). + AddRoute(feeabstypes.ModuleName, feeabsmodule.NewIBCModule(appCodec, app.FeeabsKeeper)) app.IBCKeeper.SetRouter(ibcRouter) @@ -780,6 +806,7 @@ func NewMigalooApp( icq.NewAppModule(app.ICQKeeper, app.GetSubspace(icqtypes.ModuleName)), alliancemodule.NewAppModule(appCodec, app.AllianceKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry, app.GetSubspace(alliancemoduletypes.ModuleName)), ibcfee.NewAppModule(app.IBCFeeKeeper), + feeabsmodule.NewAppModule(appCodec, app.FeeabsKeeper), ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper), tokenfactory.NewAppModule(app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(tokenfactorytypes.ModuleName)), packetforward.NewAppModule(app.PacketForwardKeeper, app.GetSubspace(packetforwardtypes.ModuleName)), @@ -812,6 +839,7 @@ func NewMigalooApp( feeburnmoduletypes.ModuleName, // additional non simd modules ibctransfertypes.ModuleName, + feeabstypes.ModuleName, ibcexported.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, @@ -846,6 +874,7 @@ func NewMigalooApp( packetforwardtypes.ModuleName, ibctransfertypes.ModuleName, ibcexported.ModuleName, + feeabstypes.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, ibchookstypes.ModuleName, @@ -885,6 +914,7 @@ func NewMigalooApp( packetforwardtypes.ModuleName, ibctransfertypes.ModuleName, ibcexported.ModuleName, + feeabstypes.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, tokenfactorytypes.ModuleName, @@ -933,6 +963,7 @@ func NewMigalooApp( FeeburnKeeper: &app.FeeBurnKeeper, WasmConfig: &wasmConfig, TXCounterStoreKey: keys[wasmtypes.StoreKey], + FeeabsKeeper: app.FeeabsKeeper, }, ) if err != nil { @@ -963,6 +994,7 @@ func NewMigalooApp( app.ScopedICAHostKeeper = scopedICAHostKeeper app.ScopedICAControllerKeeper = scopedICAControllerKeeper app.ScopedICQKeeper = scopedICQKeeper + app.ScopedFeeabsKeeper = scopedFeeabsKeeper // set the contract keeper for the Ics20WasmHooks app.Ics20WasmHooks.ContractKeeper = &app.WasmKeeper @@ -1049,6 +1081,10 @@ func (app *MigalooApp) BlockedModuleAccountAddrs() map[string]bool { if acc == alliancemoduletypes.ModuleName { continue } + // don't blacklist feeabs module account, so that it can hold ibc tokens + if acc == feeabstypes.ModuleName { + continue + } modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true } @@ -1237,6 +1273,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable()) paramsKeeper.Subspace(alliancemoduletypes.ModuleName).WithKeyTable(alliancemoduletypes.ParamKeyTable()) paramsKeeper.Subspace(feeburnmoduletypes.ModuleName) + paramsKeeper.Subspace(feeabstypes.ModuleName) return paramsKeeper } diff --git a/go.mod b/go.mod index bf0c7c4b..82980dd6 100644 --- a/go.mod +++ b/go.mod @@ -156,6 +156,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/osmosis-labs/fee-abstraction/v7 v7.0.0-20240408070113-b8791624f3be // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index 9cbe2fcc..b017550d 100644 --- a/go.sum +++ b/go.sum @@ -854,6 +854,8 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/osmosis-labs/fee-abstraction/v7 v7.0.0-20240408070113-b8791624f3be h1:CBgtICAJK19dIBOfXMUAa8H/f78iFCUmVSy5Sk8HTdw= +github.com/osmosis-labs/fee-abstraction/v7 v7.0.0-20240408070113-b8791624f3be/go.mod h1:y/N5kGya7AQm/kfBvlhi2CmwjsXMXGHOuRQ1WH7jK8Y= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= From b3f2312aa10a5a1ee5fb870c01b477dd0ca95b6b Mon Sep 17 00:00:00 2001 From: tnv1 Date: Tue, 16 Apr 2024 13:12:23 +0700 Subject: [PATCH 2/3] Fix nil scoped feeabs keeper --- app/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index 84dad8cc..37f05600 100644 --- a/app/app.go +++ b/app/app.go @@ -551,7 +551,7 @@ func NewMigalooApp( app.TransferKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, - app.ScopedFeeabsKeeper, + scopedFeeabsKeeper, ) // Register the proposal types From 1203d1cb8c320174917f21255e046e46f804bdd0 Mon Sep 17 00:00:00 2001 From: tnv1 Date: Tue, 16 Apr 2024 13:15:05 +0700 Subject: [PATCH 3/3] Go mod tidy --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 82980dd6..cd69f6a7 100644 --- a/go.mod +++ b/go.mod @@ -53,6 +53,7 @@ require ( github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3 github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.1.1 github.com/golang/protobuf v1.5.4 + github.com/osmosis-labs/fee-abstraction/v7 v7.0.0-20240408070113-b8791624f3be gopkg.in/yaml.v2 v2.4.0 ) @@ -156,7 +157,6 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/osmosis-labs/fee-abstraction/v7 v7.0.0-20240408070113-b8791624f3be // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index b017550d..b57002ae 100644 --- a/go.sum +++ b/go.sum @@ -666,8 +666,9 @@ github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoD github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=