diff --git a/app/ante.go b/app/ante.go index ba999fc802a..cb3d70fa381 100644 --- a/app/ante.go +++ b/app/ante.go @@ -11,11 +11,11 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" - osmoante "github.com/osmosis-labs/osmosis/v7/ante" - v9 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v9" + osmoante "github.com/osmosis-labs/osmosis/v10/ante" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" - txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) // Link to default ante handler used by cosmos sdk: diff --git a/app/app.go b/app/app.go index 7c1c9b58829..cc3db5234ec 100644 --- a/app/app.go +++ b/app/app.go @@ -39,20 +39,20 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" - v10 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v10" - v11 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v11" - v3 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v3" - v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4" - v5 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v5" - v6 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v6" - v7 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v7" - v8 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v9" - _ "github.com/osmosis-labs/osmosis/v7/client/docs/statik" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" + v11 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v11" + v3 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v3" + v4 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v4" + v5 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v5" + v6 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v6" + v7 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v7" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" ) const appName = "OsmosisApp" diff --git a/app/apptesting/gamm.go b/app/apptesting/gamm.go index 556efb75358..87a43c74f84 100644 --- a/app/apptesting/gamm.go +++ b/app/apptesting/gamm.go @@ -3,8 +3,8 @@ package apptesting import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var DefaultAcctFunds sdk.Coins = sdk.NewCoins( diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index 0e892295587..4cb5a7c7d34 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -23,11 +23,11 @@ import ( tmtypes "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) type KeeperTestHelper struct { diff --git a/app/config.go b/app/config.go index 72e8975ef0d..fd27d842870 100644 --- a/app/config.go +++ b/app/config.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/app/encoding.go b/app/encoding.go index 809483a93d4..b2178eb0ebb 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,7 +1,7 @@ package app import ( - "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" "github.com/cosmos/cosmos-sdk/std" ) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 180fc6d2baf..cbd1b94e616 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -47,29 +47,29 @@ import ( // IBC Transfer: Defines the "transfer" IBC port transfer "github.com/cosmos/ibc-go/v3/modules/apps/transfer" - _ "github.com/osmosis-labs/osmosis/v7/client/docs/statik" - owasm "github.com/osmosis-labs/osmosis/v7/wasmbinding" - epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid" - superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees" - txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + owasm "github.com/osmosis-labs/osmosis/v10/wasmbinding" + epochskeeper "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + mintkeeper "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidkeeper "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees" + txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type AppKeepers struct { diff --git a/app/keepers/modules.go b/app/keepers/modules.go index 83af806ebdf..cf6555b3252 100644 --- a/app/keepers/modules.go +++ b/app/keepers/modules.go @@ -27,18 +27,18 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" - _ "github.com/osmosis-labs/osmosis/v7/client/docs/statik" - "github.com/osmosis-labs/osmosis/v7/x/epochs" - "github.com/osmosis-labs/osmosis/v7/x/gamm" - "github.com/osmosis-labs/osmosis/v7/x/incentives" - "github.com/osmosis-labs/osmosis/v7/x/lockup" - "github.com/osmosis-labs/osmosis/v7/x/mint" - poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" - poolincentivesclient "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client" - superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid" - superfluidclient "github.com/osmosis-labs/osmosis/v7/x/superfluid/client" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory" - "github.com/osmosis-labs/osmosis/v7/x/txfees" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + "github.com/osmosis-labs/osmosis/v10/x/incentives" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + "github.com/osmosis-labs/osmosis/v10/x/mint" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentivesclient "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client" + superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidclient "github.com/osmosis-labs/osmosis/v10/x/superfluid/client" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory" + "github.com/osmosis-labs/osmosis/v10/x/txfees" ) // AppModuleBasics returns ModuleBasics for the module BasicManager. diff --git a/app/modules.go b/app/modules.go index b30332e45b0..b3ed20189ce 100644 --- a/app/modules.go +++ b/app/modules.go @@ -40,28 +40,28 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" - _ "github.com/osmosis-labs/osmosis/v7/client/docs/statik" - "github.com/osmosis-labs/osmosis/v7/osmoutils/partialord" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" - "github.com/osmosis-labs/osmosis/v7/x/epochs" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/mint" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" - superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) // moduleAccountPermissions defines module account permissions diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 02e715e1dad..8b03250a634 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 21c1bac4650..db6c9ff5f02 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" ) // Last executed block on the v9 code was 4713064. diff --git a/app/upgrades/v10/fork.go b/app/upgrades/v10/fork.go index 6e0444dce6e..d7f2b409739 100644 --- a/app/upgrades/v10/fork.go +++ b/app/upgrades/v10/fork.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) { diff --git a/app/upgrades/v10/upgrades_test.go b/app/upgrades/v10/upgrades_test.go index 2f072445639..d5ced00644c 100644 --- a/app/upgrades/v10/upgrades_test.go +++ b/app/upgrades/v10/upgrades_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index 4b0e8f2aded..fa9fa4455c7 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index f7ec51f188e..be6e5c21cba 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" ) // We set the app version to pre-upgrade because it will be incremented by one diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index 6d47d6677ba..f206b506cb1 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -1,6 +1,6 @@ package v3 -import "github.com/osmosis-labs/osmosis/v7/app/upgrades" +import "github.com/osmosis-labs/osmosis/v10/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Osmosis v3 upgrade. diff --git a/app/upgrades/v3/forks.go b/app/upgrades/v3/forks.go index 28fac0d1a32..ce23aab4de1 100644 --- a/app/upgrades/v3/forks.go +++ b/app/upgrades/v3/forks.go @@ -5,7 +5,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/osmosis-labs/osmosis/v7/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v3 diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index 33654160b88..2557e2f6f2b 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -1,7 +1,7 @@ package v4 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go index 0f66dd3dfea..f0ffb4b44f0 100644 --- a/app/upgrades/v4/upgrade_test.go +++ b/app/upgrades/v4/upgrade_test.go @@ -11,8 +11,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/app" - v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4" + "github.com/osmosis-labs/osmosis/v10/app" + v4 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v4" sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index eac31d0abf5..f2b4e2266b0 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" ) // CreateUpgradeHandler returns an x/upgrade handler for the Osmosis v4 on-chain diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index 39dfb39105c..661f22ad5a2 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -1,7 +1,7 @@ package v5 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index efb21a5c1f8..3a00ae37d9c 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v5/whitelist_feetokens.go b/app/upgrades/v5/whitelist_feetokens.go index 2345ea81559..28ad342e24b 100644 --- a/app/upgrades/v5/whitelist_feetokens.go +++ b/app/upgrades/v5/whitelist_feetokens.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) // Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21 diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go index 83b26923a11..e1d05d1df80 100644 --- a/app/upgrades/v6/constants.go +++ b/app/upgrades/v6/constants.go @@ -1,6 +1,6 @@ package v6 -import "github.com/osmosis-labs/osmosis/v7/app/upgrades" +import "github.com/osmosis-labs/osmosis/v10/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Osmosis v6 upgrade. diff --git a/app/upgrades/v6/forks.go b/app/upgrades/v6/forks.go index f51eee496e4..1bdaa11d759 100644 --- a/app/upgrades/v6/forks.go +++ b/app/upgrades/v6/forks.go @@ -3,7 +3,7 @@ package v6 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v6 diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index f561859b2cc..2e2b94785a0 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -3,8 +3,8 @@ package v7 import ( "github.com/CosmWasm/wasmd/x/wasm" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index c07ac041470..3222f6226a7 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -7,10 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" - lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index a0fc2128ecb..933e1c496b3 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -1,8 +1,8 @@ package v8 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" - v8constants "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8/constants" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + v8constants "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8/constants" ) const ( diff --git a/app/upgrades/v8/forks.go b/app/upgrades/v8/forks.go index 025ef17e77f..3ddc37ef71f 100644 --- a/app/upgrades/v8/forks.go +++ b/app/upgrades/v8/forks.go @@ -3,7 +3,7 @@ package v8 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v8 diff --git a/app/upgrades/v8/incentive_props.go b/app/upgrades/v8/incentive_props.go index 07ba90d918e..a0563c42799 100644 --- a/app/upgrades/v8/incentive_props.go +++ b/app/upgrades/v8/incentive_props.go @@ -2,9 +2,9 @@ package v8 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) // This file implements logic for accelerated incentive proposals. diff --git a/app/upgrades/v8/msg_filter_ante.go b/app/upgrades/v8/msg_filter_ante.go index 056ad4ac0bb..ff32df8cc47 100644 --- a/app/upgrades/v8/msg_filter_ante.go +++ b/app/upgrades/v8/msg_filter_ante.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) // MsgFilterDecorator defines an AnteHandler decorator for the v8 upgrade that diff --git a/app/upgrades/v8/msg_filter_ante_test.go b/app/upgrades/v8/msg_filter_ante_test.go index f3082ab59d8..202cb029893 100644 --- a/app/upgrades/v8/msg_filter_ante_test.go +++ b/app/upgrades/v8/msg_filter_ante_test.go @@ -7,9 +7,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/app" - v8 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v8/unpool_whitelist.go b/app/upgrades/v8/unpool_whitelist.go index 7ecb1ce43f7..9131715f77c 100644 --- a/app/upgrades/v8/unpool_whitelist.go +++ b/app/upgrades/v8/unpool_whitelist.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + superfluidkeeper "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" ) const ustDenom = "ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC" diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go index 791e83fd329..32d78d07b3e 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -1,13 +1,13 @@ package v9 import ( - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v9 upgrade. diff --git a/app/upgrades/v9/msg_filter_ante_test.go b/app/upgrades/v9/msg_filter_ante_test.go index 0a3d9b5fee5..a6ff7f34aee 100644 --- a/app/upgrades/v9/msg_filter_ante_test.go +++ b/app/upgrades/v9/msg_filter_ante_test.go @@ -9,9 +9,9 @@ import ( ibcchanneltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - "github.com/osmosis-labs/osmosis/v7/app" - v8 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v10/app" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go index 7458c9eded7..c6d482065fe 100644 --- a/app/upgrades/v9/prop214.go +++ b/app/upgrades/v9/prop214.go @@ -3,8 +3,8 @@ package v9 import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" ) // Executes prop214, https://www.mintscan.io/osmosis/proposals/214 diff --git a/app/upgrades/v9/prop214_test.go b/app/upgrades/v9/prop214_test.go index 0fc62d6cb71..1c6ab54e1d7 100644 --- a/app/upgrades/v9/prop214_test.go +++ b/app/upgrades/v9/prop214_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - v9 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index dfe54bde5aa..e412f928281 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -10,15 +10,15 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types" - "github.com/osmosis-labs/osmosis/v7/app/keepers" - "github.com/osmosis-labs/osmosis/v7/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" ) const preUpgradeAppVersion = 8 diff --git a/cmd/osmosisd/cmd/balances_from_state_export.go b/cmd/osmosisd/cmd/balances_from_state_export.go index 558f4a791ce..cfdfc50d679 100644 --- a/cmd/osmosisd/cmd/balances_from_state_export.go +++ b/cmd/osmosisd/cmd/balances_from_state_export.go @@ -11,10 +11,10 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go index ba03b5e1ded..5fe5c764ae1 100644 --- a/cmd/osmosisd/cmd/genesis.go +++ b/cmd/osmosisd/cmd/genesis.go @@ -25,12 +25,12 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appParams "github.com/osmosis-labs/osmosis/v7/app/params" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) //nolint:ineffassign diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go index 2304d159b5e..62a6ff7f247 100644 --- a/cmd/osmosisd/cmd/root.go +++ b/cmd/osmosisd/cmd/root.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" "github.com/spf13/cast" "github.com/spf13/cobra" @@ -40,7 +40,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - osmosis "github.com/osmosis-labs/osmosis/v7/app" + osmosis "github.com/osmosis-labs/osmosis/v10/app" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go index 0a8f95b9834..5eb17ba3dba 100644 --- a/cmd/osmosisd/main.go +++ b/cmd/osmosisd/main.go @@ -5,9 +5,9 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - osmosis "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/cmd/osmosisd/cmd" + osmosis "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/cmd/osmosisd/cmd" ) func main() { diff --git a/go.mod b/go.mod index 067730b5f42..c0e14c9b56f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/osmosis-labs/osmosis/v7 +module github.com/osmosis-labs/osmosis/v10 go 1.18 @@ -71,7 +71,7 @@ require ( github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect github.com/confio/ics23/go v0.7.0 // indirect github.com/containerd/continuity v0.3.0 // indirect - github.com/cosmos/btcutil v1.0.4 // indirect + github.com/cosmos/btcutil v1.0.4 github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect diff --git a/osmomath/math_test.go b/osmomath/math_test.go index b369db336b3..385c5e9c017 100644 --- a/osmomath/math_test.go +++ b/osmomath/math_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v10/osmoutils" "github.com/stretchr/testify/require" ) diff --git a/osmoutils/partialord/internal/dag/dag_test.go b/osmoutils/partialord/internal/dag/dag_test.go index ec99d230307..e7ae94769be 100644 --- a/osmoutils/partialord/internal/dag/dag_test.go +++ b/osmoutils/partialord/internal/dag/dag_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/osmoutils/partialord/internal/dag" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord/internal/dag" ) type edge struct { diff --git a/osmoutils/partialord/partialord.go b/osmoutils/partialord/partialord.go index 0c302faf804..cc53c089ad2 100644 --- a/osmoutils/partialord/partialord.go +++ b/osmoutils/partialord/partialord.go @@ -3,7 +3,7 @@ package partialord import ( "sort" - "github.com/osmosis-labs/osmosis/v7/osmoutils/partialord/internal/dag" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord/internal/dag" ) type PartialOrdering struct { diff --git a/osmoutils/partialord/partialord_test.go b/osmoutils/partialord/partialord_test.go index 9d44f901934..280c67bdf8a 100644 --- a/osmoutils/partialord/partialord_test.go +++ b/osmoutils/partialord/partialord_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/osmoutils/partialord" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord" ) func TestAPI(t *testing.T) { diff --git a/proto/osmosis/epochs/genesis.proto b/proto/osmosis/epochs/genesis.proto index fda5903c0c7..c3e310a7df3 100644 --- a/proto/osmosis/epochs/genesis.proto +++ b/proto/osmosis/epochs/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/epochs/types"; // EpochInfo is a struct that describes the data going into // a timer defined by the x/epochs module. diff --git a/proto/osmosis/epochs/query.proto b/proto/osmosis/epochs/query.proto index 0e4776a526f..6047dd482d8 100644 --- a/proto/osmosis/epochs/query.proto +++ b/proto/osmosis/epochs/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/epochs/genesis.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/epochs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto index 60f96f417e3..c2fb6ab9709 100644 --- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto +++ b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto @@ -14,7 +14,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"; // Parameters for changing the weights in a balancer pool smoothly from // a start weight and end weight over a period of time. diff --git a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto b/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto index bb2a20641d3..edcaa7714e9 100644 --- a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto +++ b/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto @@ -4,7 +4,7 @@ package osmosis.gamm.poolmodels.balancer.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/gamm/pool-models/balancer/balancerPool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"; service Msg { rpc CreateBalancerPool(MsgCreateBalancerPool) diff --git a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto index 9e625397b13..f73315a22b9 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto +++ b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto @@ -10,7 +10,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap"; // PoolParams defined the parameters that will be managed by the pool // governance in the future. This params are not managed by the chain diff --git a/proto/osmosis/gamm/pool-models/stableswap/tx.proto b/proto/osmosis/gamm/pool-models/stableswap/tx.proto index d38b220cef4..eb53c86cd48 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/tx.proto +++ b/proto/osmosis/gamm/pool-models/stableswap/tx.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "osmosis/gamm/pool-models/stableswap/stableswap_pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap"; service Msg { rpc CreateStableswapPool(MsgCreateStableswapPool) diff --git a/proto/osmosis/gamm/v1beta1/genesis.proto b/proto/osmosis/gamm/v1beta1/genesis.proto index 4ef5340b1b7..bece17a3d6e 100644 --- a/proto/osmosis/gamm/v1beta1/genesis.proto +++ b/proto/osmosis/gamm/v1beta1/genesis.proto @@ -15,7 +15,7 @@ message Params { ]; } -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; // GenesisState defines the gamm module's genesis state. message GenesisState { diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index 29db4073604..6f862e8b95e 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -10,7 +10,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; service Query { rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) { diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto index 950357b920f..8552c6e0110 100644 --- a/proto/osmosis/gamm/v1beta1/tx.proto +++ b/proto/osmosis/gamm/v1beta1/tx.proto @@ -4,7 +4,7 @@ package osmosis.gamm.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; service Msg { rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse); diff --git a/proto/osmosis/incentives/gauge.proto b/proto/osmosis/incentives/gauge.proto index 1f5fd02a0dd..53e46c85840 100644 --- a/proto/osmosis/incentives/gauge.proto +++ b/proto/osmosis/incentives/gauge.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; // Gauge is an object that stores and distributes yields to recipients who // satisfy certain conditions. Currently gauges support conditions around the diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto index 6010b968c58..5a13d2ba84c 100644 --- a/proto/osmosis/incentives/genesis.proto +++ b/proto/osmosis/incentives/genesis.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/params.proto"; import "osmosis/incentives/gauge.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; // GenesisState defines the incentives module's various parameters when first // initialized diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto index 9cfa281bb58..58e4c7baca7 100644 --- a/proto/osmosis/incentives/params.proto +++ b/proto/osmosis/incentives/params.proto @@ -3,7 +3,7 @@ package osmosis.incentives; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; // Params holds parameters for the incentives module message Params { diff --git a/proto/osmosis/incentives/query.proto b/proto/osmosis/incentives/query.proto index 5e66273f917..01d03fe701b 100644 --- a/proto/osmosis/incentives/query.proto +++ b/proto/osmosis/incentives/query.proto @@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; // Query defines the gRPC querier service service Query { diff --git a/proto/osmosis/incentives/tx.proto b/proto/osmosis/incentives/tx.proto index f9f2bfd18c4..697d211d414 100644 --- a/proto/osmosis/incentives/tx.proto +++ b/proto/osmosis/incentives/tx.proto @@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; service Msg { rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse); diff --git a/proto/osmosis/lockup/genesis.proto b/proto/osmosis/lockup/genesis.proto index 52f498084b4..14e462960a3 100644 --- a/proto/osmosis/lockup/genesis.proto +++ b/proto/osmosis/lockup/genesis.proto @@ -4,7 +4,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/lockup/types"; // GenesisState defines the lockup module's genesis state. message GenesisState { diff --git a/proto/osmosis/lockup/lock.proto b/proto/osmosis/lockup/lock.proto index 09bcf262e2b..ef4148890ff 100644 --- a/proto/osmosis/lockup/lock.proto +++ b/proto/osmosis/lockup/lock.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/lockup/types"; // PeriodLock is a single lock unit by period defined by the x/lockup module. // It's a record of a locked coin at a specific time. It stores owner, duration, diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto index 780a5e8c683..8bf53b272a1 100644 --- a/proto/osmosis/lockup/query.proto +++ b/proto/osmosis/lockup/query.proto @@ -8,7 +8,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/lockup/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto index a9f7236ef3b..fa31444128d 100644 --- a/proto/osmosis/lockup/tx.proto +++ b/proto/osmosis/lockup/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/lockup/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/mint/v1beta1/genesis.proto b/proto/osmosis/mint/v1beta1/genesis.proto index 80ebfa46bc7..ef215f37e68 100644 --- a/proto/osmosis/mint/v1beta1/genesis.proto +++ b/proto/osmosis/mint/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.mint.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/mint/types"; // GenesisState defines the mint module's genesis state. message GenesisState { diff --git a/proto/osmosis/mint/v1beta1/mint.proto b/proto/osmosis/mint/v1beta1/mint.proto index ebbca045887..f8502f6f6bf 100644 --- a/proto/osmosis/mint/v1beta1/mint.proto +++ b/proto/osmosis/mint/v1beta1/mint.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.mint.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/mint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/osmosis/mint/v1beta1/query.proto b/proto/osmosis/mint/v1beta1/query.proto index 90bbdfb252d..8cd9aecfc46 100644 --- a/proto/osmosis/mint/v1beta1/query.proto +++ b/proto/osmosis/mint/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/mint/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/osmosis/pool-incentives/v1beta1/genesis.proto b/proto/osmosis/pool-incentives/v1beta1/genesis.proto index 6b4f4ba24c1..0c1c6f27830 100644 --- a/proto/osmosis/pool-incentives/v1beta1/genesis.proto +++ b/proto/osmosis/pool-incentives/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; // GenesisState defines the pool incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index d7c9c4c7f7f..cd35c68fab9 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; // ReplacePoolIncentivesProposal is a gov Content type for updating the pool // incentives. If a ReplacePoolIncentivesProposal passes, the proposal’s records diff --git a/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/proto/osmosis/pool-incentives/v1beta1/incentives.proto index cb4ab408c2b..22676871c5d 100644 --- a/proto/osmosis/pool-incentives/v1beta1/incentives.proto +++ b/proto/osmosis/pool-incentives/v1beta1/incentives.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; message Params { option (gogoproto.goproto_stringer) = false; diff --git a/proto/osmosis/pool-incentives/v1beta1/query.proto b/proto/osmosis/pool-incentives/v1beta1/query.proto index e104e588ad9..0c10931c51b 100644 --- a/proto/osmosis/pool-incentives/v1beta1/query.proto +++ b/proto/osmosis/pool-incentives/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; service Query { // GaugeIds takes the pool id and returns the matching gauge ids and durations diff --git a/proto/osmosis/store/v1beta1/tree.proto b/proto/osmosis/store/v1beta1/tree.proto index 85ef7f25064..0f1d8a406a6 100644 --- a/proto/osmosis/store/v1beta1/tree.proto +++ b/proto/osmosis/store/v1beta1/tree.proto @@ -4,7 +4,7 @@ package osmosis.store.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/store"; +option go_package = "github.com/osmosis-labs/osmosis/v10/store"; message Node { repeated Child children = 1; } diff --git a/proto/osmosis/superfluid/genesis.proto b/proto/osmosis/superfluid/genesis.proto index 346a753afa3..d1a654963de 100644 --- a/proto/osmosis/superfluid/genesis.proto +++ b/proto/osmosis/superfluid/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; import "osmosis/superfluid/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto index c102db5cbe6..418bc8a81bf 100644 --- a/proto/osmosis/superfluid/params.proto +++ b/proto/osmosis/superfluid/params.proto @@ -4,7 +4,7 @@ package osmosis.superfluid; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // Params holds parameters for the superfluid module message Params { diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto index 1a981242403..fe28d424f50 100644 --- a/proto/osmosis/superfluid/query.proto +++ b/proto/osmosis/superfluid/query.proto @@ -12,7 +12,7 @@ import "osmosis/lockup/lock.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/staking/v1beta1/staking.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/superfluid/superfluid.proto b/proto/osmosis/superfluid/superfluid.proto index 0b35322e401..707d6223ad0 100644 --- a/proto/osmosis/superfluid/superfluid.proto +++ b/proto/osmosis/superfluid/superfluid.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // SuperfluidAssetType indicates whether the superfluid asset is // a native token itself or the lp share of a pool. diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto index cf1b80f4a29..c79025f9e0d 100644 --- a/proto/osmosis/superfluid/tx.proto +++ b/proto/osmosis/superfluid/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto index 2ad153d144a..a8c669fbc75 100644 --- a/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/proto/osmosis/superfluid/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.superfluid.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid // assets diff --git a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto index 75befa6445a..03e254dcb99 100644 --- a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto +++ b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // DenomAuthorityMetadata specifies metadata for addresses that have specific // capabilities over a token factory denom. Right now there is only one Admin diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto index 67f94646700..1cbedaae65f 100644 --- a/proto/osmosis/tokenfactory/v1beta1/genesis.proto +++ b/proto/osmosis/tokenfactory/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // GenesisState defines the tokenfactory module's genesis state. message GenesisState { diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index 0aafb65ecf4..d8bf24d553f 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -6,7 +6,7 @@ import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // Params defines the parameters for the tokenfactory module. message Params { diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index d4811ad9f08..74c3ffe90f2 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index 7391d4dd295..fd33ba3b571 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // Msg defines the tokefactory module's gRPC message service. service Msg { diff --git a/proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/v1beta1/feetoken.proto index c7cd36e34e0..22e91ce35dc 100644 --- a/proto/osmosis/txfees/v1beta1/feetoken.proto +++ b/proto/osmosis/txfees/v1beta1/feetoken.proto @@ -3,7 +3,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; // FeeToken is a struct that specifies a coin denom, and pool ID pair. // This marks the token as eligible for use as a tx fee asset in Osmosis. diff --git a/proto/osmosis/txfees/v1beta1/genesis.proto b/proto/osmosis/txfees/v1beta1/genesis.proto index 9b6fb48c4e9..31bdd233a63 100644 --- a/proto/osmosis/txfees/v1beta1/genesis.proto +++ b/proto/osmosis/txfees/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; // GenesisState defines the txfees module's genesis state. message GenesisState { diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto index 253e822d612..15f904bc571 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; // UpdateFeeTokenProposal is a gov Content type for adding a new whitelisted fee // token. It must specify a denom along with gamm pool ID to use as a spot price diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto index abb36616184..38ab374a9c8 100644 --- a/proto/osmosis/txfees/v1beta1/query.proto +++ b/proto/osmosis/txfees/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; service Query { // FeeTokens returns a list of all the whitelisted fee tokens and their diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 433450a4318..5d26203659d 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -24,7 +24,7 @@ cd .. # move proto files to the right places # # Note: Proto files are suffixed with the current binary version. -cp -r github.com/osmosis-labs/osmosis/v7/* ./ +cp -r github.com/osmosis-labs/osmosis/v10/* ./ rm -rf github.com go mod tidy -compat=1.18 diff --git a/simulation/executor/mock_tendermint.go b/simulation/executor/mock_tendermint.go index e840c39c1fb..33f463f1f23 100644 --- a/simulation/executor/mock_tendermint.go +++ b/simulation/executor/mock_tendermint.go @@ -14,7 +14,7 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "golang.org/x/exp/maps" - markov "github.com/osmosis-labs/osmosis/v7/simulation/types/transitionmatrix" + markov "github.com/osmosis-labs/osmosis/v10/simulation/types/transitionmatrix" ) type mockValidator struct { diff --git a/simulation/executor/operation.go b/simulation/executor/operation.go index fcc3013525a..89e61d57744 100644 --- a/simulation/executor/operation.go +++ b/simulation/executor/operation.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" - simtypes "github.com/osmosis-labs/osmosis/v7/simulation/types" + simtypes "github.com/osmosis-labs/osmosis/v10/simulation/types" ) // entry kinds for use within OperationEntry diff --git a/simulation/executor/params.go b/simulation/executor/params.go index 19a21f9fe75..e3011aef7ff 100644 --- a/simulation/executor/params.go +++ b/simulation/executor/params.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - markov "github.com/osmosis-labs/osmosis/v7/simulation/types/transitionmatrix" + markov "github.com/osmosis-labs/osmosis/v10/simulation/types/transitionmatrix" ) const ( diff --git a/simulation/executor/simulate.go b/simulation/executor/simulate.go index 527d87909ff..0cfb9354cfd 100644 --- a/simulation/executor/simulate.go +++ b/simulation/executor/simulate.go @@ -19,7 +19,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/simulation" - simtypes "github.com/osmosis-labs/osmosis/v7/simulation/types" + simtypes "github.com/osmosis-labs/osmosis/v10/simulation/types" ) const AverageBlockTime = 6 * time.Second diff --git a/simulation/executor/simulate_dev.go b/simulation/executor/simulate_dev.go index 20ab9bf4d8a..8d1faab0e4a 100644 --- a/simulation/executor/simulate_dev.go +++ b/simulation/executor/simulate_dev.go @@ -10,7 +10,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simtypes "github.com/osmosis-labs/osmosis/v7/simulation/types" + simtypes "github.com/osmosis-labs/osmosis/v10/simulation/types" ) type simState struct { diff --git a/simulation/executor/util.go b/simulation/executor/util.go index f15a9b5aaf8..85654166bbb 100644 --- a/simulation/executor/util.go +++ b/simulation/executor/util.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - simtypes "github.com/osmosis-labs/osmosis/v7/simulation/types" + simtypes "github.com/osmosis-labs/osmosis/v10/simulation/types" ) func getTestingMode(tb testing.TB) (testingMode bool, t *testing.T, b *testing.B) { diff --git a/simulation/types/manager.go b/simulation/types/manager.go index 335490fc5fa..b45f4ee9be6 100644 --- a/simulation/types/manager.go +++ b/simulation/types/manager.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "golang.org/x/exp/maps" - "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v10/osmoutils" ) // AppModuleSimulation defines the standard functions that every module should expose diff --git a/simulation/types/randutil.go b/simulation/types/randutil.go index 093c164fd55..b6f21364ac7 100644 --- a/simulation/types/randutil.go +++ b/simulation/types/randutil.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "golang.org/x/exp/constraints" - sdkrand "github.com/osmosis-labs/osmosis/v7/simulation/types/random" + sdkrand "github.com/osmosis-labs/osmosis/v10/simulation/types/random" ) func RandLTBound[T constraints.Integer](sim *SimCtx, upperbound T) T { diff --git a/simulation/types/txbuilder.go b/simulation/types/txbuilder.go index f7d07d1c50a..a59a94cff79 100644 --- a/simulation/types/txbuilder.go +++ b/simulation/types/txbuilder.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/types/tx/signing" - "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" authsign "github.com/cosmos/cosmos-sdk/x/auth/signing" diff --git a/store/legacy/v101/tree.go b/store/legacy/v101/tree.go index 3946a593005..b15148c8a4e 100644 --- a/store/legacy/v101/tree.go +++ b/store/legacy/v101/tree.go @@ -10,7 +10,7 @@ import ( stypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/store" + "github.com/osmosis-labs/osmosis/v10/store" ) type Child struct { diff --git a/store/legacy/v101/tree_test.go b/store/legacy/v101/tree_test.go index 3287138a9ee..5b9b884ab31 100644 --- a/store/legacy/v101/tree_test.go +++ b/store/legacy/v101/tree_test.go @@ -18,8 +18,8 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/store" - v101 "github.com/osmosis-labs/osmosis/v7/store/legacy/v101" + "github.com/osmosis-labs/osmosis/v10/store" + v101 "github.com/osmosis-labs/osmosis/v10/store/legacy/v101" ) func setupStore() sdk.KVStore { diff --git a/store/tree.pb.go b/store/tree.pb.go index 895f4a19087..00a61989379 100644 --- a/store/tree.pb.go +++ b/store/tree.pb.go @@ -167,26 +167,26 @@ func init() { func init() { proto.RegisterFile("osmosis/store/v1beta1/tree.proto", fileDescriptor_72b0b7af579d13be) } var fileDescriptor_72b0b7af579d13be = []byte{ - // 297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xd1, 0x4d, 0x4b, 0xc3, 0x30, - 0x18, 0x07, 0xf0, 0x46, 0x3b, 0xd1, 0xb8, 0x53, 0x99, 0x50, 0x86, 0x64, 0xa5, 0x07, 0xe9, 0x65, - 0x89, 0xd3, 0x83, 0x3b, 0x4a, 0x3d, 0x09, 0xe2, 0xa1, 0x47, 0x6f, 0x69, 0x9a, 0x75, 0xc1, 0xb6, - 0x99, 0x4d, 0x3a, 0xf4, 0x5b, 0xf8, 0xb1, 0x76, 0xdc, 0x51, 0x3c, 0x0c, 0x69, 0xbf, 0x88, 0x2c, - 0xad, 0x6f, 0x20, 0xec, 0x94, 0x3c, 0xc9, 0x8f, 0xe7, 0xf9, 0x93, 0x40, 0x4f, 0xaa, 0x5c, 0x2a, - 0xa1, 0x88, 0xd2, 0xb2, 0xe4, 0x64, 0x39, 0x89, 0xb9, 0xa6, 0x13, 0xa2, 0x4b, 0xce, 0xf1, 0xa2, - 0x94, 0x5a, 0x3a, 0x27, 0x9d, 0xc0, 0x46, 0xe0, 0x4e, 0x0c, 0x07, 0xa9, 0x4c, 0xa5, 0x11, 0x64, - 0xbb, 0x6b, 0xf1, 0x10, 0x31, 0xa3, 0x49, 0x4c, 0xd5, 0x4f, 0x33, 0x26, 0x45, 0xd1, 0xde, 0xfb, - 0xd7, 0xd0, 0xbe, 0x97, 0x09, 0x77, 0xa6, 0xf0, 0x90, 0xcd, 0x45, 0x96, 0x94, 0xbc, 0x70, 0x81, - 0xb7, 0x1f, 0x1c, 0x5f, 0x9c, 0xe2, 0x7f, 0xe7, 0xe0, 0x9b, 0x2d, 0x8b, 0xbe, 0xb5, 0xff, 0x04, - 0x7b, 0xe6, 0xc8, 0x19, 0xc0, 0x9e, 0x28, 0x12, 0xfe, 0xec, 0x02, 0x0f, 0x04, 0xfd, 0xa8, 0x2d, - 0x9c, 0x08, 0xf6, 0x29, 0x63, 0x55, 0x5e, 0x65, 0x54, 0x0b, 0x59, 0xb8, 0x7b, 0x1e, 0x08, 0x8e, - 0x42, 0xbc, 0xda, 0x8c, 0xac, 0xf7, 0xcd, 0xe8, 0x2c, 0x15, 0x7a, 0x5e, 0xc5, 0x98, 0xc9, 0x9c, - 0x74, 0x49, 0xdb, 0x65, 0xac, 0x92, 0x47, 0xa2, 0x5f, 0x16, 0x5c, 0xe1, 0xdb, 0x42, 0x47, 0x7f, - 0x7a, 0xf8, 0x53, 0x68, 0xdf, 0x71, 0x3a, 0x73, 0xce, 0xa1, 0x9d, 0x71, 0x3a, 0x33, 0x03, 0x77, - 0x05, 0x36, 0x32, 0x0c, 0x57, 0x35, 0x02, 0xeb, 0x1a, 0x81, 0x8f, 0x1a, 0x81, 0xd7, 0x06, 0x59, - 0xeb, 0x06, 0x59, 0x6f, 0x0d, 0xb2, 0x1e, 0x82, 0x5f, 0x49, 0xba, 0x3e, 0xe3, 0x8c, 0xc6, 0xea, - 0xab, 0x20, 0xcb, 0xab, 0xf6, 0x4b, 0xe2, 0x03, 0xf3, 0x72, 0x97, 0x9f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x63, 0x3c, 0x1f, 0x09, 0xaa, 0x01, 0x00, 0x00, + // 299 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xd1, 0x4f, 0x4b, 0xfb, 0x30, + 0x18, 0x07, 0xf0, 0xe6, 0xf7, 0xeb, 0x44, 0xe3, 0x4e, 0x65, 0x42, 0x19, 0x92, 0x95, 0x1e, 0xa4, + 0x1e, 0x96, 0xac, 0x7a, 0xd9, 0x51, 0xb6, 0x93, 0x20, 0x1e, 0x7a, 0xf4, 0x96, 0xa6, 0x59, 0x17, + 0x6c, 0x9b, 0xd9, 0xa4, 0x43, 0xdf, 0x85, 0x2f, 0x6b, 0xc7, 0x1d, 0xc5, 0xc3, 0x90, 0xf6, 0x8d, + 0xc8, 0xd2, 0xfa, 0x0f, 0x04, 0x4f, 0xc9, 0x93, 0x7c, 0x78, 0x9e, 0x2f, 0x09, 0xf4, 0xa4, 0xca, + 0xa5, 0x12, 0x8a, 0x28, 0x2d, 0x4b, 0x4e, 0xd6, 0x61, 0xcc, 0x35, 0x0d, 0x89, 0x2e, 0x39, 0xc7, + 0xab, 0x52, 0x6a, 0xe9, 0x9c, 0x74, 0x02, 0x1b, 0x81, 0x3b, 0x31, 0x1c, 0xa4, 0x32, 0x95, 0x46, + 0x90, 0xfd, 0xae, 0xc5, 0x43, 0xc4, 0x8c, 0x26, 0x31, 0x55, 0x5f, 0xcd, 0x98, 0x14, 0x45, 0x7b, + 0xef, 0x5f, 0x41, 0xfb, 0x56, 0x26, 0xdc, 0x99, 0xc2, 0x43, 0xb6, 0x14, 0x59, 0x52, 0xf2, 0xc2, + 0x05, 0xde, 0xff, 0xe0, 0xf8, 0xe2, 0x14, 0xff, 0x3a, 0x07, 0xcf, 0xf7, 0x2c, 0xfa, 0xd4, 0xfe, + 0x03, 0xec, 0x99, 0x23, 0x67, 0x00, 0x7b, 0xa2, 0x48, 0xf8, 0xa3, 0x0b, 0x3c, 0x10, 0xf4, 0xa3, + 0xb6, 0x70, 0x22, 0xd8, 0xa7, 0x8c, 0x55, 0x79, 0x95, 0x51, 0x2d, 0x64, 0xe1, 0xfe, 0xf3, 0x40, + 0x70, 0x34, 0xc3, 0x9b, 0xdd, 0xc8, 0x7a, 0xdd, 0x8d, 0xce, 0x52, 0xa1, 0x97, 0x55, 0x8c, 0x99, + 0xcc, 0x49, 0x97, 0xb4, 0x5d, 0xc6, 0x2a, 0xb9, 0x27, 0xfa, 0x69, 0xc5, 0x15, 0xbe, 0x2e, 0x74, + 0xf4, 0xa3, 0x87, 0x3f, 0x85, 0xf6, 0x0d, 0xa7, 0x0b, 0x67, 0x02, 0xed, 0x8c, 0xd3, 0x85, 0x19, + 0xf8, 0x57, 0x60, 0x23, 0x67, 0xf3, 0x4d, 0x8d, 0xc0, 0xb6, 0x46, 0xe0, 0xad, 0x46, 0xe0, 0xb9, + 0x41, 0xd6, 0xb6, 0x41, 0xd6, 0x4b, 0x83, 0xac, 0xbb, 0xf3, 0x6f, 0x49, 0xba, 0x3e, 0xe3, 0x8c, + 0xc6, 0xea, 0xa3, 0x20, 0xeb, 0x70, 0xd2, 0xfe, 0x49, 0x7c, 0x60, 0x9e, 0xee, 0xf2, 0x3d, 0x00, + 0x00, 0xff, 0xff, 0x0d, 0x60, 0xda, 0xb6, 0xab, 0x01, 0x00, 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { diff --git a/store/tree_test.go b/store/tree_test.go index 5ced86a0d15..319abf780b7 100644 --- a/store/tree_test.go +++ b/store/tree_test.go @@ -15,7 +15,7 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/store" + "github.com/osmosis-labs/osmosis/v10/store" ) type TreeTestSuite struct { diff --git a/tests/e2e/configurer/base.go b/tests/e2e/configurer/base.go index 3826e10fcbe..0503df2953c 100644 --- a/tests/e2e/configurer/base.go +++ b/tests/e2e/configurer/base.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) // baseConfigurer is the base implementation for the diff --git a/tests/e2e/configurer/chain/chain.go b/tests/e2e/configurer/chain/chain.go index a3145d70372..d4b4b13fbff 100644 --- a/tests/e2e/configurer/chain/chain.go +++ b/tests/e2e/configurer/chain/chain.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" coretypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) type Config struct { diff --git a/tests/e2e/configurer/chain/node.go b/tests/e2e/configurer/chain/node.go index 7af3a36d85d..2c76a6ef51e 100644 --- a/tests/e2e/configurer/chain/node.go +++ b/tests/e2e/configurer/chain/node.go @@ -12,8 +12,8 @@ import ( rpchttp "github.com/tendermint/tendermint/rpc/client/http" coretypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) type NodeConfig struct { diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go index b9fb7dff099..49f3472ce02 100644 --- a/tests/e2e/configurer/chain/queries.go +++ b/tests/e2e/configurer/chain/queries.go @@ -14,8 +14,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" - superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (n *NodeConfig) QueryGRPCGateway(path string) ([]byte, error) { diff --git a/tests/e2e/configurer/current.go b/tests/e2e/configurer/current.go index 8e058e2fcd4..90af8e1a360 100644 --- a/tests/e2e/configurer/current.go +++ b/tests/e2e/configurer/current.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) type CurrentBranchConfigurer struct { diff --git a/tests/e2e/configurer/factory.go b/tests/e2e/configurer/factory.go index ed9e4d7f799..92c52bb8e4b 100644 --- a/tests/e2e/configurer/factory.go +++ b/tests/e2e/configurer/factory.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) type Configurer interface { diff --git a/tests/e2e/configurer/upgrade.go b/tests/e2e/configurer/upgrade.go index 3131a52d5ae..d6fab3b2eba 100644 --- a/tests/e2e/configurer/upgrade.go +++ b/tests/e2e/configurer/upgrade.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer/config" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer/config" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) type UpgradeSettings struct { diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 0877079dbfa..8d4417b866b 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/suite" - configurer "github.com/osmosis-labs/osmosis/v7/tests/e2e/configurer" + configurer "github.com/osmosis-labs/osmosis/v10/tests/e2e/configurer" ) const ( diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 0113b675d3a..6b8df0bfc1c 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func (s *IntegrationTestSuite) TestCreatePoolPostUpgrade() { diff --git a/tests/e2e/initialization/chain/main.go b/tests/e2e/initialization/chain/main.go index 3c12471224f..586cb9fddcc 100644 --- a/tests/e2e/initialization/chain/main.go +++ b/tests/e2e/initialization/chain/main.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go index 66644e3482a..b32fb0dea6f 100644 --- a/tests/e2e/initialization/config.go +++ b/tests/e2e/initialization/config.go @@ -18,14 +18,14 @@ import ( "github.com/gogo/protobuf/proto" tmjson "github.com/tendermint/tendermint/libs/json" - epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolitypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" - - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolitypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" + + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) // NodeConfig is a confiuration for the node supplied from the test runner diff --git a/tests/e2e/initialization/init.go b/tests/e2e/initialization/init.go index df03c842731..427dbdad3a5 100644 --- a/tests/e2e/initialization/init.go +++ b/tests/e2e/initialization/init.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) func InitChain(id, dataDir string, nodeConfigs []*NodeConfig, votingPeriod time.Duration, forkHeight int) (*Chain, error) { diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go index 926ef9950d8..4cb54ab2ad8 100644 --- a/tests/e2e/initialization/init_test.go +++ b/tests/e2e/initialization/init_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) const forkHeight = 10 diff --git a/tests/e2e/initialization/node.go b/tests/e2e/initialization/node.go index 3300cfbd010..68536e736a7 100644 --- a/tests/e2e/initialization/node.go +++ b/tests/e2e/initialization/node.go @@ -29,8 +29,8 @@ import ( "github.com/tendermint/tendermint/privval" tmtypes "github.com/tendermint/tendermint/types" - osmosisApp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" + osmosisApp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) type internalNode struct { diff --git a/tests/e2e/initialization/node/main.go b/tests/e2e/initialization/node/main.go index b8130c3d118..14ea881783b 100644 --- a/tests/e2e/initialization/node/main.go +++ b/tests/e2e/initialization/node/main.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/util.go b/tests/e2e/initialization/util.go index 1aa7790c6ef..9a2db5045aa 100644 --- a/tests/e2e/initialization/util.go +++ b/tests/e2e/initialization/util.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/unknownproto" sdktx "github.com/cosmos/cosmos-sdk/types/tx" - "github.com/osmosis-labs/osmosis/v7/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) func decodeTx(txBytes []byte) (*sdktx.Tx, error) { diff --git a/tests/e2e/util/codec.go b/tests/e2e/util/codec.go index fc1d0ea1ab5..91bfb5d5dcd 100644 --- a/tests/e2e/util/codec.go +++ b/tests/e2e/util/codec.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - osmosisApp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/app/params" + osmosisApp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/params" ) var ( diff --git a/tests/simulator/genesis.go b/tests/simulator/genesis.go index 2be960330ba..0eb2b766ec0 100644 --- a/tests/simulator/genesis.go +++ b/tests/simulator/genesis.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" - "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v10/app" tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" diff --git a/tests/simulator/sim_test.go b/tests/simulator/sim_test.go index af74440d808..97b1212deef 100644 --- a/tests/simulator/sim_test.go +++ b/tests/simulator/sim_test.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v10/app" "github.com/cosmos/cosmos-sdk/baseapp" sdkSimapp "github.com/cosmos/cosmos-sdk/simapp" @@ -18,8 +18,8 @@ import ( "github.com/cosmos/cosmos-sdk/store" simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" - osmosim "github.com/osmosis-labs/osmosis/v7/simulation/executor" - simtypes "github.com/osmosis-labs/osmosis/v7/simulation/types" + osmosim "github.com/osmosis-labs/osmosis/v10/simulation/executor" + simtypes "github.com/osmosis-labs/osmosis/v10/simulation/types" ) // Profile with: diff --git a/tests/simulator/state.go b/tests/simulator/state.go index afeaca64ca8..a6b6cc46183 100644 --- a/tests/simulator/state.go +++ b/tests/simulator/state.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v7/app" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" + "github.com/osmosis-labs/osmosis/v10/app" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" "github.com/cosmos/cosmos-sdk/codec" sdksimapp "github.com/cosmos/cosmos-sdk/simapp" diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 6995bec723a..7590b5a98cb 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -9,12 +9,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func CustomMessageDecorator(gammKeeper *gammkeeper.Keeper, bank *bankkeeper.BaseKeeper, tokenFactory *tokenfactorykeeper.Keeper) func(wasmkeeper.Messenger) wasmkeeper.Messenger { diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 8136b5005a0..6665fc24bd5 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" ) type QueryPlugin struct { diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index d23567b1f1c..1f44dc87b9e 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" ) func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessage) ([]byte, error) { diff --git a/wasmbinding/test/custom_msg_test.go b/wasmbinding/test/custom_msg_test.go index be4b81a8699..c6b8400856e 100644 --- a/wasmbinding/test/custom_msg_test.go +++ b/wasmbinding/test/custom_msg_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" "github.com/stretchr/testify/require" @@ -13,8 +13,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 2a1bcd2c29a..270be30583f 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -15,10 +15,10 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/wasmbinding" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/wasmbinding" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" ) // we must pay this many uosmo for every pool we create diff --git a/wasmbinding/test/helpers_test.go b/wasmbinding/test/helpers_test.go index b4e0b9b34a3..715caa773f5 100644 --- a/wasmbinding/test/helpers_test.go +++ b/wasmbinding/test/helpers_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v10/app" ) func CreateTestInput() (*app.OsmosisApp, sdk.Context) { diff --git a/wasmbinding/test/messages_test.go b/wasmbinding/test/messages_test.go index e5288d4db58..5b8c58b13b0 100644 --- a/wasmbinding/test/messages_test.go +++ b/wasmbinding/test/messages_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/wasmbinding" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/wasmbinding" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/wasmbinding/test/queries_test.go b/wasmbinding/test/queries_test.go index b87bcefef92..a1cba5f08fa 100644 --- a/wasmbinding/test/queries_test.go +++ b/wasmbinding/test/queries_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/wasmbinding" - "github.com/osmosis-labs/osmosis/v7/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v10/wasmbinding" + "github.com/osmosis-labs/osmosis/v10/wasmbinding/bindings" ) func TestFullDenom(t *testing.T) { diff --git a/wasmbinding/test/store_run_test.go b/wasmbinding/test/store_run_test.go index 9a6059183b2..25602540656 100644 --- a/wasmbinding/test/store_run_test.go +++ b/wasmbinding/test/store_run_test.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v10/app" ) func TestNoStorageWithoutProposal(t *testing.T) { diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index af3fdd55bd2..35cc86bce2b 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -5,8 +5,8 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" ) func RegisterCustomPlugins( diff --git a/x/epochs/client/cli/cli_test.go b/x/epochs/client/cli/cli_test.go index c30a1d8d20a..a187eed9351 100644 --- a/x/epochs/client/cli/cli_test.go +++ b/x/epochs/client/cli/cli_test.go @@ -4,9 +4,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 5084b89ad3c..139cb724f43 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/epochs/client/cli/tx.go b/x/epochs/client/cli/tx.go index cf041d50b9d..eae8573010a 100644 --- a/x/epochs/client/cli/tx.go +++ b/x/epochs/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags". - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) // GetTxCmd returns the transaction commands for this module. diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index d1fe97219b4..c891b407baa 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 1c331261c23..d90d9f41b4b 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "golang.org/x/exp/maps" - "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v10/osmoutils" ) // This test is responsible for testing how epochs increment based off diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go index b04013a2f7c..9dcf262910c 100644 --- a/x/epochs/keeper/epoch.go +++ b/x/epochs/keeper/epoch.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go index dea59d69830..d0f2768bbda 100644 --- a/x/epochs/keeper/epoch_test.go +++ b/x/epochs/keeper/epoch_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestAddEpochInfo() { diff --git a/x/epochs/keeper/genesis.go b/x/epochs/keeper/genesis.go index 38211254322..ddbbe18f118 100644 --- a/x/epochs/keeper/genesis.go +++ b/x/epochs/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { diff --git a/x/epochs/keeper/genesis_test.go b/x/epochs/keeper/genesis_test.go index 36390df34c7..db593295ab2 100644 --- a/x/epochs/keeper/genesis_test.go +++ b/x/epochs/keeper/genesis_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v7/app" + simapp "github.com/osmosis-labs/osmosis/v10/app" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index 61d26f0a031..66734c4f17e 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) var _ types.QueryServer = Querier{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index d97b4fc9153..4f5560dea3a 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( gocontext "context" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestQueryEpochInfos() { diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 6ae659d3e71..4c56599eda3 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index 88e82dc9246..2a392316be2 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) type KeeperTestSuite struct { diff --git a/x/epochs/module.go b/x/epochs/module.go index ac1201ae189..f32d5d3c788 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -16,10 +16,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v7/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" ) var ( diff --git a/x/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go index 7095bf15ba5..fb7fb750ec3 100644 --- a/x/epochs/types/genesis.pb.go +++ b/x/epochs/types/genesis.pb.go @@ -209,35 +209,35 @@ func init() { proto.RegisterFile("osmosis/epochs/genesis.proto", fileDescriptor_ var fileDescriptor_7ecf3e4d59074cbd = []byte{ // 479 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x3f, 0x8f, 0xd3, 0x30, - 0x1c, 0xad, 0xb9, 0x52, 0x52, 0xdf, 0x21, 0xc0, 0x3a, 0x8e, 0x50, 0x41, 0x12, 0xc2, 0x12, 0x09, - 0x70, 0xd4, 0x03, 0x09, 0x09, 0x06, 0xa4, 0x02, 0xe2, 0xdf, 0x80, 0x94, 0x32, 0x20, 0x96, 0x2a, - 0x69, 0xdd, 0xc4, 0x52, 0x13, 0x47, 0xf1, 0x2f, 0x27, 0xba, 0xf1, 0x11, 0x3a, 0xf2, 0x91, 0x6e, - 0xbc, 0x91, 0xa9, 0xa0, 0x76, 0x63, 0xbc, 0x4f, 0x80, 0x62, 0x27, 0xa5, 0x70, 0x87, 0xd8, 0x62, - 0xbf, 0xf7, 0x7b, 0xcf, 0xef, 0xe9, 0x17, 0x7c, 0x4b, 0xc8, 0x54, 0x48, 0x2e, 0x7d, 0x96, 0x8b, - 0x71, 0x22, 0xfd, 0x98, 0x65, 0x4c, 0x72, 0x49, 0xf3, 0x42, 0x80, 0x20, 0x07, 0x35, 0x4a, 0x35, - 0x4a, 0x8f, 0xfa, 0x11, 0x83, 0xb0, 0xdf, 0xdb, 0x8f, 0x45, 0x2c, 0x14, 0xc5, 0xaf, 0xbe, 0x34, - 0xbb, 0x67, 0xc5, 0x42, 0xc4, 0x33, 0xe6, 0xab, 0x53, 0x54, 0x4e, 0xfd, 0x49, 0x59, 0x84, 0xc0, - 0x45, 0x56, 0xe3, 0xf6, 0xdf, 0x38, 0xf0, 0x94, 0x49, 0x08, 0xd3, 0x5c, 0x13, 0xdc, 0x45, 0x1b, - 0x77, 0x5f, 0x56, 0x4e, 0x6f, 0xb2, 0xa9, 0x20, 0x16, 0xc6, 0x7c, 0xc2, 0x32, 0xe0, 0x53, 0xce, - 0x0a, 0x13, 0x39, 0xc8, 0xeb, 0x06, 0x5b, 0x37, 0xe4, 0x23, 0xc6, 0x12, 0xc2, 0x02, 0x46, 0x95, - 0x8c, 0x79, 0xc1, 0x41, 0xde, 0xee, 0x61, 0x8f, 0x6a, 0x0f, 0xda, 0x78, 0xd0, 0x0f, 0x8d, 0xc7, - 0xe0, 0xf6, 0xf1, 0xd2, 0x6e, 0x9d, 0x2e, 0xed, 0x6b, 0xf3, 0x30, 0x9d, 0x3d, 0x71, 0x7f, 0xcf, - 0xba, 0x8b, 0xef, 0x36, 0x0a, 0xba, 0xea, 0xa2, 0xa2, 0x93, 0x04, 0x1b, 0xcd, 0xd3, 0xcd, 0x1d, - 0xa5, 0x7b, 0xf3, 0x8c, 0xee, 0x8b, 0x9a, 0x30, 0xe8, 0x57, 0xb2, 0x3f, 0x97, 0x36, 0x69, 0x46, - 0xee, 0x8b, 0x94, 0x03, 0x4b, 0x73, 0x98, 0x9f, 0x2e, 0xed, 0x2b, 0xda, 0xac, 0xc1, 0xdc, 0xaf, - 0x95, 0xd5, 0x46, 0x9d, 0xdc, 0xc5, 0x97, 0xc7, 0x65, 0x51, 0xb0, 0x0c, 0x46, 0xaa, 0x62, 0xb3, - 0xed, 0x20, 0x6f, 0x27, 0xd8, 0xab, 0x2f, 0x55, 0x19, 0xe4, 0x0b, 0xc2, 0xe6, 0x1f, 0xac, 0xd1, - 0x56, 0xee, 0x8b, 0xff, 0xcd, 0x7d, 0xaf, 0xce, 0x6d, 0xeb, 0xa7, 0xfc, 0x4b, 0x49, 0xb7, 0x70, - 0x7d, 0xdb, 0x79, 0xb8, 0x69, 0xe4, 0x11, 0x3e, 0xd0, 0xfc, 0xb1, 0x28, 0x33, 0xe0, 0x59, 0xac, - 0x07, 0xd9, 0xc4, 0xec, 0x38, 0xc8, 0x33, 0x82, 0x7d, 0x85, 0x3e, 0xaf, 0xc1, 0xa1, 0xc6, 0xc8, - 0x53, 0xdc, 0x3b, 0xcf, 0x2d, 0x61, 0x3c, 0x4e, 0xc0, 0x34, 0x54, 0xd4, 0x1b, 0x67, 0x0c, 0x5f, - 0x2b, 0xf8, 0x6d, 0xdb, 0xb8, 0x74, 0xd5, 0x70, 0xdf, 0xe3, 0xbd, 0x57, 0x7a, 0x25, 0x87, 0x10, - 0x02, 0x23, 0xcf, 0x70, 0x47, 0xef, 0xa2, 0x89, 0x9c, 0x1d, 0x6f, 0xf7, 0xf0, 0x0e, 0x3d, 0x7f, - 0x45, 0xe9, 0x66, 0x8f, 0x06, 0xed, 0x2a, 0x7f, 0x50, 0x8f, 0x0d, 0xde, 0x1d, 0xaf, 0x2c, 0x74, - 0xb2, 0xb2, 0xd0, 0x8f, 0x95, 0x85, 0x16, 0x6b, 0xab, 0x75, 0xb2, 0xb6, 0x5a, 0xdf, 0xd6, 0x56, - 0xeb, 0x53, 0x3f, 0xe6, 0x90, 0x94, 0x11, 0x1d, 0x8b, 0xd4, 0xaf, 0x45, 0x1f, 0xcc, 0xc2, 0x48, - 0x36, 0x07, 0xff, 0xe8, 0xb1, 0xff, 0xb9, 0xf9, 0x4f, 0x60, 0x9e, 0x33, 0x19, 0x75, 0x54, 0xdd, - 0x0f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x35, 0x0e, 0x9c, 0x46, 0x03, 0x00, 0x00, + 0x1c, 0xad, 0x69, 0x29, 0xad, 0xef, 0x10, 0x60, 0x1d, 0x47, 0xa8, 0x20, 0x09, 0x61, 0x89, 0x04, + 0x38, 0xb4, 0x30, 0xc1, 0x80, 0x54, 0x40, 0xfc, 0x11, 0x12, 0x52, 0xca, 0x80, 0x58, 0xaa, 0xa4, + 0x75, 0x13, 0x4b, 0x4d, 0x1c, 0xc5, 0xbf, 0x9c, 0xe8, 0xc6, 0x47, 0xe8, 0xc8, 0x47, 0xba, 0xf1, + 0x46, 0xa6, 0x82, 0xda, 0x8d, 0xf1, 0x3e, 0x01, 0x8a, 0x9d, 0x94, 0xc2, 0x1d, 0x62, 0x8b, 0xfd, + 0xde, 0xef, 0x3d, 0xbf, 0xa7, 0x5f, 0xf0, 0x2d, 0x21, 0x13, 0x21, 0xb9, 0xf4, 0x58, 0x26, 0x26, + 0xb1, 0xf4, 0x22, 0x96, 0x32, 0xc9, 0x25, 0xcd, 0x72, 0x01, 0x82, 0x1c, 0x56, 0x28, 0xd5, 0x28, + 0x3d, 0xea, 0x87, 0x0c, 0x82, 0x7e, 0xef, 0x20, 0x12, 0x91, 0x50, 0x14, 0xaf, 0xfc, 0xd2, 0xec, + 0x9e, 0x19, 0x09, 0x11, 0xcd, 0x99, 0xa7, 0x4e, 0x61, 0x31, 0xf3, 0xa6, 0x45, 0x1e, 0x00, 0x17, + 0x69, 0x85, 0x5b, 0x7f, 0xe3, 0xc0, 0x13, 0x26, 0x21, 0x48, 0x32, 0x4d, 0x70, 0x96, 0x2d, 0xdc, + 0x7d, 0x59, 0x3a, 0xbd, 0x49, 0x67, 0x82, 0x98, 0x18, 0xf3, 0x29, 0x4b, 0x81, 0xcf, 0x38, 0xcb, + 0x0d, 0x64, 0x23, 0xb7, 0xeb, 0xef, 0xdc, 0x90, 0x8f, 0x18, 0x4b, 0x08, 0x72, 0x18, 0x97, 0x32, + 0xc6, 0x05, 0x1b, 0xb9, 0x7b, 0x83, 0x1e, 0xd5, 0x1e, 0xb4, 0xf6, 0xa0, 0x1f, 0x6a, 0x8f, 0xe1, + 0xed, 0xe3, 0x95, 0xd5, 0x38, 0x5d, 0x59, 0xd7, 0x16, 0x41, 0x32, 0x7f, 0xe2, 0xfc, 0x9e, 0x75, + 0x96, 0xdf, 0x2d, 0xe4, 0x77, 0xd5, 0x45, 0x49, 0x27, 0x31, 0xee, 0xd4, 0x4f, 0x37, 0x9a, 0x4a, + 0xf7, 0xe6, 0x19, 0xdd, 0x17, 0x15, 0x61, 0xd8, 0x2f, 0x65, 0x7f, 0xae, 0x2c, 0x52, 0x8f, 0xdc, + 0x17, 0x09, 0x07, 0x96, 0x64, 0xb0, 0x38, 0x5d, 0x59, 0x57, 0xb4, 0x59, 0x8d, 0x39, 0x5f, 0x4b, + 0xab, 0xad, 0x3a, 0xb9, 0x8b, 0x2f, 0x4f, 0x8a, 0x3c, 0x67, 0x29, 0x8c, 0x55, 0xc5, 0x46, 0xcb, + 0x46, 0x6e, 0xd3, 0xdf, 0xaf, 0x2e, 0x55, 0x19, 0xe4, 0x0b, 0xc2, 0xc6, 0x1f, 0xac, 0xf1, 0x4e, + 0xee, 0x8b, 0xff, 0xcd, 0x7d, 0xaf, 0xca, 0x6d, 0xe9, 0xa7, 0xfc, 0x4b, 0x49, 0xb7, 0x70, 0x7d, + 0xd7, 0x79, 0xb4, 0x6d, 0xe4, 0x31, 0x3e, 0xd4, 0xfc, 0x89, 0x28, 0x52, 0xe0, 0x69, 0xa4, 0x07, + 0xd9, 0xd4, 0x68, 0xdb, 0xc8, 0xed, 0xf8, 0x07, 0x0a, 0x7d, 0x5e, 0x81, 0x23, 0x8d, 0x91, 0xa7, + 0xb8, 0x77, 0x9e, 0x5b, 0xcc, 0x78, 0x14, 0x83, 0xd1, 0x51, 0x51, 0x6f, 0x9c, 0x31, 0x7c, 0xad, + 0xe0, 0xb7, 0xad, 0xce, 0xa5, 0xab, 0x1d, 0xe7, 0x3d, 0xde, 0x7f, 0xa5, 0x57, 0x72, 0x04, 0x01, + 0x30, 0xf2, 0x0c, 0xb7, 0xf5, 0x2e, 0x1a, 0xc8, 0x6e, 0xba, 0x7b, 0x83, 0x3b, 0xf4, 0xfc, 0x15, + 0xa5, 0xdb, 0x3d, 0x1a, 0xb6, 0xca, 0xfc, 0x7e, 0x35, 0x36, 0x7c, 0x77, 0xbc, 0x36, 0xd1, 0xc9, + 0xda, 0x44, 0x3f, 0xd6, 0x26, 0x5a, 0x6e, 0xcc, 0xc6, 0xc9, 0xc6, 0x6c, 0x7c, 0xdb, 0x98, 0x8d, + 0x4f, 0x83, 0x88, 0x43, 0x5c, 0x84, 0x74, 0x22, 0x12, 0xaf, 0x12, 0x7d, 0x30, 0x0f, 0x42, 0x59, + 0x1f, 0xbc, 0xa3, 0xfe, 0x43, 0xef, 0x73, 0xfd, 0xa3, 0xc0, 0x22, 0x63, 0x32, 0x6c, 0xab, 0xbe, + 0x1f, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x80, 0x23, 0xaf, 0xf8, 0x47, 0x03, 0x00, 0x00, } func (m *EpochInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/hooks.go b/x/epochs/types/hooks.go index f4519419fe4..b3d3adcf204 100644 --- a/x/epochs/types/hooks.go +++ b/x/epochs/types/hooks.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v10/osmoutils" ) type EpochHooks interface { diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index 3b3425dd0d5..78394b8745c 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) type KeeperTestSuite struct { diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go index c02a5e48ff6..47a74e050fa 100644 --- a/x/epochs/types/query.pb.go +++ b/x/epochs/types/query.pb.go @@ -211,30 +211,30 @@ var fileDescriptor_574bd176519c765f = []byte{ // 410 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcf, 0x6e, 0xd3, 0x30, 0x18, 0x8f, 0x5b, 0xa8, 0x84, 0x29, 0x17, 0x0b, 0x95, 0x10, 0x21, 0x53, 0x82, 0x80, 0x0a, 0xa9, - 0x31, 0x29, 0x07, 0x24, 0x2e, 0xa0, 0x22, 0x0e, 0x88, 0x13, 0x39, 0xf6, 0x82, 0x92, 0xe0, 0xa6, - 0x96, 0x5a, 0x3b, 0x8d, 0x9d, 0x8a, 0x5e, 0xf7, 0x04, 0x93, 0xa6, 0xbd, 0xc0, 0x9e, 0x65, 0x87, - 0x1e, 0x2b, 0xed, 0xb2, 0xd3, 0x34, 0xb5, 0x7b, 0x90, 0x29, 0x4e, 0x52, 0x75, 0x5d, 0x3a, 0x6d, - 0xb7, 0xc4, 0xbf, 0xbf, 0xdf, 0x67, 0x43, 0x4b, 0xc8, 0x89, 0x90, 0x4c, 0x12, 0x1a, 0x8b, 0x70, - 0x24, 0xc9, 0x34, 0xa5, 0xc9, 0xdc, 0x89, 0x13, 0xa1, 0x04, 0x6a, 0x15, 0x98, 0x93, 0x63, 0xce, - 0xcc, 0x0d, 0xa8, 0xf2, 0x5d, 0xeb, 0x79, 0x24, 0x22, 0xa1, 0x29, 0x24, 0xfb, 0xca, 0xd9, 0xd6, - 0xab, 0x48, 0x88, 0x68, 0x4c, 0x89, 0x1f, 0x33, 0xe2, 0x73, 0x2e, 0x94, 0xaf, 0x98, 0xe0, 0xb2, - 0x40, 0x3f, 0x86, 0xda, 0x8c, 0x04, 0xbe, 0xa4, 0x79, 0x08, 0x29, 0xec, 0x48, 0xec, 0x47, 0x8c, - 0x6b, 0x72, 0xe9, 0xb4, 0xd3, 0x29, 0xa2, 0x9c, 0x66, 0x35, 0x34, 0x6a, 0x9b, 0xb0, 0xf5, 0x27, - 0xd3, 0xff, 0xd4, 0xe0, 0x2f, 0x3e, 0x14, 0x1e, 0x9d, 0xa6, 0x54, 0x2a, 0x7b, 0x00, 0x5f, 0xdc, - 0x42, 0x64, 0x2c, 0xb8, 0xa4, 0xe8, 0x1b, 0x6c, 0xe4, 0x66, 0x26, 0x68, 0xd7, 0x3b, 0x4f, 0x7b, - 0x6f, 0x9c, 0xea, 0xd9, 0x1c, 0xad, 0xcd, 0xa4, 0xfd, 0x47, 0x8b, 0x8b, 0xd7, 0x86, 0x57, 0xc8, - 0xec, 0xaf, 0xd0, 0xd4, 0xde, 0x3f, 0xd2, 0x24, 0xa1, 0x5c, 0x69, 0x5a, 0x91, 0x8b, 0x30, 0x84, - 0xec, 0x1f, 0xe5, 0x8a, 0x0d, 0x19, 0x4d, 0x4c, 0xd0, 0x06, 0x9d, 0x27, 0xde, 0xd6, 0x89, 0xfd, - 0x1d, 0xbe, 0xac, 0xd0, 0x16, 0xcd, 0xde, 0xc2, 0x67, 0x61, 0x7e, 0xfe, 0x57, 0x47, 0x69, 0x7d, - 0xdd, 0x6b, 0x86, 0x5b, 0xe4, 0xde, 0x69, 0x0d, 0x3e, 0xd6, 0x16, 0xe8, 0x18, 0x40, 0xb8, 0xe9, - 0x28, 0x91, 0xb3, 0x6f, 0x8e, 0xea, 0x15, 0x59, 0xe4, 0xde, 0xfc, 0xbc, 0x9e, 0xfd, 0xfe, 0xe0, - 0xec, 0xea, 0xa8, 0xd6, 0x46, 0x98, 0xec, 0x5c, 0x4a, 0x79, 0x7b, 0xf9, 0x2f, 0x3a, 0x01, 0xb0, - 0xb9, 0x3d, 0x1f, 0xfa, 0x74, 0x67, 0x52, 0xc5, 0x1a, 0x2d, 0xf7, 0x01, 0x8a, 0xa2, 0x5d, 0x57, - 0xb7, 0xfb, 0x80, 0xde, 0xed, 0x6b, 0x77, 0x63, 0xb5, 0xfd, 0xdf, 0x8b, 0x15, 0x06, 0xcb, 0x15, - 0x06, 0x97, 0x2b, 0x0c, 0x0e, 0xd7, 0xd8, 0x58, 0xae, 0xb1, 0x71, 0xbe, 0xc6, 0xc6, 0xc0, 0x8d, - 0x98, 0x1a, 0xa5, 0x81, 0x13, 0x8a, 0x49, 0x69, 0xd5, 0x1d, 0xfb, 0x81, 0xdc, 0xf8, 0xce, 0xbe, - 0x90, 0xff, 0xa5, 0xb9, 0x9a, 0xc7, 0x54, 0x06, 0x0d, 0xfd, 0x1c, 0x3f, 0x5f, 0x07, 0x00, 0x00, - 0xff, 0xff, 0x37, 0x49, 0xbb, 0x13, 0x42, 0x03, 0x00, 0x00, + 0x71, 0x53, 0x6e, 0x5c, 0x40, 0x45, 0x1c, 0x90, 0xb8, 0x90, 0x63, 0x2f, 0x28, 0x09, 0x6e, 0x6a, + 0xa9, 0xb5, 0xd3, 0xd8, 0xa9, 0xe8, 0x95, 0x27, 0x40, 0x9a, 0xf6, 0x02, 0x7b, 0x96, 0x1d, 0x7a, + 0xac, 0xb4, 0xcb, 0x4e, 0xd3, 0xd4, 0xee, 0x41, 0xa6, 0x38, 0x49, 0xd5, 0x75, 0xe9, 0xb4, 0xdd, + 0x12, 0xff, 0xfe, 0x7e, 0x9f, 0x0d, 0x2d, 0x21, 0xa7, 0x42, 0x32, 0x49, 0x68, 0x2c, 0xc2, 0xb1, + 0x24, 0xb3, 0x94, 0x26, 0x0b, 0x27, 0x4e, 0x84, 0x12, 0xa8, 0x55, 0x60, 0x4e, 0x8e, 0x39, 0x73, + 0x37, 0xa0, 0xca, 0x77, 0xad, 0xe7, 0x91, 0x88, 0x84, 0xa6, 0x90, 0xec, 0x2b, 0x67, 0x5b, 0xaf, + 0x22, 0x21, 0xa2, 0x09, 0x25, 0x7e, 0xcc, 0x88, 0xcf, 0xb9, 0x50, 0xbe, 0x62, 0x82, 0xcb, 0x02, + 0xfd, 0x18, 0x6a, 0x33, 0x12, 0xf8, 0x92, 0xe6, 0x21, 0xa4, 0xb0, 0x23, 0xb1, 0x1f, 0x31, 0xae, + 0xc9, 0xa5, 0xd3, 0x5e, 0xa7, 0x88, 0x72, 0x9a, 0xd5, 0xd0, 0xa8, 0x6d, 0xc2, 0xd6, 0xaf, 0x4c, + 0xff, 0x5d, 0x83, 0x3f, 0xf8, 0x48, 0x78, 0x74, 0x96, 0x52, 0xa9, 0xec, 0x21, 0x7c, 0x71, 0x0b, + 0x91, 0xb1, 0xe0, 0x92, 0xa2, 0x2f, 0xb0, 0x91, 0x9b, 0x99, 0xa0, 0x5d, 0xef, 0x3c, 0xed, 0xbf, + 0x71, 0xaa, 0x67, 0x73, 0xb4, 0x36, 0x93, 0x0e, 0x1e, 0x2d, 0x2f, 0x5e, 0x1b, 0x5e, 0x21, 0xb3, + 0x3f, 0x43, 0x53, 0x7b, 0x7f, 0x4b, 0x93, 0x84, 0x72, 0xa5, 0x69, 0x45, 0x2e, 0xc2, 0x10, 0xb2, + 0x3f, 0x94, 0x2b, 0x36, 0x62, 0x34, 0x31, 0x41, 0x1b, 0x74, 0x9e, 0x78, 0x3b, 0x27, 0xf6, 0x57, + 0xf8, 0xb2, 0x42, 0x5b, 0x34, 0x7b, 0x0b, 0x9f, 0x85, 0xf9, 0xf9, 0x6f, 0x1d, 0xa5, 0xf5, 0x75, + 0xaf, 0x19, 0xee, 0x90, 0xfb, 0xa7, 0x35, 0xf8, 0x58, 0x5b, 0xa0, 0x63, 0x00, 0xe1, 0xb6, 0xa3, + 0x44, 0xce, 0xa1, 0x39, 0xaa, 0x57, 0x64, 0x91, 0x7b, 0xf3, 0xf3, 0x7a, 0xf6, 0xfb, 0x7f, 0x67, + 0x57, 0x47, 0xb5, 0x36, 0xc2, 0x64, 0xef, 0x52, 0xca, 0xdb, 0xcb, 0x7f, 0xd1, 0x09, 0x80, 0xcd, + 0xdd, 0xf9, 0x50, 0xef, 0xce, 0xa4, 0x8a, 0x35, 0x5a, 0xee, 0x03, 0x14, 0x45, 0xbb, 0xae, 0x6e, + 0xf7, 0x01, 0xbd, 0x3b, 0xd4, 0xee, 0xc6, 0x6a, 0x07, 0x3f, 0x97, 0x6b, 0x0c, 0x56, 0x6b, 0x0c, + 0x2e, 0xd7, 0x18, 0xfc, 0xdf, 0x60, 0x63, 0xb5, 0xc1, 0xc6, 0xf9, 0x06, 0x1b, 0xc3, 0x7e, 0xc4, + 0xd4, 0x38, 0x0d, 0x9c, 0x50, 0x4c, 0x4b, 0xab, 0xee, 0xc4, 0x0f, 0xe4, 0xd6, 0x77, 0xee, 0xf6, + 0xc8, 0xdf, 0xd2, 0x5d, 0x2d, 0x62, 0x2a, 0x83, 0x86, 0x7e, 0x8f, 0x9f, 0xae, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x5a, 0x35, 0x94, 0xdc, 0x43, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go index f98623f0772..532db9bc5c2 100644 --- a/x/gamm/client/cli/cli_test.go +++ b/x/gamm/client/cli/cli_test.go @@ -7,12 +7,12 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" - gammtestutil "github.com/osmosis-labs/osmosis/v7/x/gamm/client/testutil" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" + gammtestutil "github.com/osmosis-labs/osmosis/v10/x/gamm/client/testutil" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index 08e722bf42a..061577dc8a8 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/gamm/client/cli/tx.go b/x/gamm/client/cli/tx.go index 0f1fb2d86ca..506c092fcca 100644 --- a/x/gamm/client/cli/tx.go +++ b/x/gamm/client/cli/tx.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/gamm/client/testutil/test_helpers.go b/x/gamm/client/testutil/test_helpers.go index 630ecae2dd4..ce6f8bc2f84 100644 --- a/x/gamm/client/testutil/test_helpers.go +++ b/x/gamm/client/testutil/test_helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - gammcli "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" + gammcli "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go index 005c6960e91..9ea0cae71eb 100644 --- a/x/gamm/keeper/export_test.go +++ b/x/gamm/keeper/export_test.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // SetParams sets the total set of params. diff --git a/x/gamm/keeper/gas_test.go b/x/gamm/keeper/gas_test.go index b5dd575306f..8a94b3b6e79 100644 --- a/x/gamm/keeper/gas_test.go +++ b/x/gamm/keeper/gas_test.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/genesis.go b/x/gamm/keeper/genesis.go index ca66abfe584..590581408e7 100644 --- a/x/gamm/keeper/genesis.go +++ b/x/gamm/keeper/genesis.go @@ -4,7 +4,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // InitGenesis initializes the x/gamm module's state from a provided genesis diff --git a/x/gamm/keeper/genesis_test b/x/gamm/keeper/genesis_test index 30d011e07ca..f522de32fa0 100644 --- a/x/gamm/keeper/genesis_test +++ b/x/gamm/keeper/genesis_test @@ -11,10 +11,10 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/gamm" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestGammInitGenesis(t *testing.T) { diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 5bc9c77c6b2..a404369e698 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -14,8 +14,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var sdkIntMaxValue = sdk.NewInt(0) diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index 5544c95316d..5dfa6aa1e97 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (suite *KeeperTestSuite) TestQueryPool() { diff --git a/x/gamm/keeper/internal/events/emit.go b/x/gamm/keeper/internal/events/emit.go index a9d68682fde..32d0559e860 100644 --- a/x/gamm/keeper/internal/events/emit.go +++ b/x/gamm/keeper/internal/events/emit.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func EmitSwapEvent(ctx sdk.Context, sender sdk.AccAddress, poolId uint64, input sdk.Coins, output sdk.Coins) { diff --git a/x/gamm/keeper/internal/events/emit_test.go b/x/gamm/keeper/internal/events/emit_test.go index 15d60dc5d52..eac138c0e1a 100644 --- a/x/gamm/keeper/internal/events/emit_test.go +++ b/x/gamm/keeper/internal/events/emit_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type GammEventsTestSuite struct { diff --git a/x/gamm/keeper/invariants.go b/x/gamm/keeper/invariants.go index 95f970d3f59..e25639a0321 100644 --- a/x/gamm/keeper/invariants.go +++ b/x/gamm/keeper/invariants.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const poolBalanceInvariantName = "pool-account-balance-equals-expected" diff --git a/x/gamm/keeper/keeper.go b/x/gamm/keeper/keeper.go index 6e557a5247e..f88f3903896 100644 --- a/x/gamm/keeper/keeper.go +++ b/x/gamm/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/keeper/keeper_test.go b/x/gamm/keeper/keeper_test.go index 1433fc51305..6f5b26a25db 100644 --- a/x/gamm/keeper/keeper_test.go +++ b/x/gamm/keeper/keeper_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type KeeperTestSuite struct { diff --git a/x/gamm/keeper/marshal_bench_test.go b/x/gamm/keeper/marshal_bench_test.go index f9f0f9db9a0..132c6ddd550 100644 --- a/x/gamm/keeper/marshal_bench_test.go +++ b/x/gamm/keeper/marshal_bench_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go index 357a4da60aa..5e3ce495e61 100644 --- a/x/gamm/keeper/msg_server.go +++ b/x/gamm/keeper/msg_server.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type msgServer struct { diff --git a/x/gamm/keeper/msg_server_test.go b/x/gamm/keeper/msg_server_test.go index a4011404e5f..a52251162e2 100644 --- a/x/gamm/keeper/msg_server_test.go +++ b/x/gamm/keeper/msg_server_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/keeper/multihop.go b/x/gamm/keeper/multihop.go index 1e80fb17c8d..a964874fde3 100644 --- a/x/gamm/keeper/multihop.go +++ b/x/gamm/keeper/multihop.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // MultihopSwapExactAmountIn defines the input denom and input amount for the first pool, diff --git a/x/gamm/keeper/multihop_test.go b/x/gamm/keeper/multihop_test.go index e92ee724e19..17a08debead 100644 --- a/x/gamm/keeper/multihop_test.go +++ b/x/gamm/keeper/multihop_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (suite *KeeperTestSuite) TestBalancerPoolSimpleMultihopSwapExactAmountIn() { diff --git a/x/gamm/keeper/params.go b/x/gamm/keeper/params.go index 420c3413e1d..50ff384dc7e 100644 --- a/x/gamm/keeper/params.go +++ b/x/gamm/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go index f347d5eeaba..9617ffb3f03 100644 --- a/x/gamm/keeper/pool.go +++ b/x/gamm/keeper/pool.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) MarshalPool(pool types.PoolI) ([]byte, error) { diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go index fe6aeef3f7b..904e14e96d4 100644 --- a/x/gamm/keeper/pool_service.go +++ b/x/gamm/keeper/pool_service.go @@ -8,7 +8,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // CalculateSpotPrice returns the spot price of the quote asset in terms of the base asset, diff --git a/x/gamm/keeper/pool_service_test.go b/x/gamm/keeper/pool_service_test.go index 2e8492ee9be..9201d44d094 100644 --- a/x/gamm/keeper/pool_service_test.go +++ b/x/gamm/keeper/pool_service_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go index 78aa914d16a..fa4e7e02047 100644 --- a/x/gamm/keeper/pool_test.go +++ b/x/gamm/keeper/pool_test.go @@ -7,7 +7,7 @@ package keeper_test // "github.com/cosmos/cosmos-sdk/simapp" // sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/osmosis-labs/osmosis/v7/x/gamm/types" +// "github.com/osmosis-labs/osmosis/v10/x/gamm/types" // ) // func (suite *KeeperTestSuite) TestCleanupPool() { diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go index a5de4174066..194e7727117 100644 --- a/x/gamm/keeper/share.go +++ b/x/gamm/keeper/share.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) applyJoinPoolStateChange(ctx sdk.Context, pool types.PoolI, joiner sdk.AccAddress, numShares sdk.Int, joinCoins sdk.Coins) error { diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go index a899c20bfd9..3c03818ac90 100644 --- a/x/gamm/keeper/swap.go +++ b/x/gamm/keeper/swap.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // SwapExactAmountIn attempts to swap one asset, tokenIn, for another asset diff --git a/x/gamm/keeper/swap_test.go b/x/gamm/keeper/swap_test.go index 4837a9f25fd..a6416198880 100644 --- a/x/gamm/keeper/swap_test.go +++ b/x/gamm/keeper/swap_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/gamm/keeper/total_liquidity.go b/x/gamm/keeper/total_liquidity.go index c82b0e9126b..e6db8b7dde8 100644 --- a/x/gamm/keeper/total_liquidity.go +++ b/x/gamm/keeper/total_liquidity.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) GetTotalLiquidity(ctx sdk.Context) sdk.Coins { diff --git a/x/gamm/module.go b/x/gamm/module.go index ce1f7ae38cd..a5352f99272 100644 --- a/x/gamm/module.go +++ b/x/gamm/module.go @@ -16,12 +16,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammsimulation "github.com/osmosis-labs/osmosis/v7/x/gamm/simulation" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammsimulation "github.com/osmosis-labs/osmosis/v10/x/gamm/simulation" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/balancer/amm.go b/x/gamm/pool-models/balancer/amm.go index a574cef411d..d24714d5a2c 100644 --- a/x/gamm/pool-models/balancer/amm.go +++ b/x/gamm/pool-models/balancer/amm.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/osmomath" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmomath" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // subPoolAssetWeights subtracts the weights of two different pool asset slices. diff --git a/x/gamm/pool-models/balancer/amm_test.go b/x/gamm/pool-models/balancer/amm_test.go index 707da15924a..1912a05bba0 100644 --- a/x/gamm/pool-models/balancer/amm_test.go +++ b/x/gamm/pool-models/balancer/amm_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/test_helpers" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/test_helpers" ) type BalancerTestSuite struct { diff --git a/x/gamm/pool-models/balancer/balancerPool.pb.go b/x/gamm/pool-models/balancer/balancerPool.pb.go index a19f10e90e1..c6d887afc99 100644 --- a/x/gamm/pool-models/balancer/balancerPool.pb.go +++ b/x/gamm/pool-models/balancer/balancerPool.pb.go @@ -298,58 +298,58 @@ func init() { var fileDescriptor_7e991f749f68c2a4 = []byte{ // 831 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x6f, 0xeb, 0x44, - 0x10, 0x8f, 0x93, 0xb4, 0x79, 0xdd, 0x3c, 0x1e, 0xea, 0xbe, 0x1c, 0xdc, 0x54, 0xc4, 0xd5, 0x22, - 0xa1, 0x27, 0xf4, 0x62, 0xab, 0x0f, 0x24, 0xa4, 0x1e, 0x40, 0x4d, 0x5b, 0x50, 0x6f, 0xc5, 0x45, - 0x6a, 0x41, 0x95, 0xac, 0x4d, 0xb2, 0xb1, 0xad, 0xda, 0x5e, 0xcb, 0xbb, 0x49, 0xdb, 0x6f, 0xc0, - 0xb1, 0xc7, 0x72, 0xeb, 0x9d, 0x2b, 0x7c, 0x87, 0x0a, 0x2e, 0x3d, 0x22, 0x0e, 0x06, 0xb5, 0x9c, - 0x38, 0xe6, 0x13, 0xa0, 0xfd, 0xe3, 0x24, 0x2d, 0x89, 0x68, 0xc5, 0x29, 0x3b, 0xb3, 0x33, 0xbf, - 0xf9, 0xcd, 0xcc, 0x6f, 0x1d, 0xf0, 0x29, 0x65, 0x31, 0x65, 0x21, 0x73, 0x7c, 0x1c, 0xc7, 0x4e, - 0x4a, 0x69, 0xd4, 0x8e, 0x69, 0x9f, 0x44, 0xcc, 0xe9, 0xe2, 0x08, 0x27, 0x3d, 0x92, 0x4d, 0x0e, - 0x07, 0x94, 0x46, 0x76, 0x9a, 0x51, 0x4e, 0x61, 0x43, 0x67, 0xd9, 0x22, 0xcb, 0x1e, 0x6d, 0x76, - 0x09, 0xc7, 0x9b, 0xcd, 0xb5, 0x9e, 0x74, 0x7b, 0x32, 0xc6, 0x51, 0x86, 0x4a, 0x68, 0x36, 0x7c, - 0xea, 0x53, 0xe5, 0x17, 0x27, 0xed, 0x6d, 0xf9, 0x94, 0xfa, 0x11, 0x71, 0xa4, 0xd5, 0x1d, 0x0e, - 0x9c, 0xfe, 0x30, 0xc3, 0x3c, 0xa4, 0x89, 0xbe, 0xb7, 0x1e, 0xdf, 0xf3, 0x30, 0x26, 0x8c, 0xe3, - 0x38, 0x2d, 0x00, 0x54, 0x11, 0x07, 0x0f, 0x79, 0xe0, 0x68, 0x1a, 0xd2, 0x78, 0x74, 0xdf, 0xc5, - 0x8c, 0x4c, 0xee, 0x7b, 0x34, 0xd4, 0x05, 0xd0, 0xaf, 0x15, 0x60, 0x1e, 0xc6, 0x94, 0xf2, 0xe0, - 0x88, 0x84, 0x7e, 0xc0, 0x77, 0x02, 0x9c, 0xf8, 0xe4, 0x00, 0x67, 0x38, 0x66, 0xf0, 0x18, 0x00, - 0xc6, 0x71, 0xc6, 0x3d, 0x51, 0xd5, 0x34, 0x36, 0x8c, 0x37, 0xf5, 0x77, 0x4d, 0x5b, 0x51, 0xb2, - 0x0b, 0x4a, 0xf6, 0x37, 0x05, 0xa5, 0xce, 0x07, 0x37, 0xb9, 0x55, 0x1a, 0xe7, 0xd6, 0xea, 0x05, - 0x8e, 0xa3, 0x2d, 0x34, 0xcd, 0x45, 0x97, 0x7f, 0x58, 0x86, 0xbb, 0x22, 0x1d, 0x22, 0x1c, 0x06, - 0xe0, 0x45, 0xd1, 0xa9, 0x59, 0x96, 0xb8, 0x6b, 0xff, 0xc2, 0xdd, 0xd5, 0x01, 0x9d, 0x4d, 0x01, - 0xfb, 0x77, 0x6e, 0xc1, 0x22, 0xe5, 0x2d, 0x8d, 0x43, 0x4e, 0xe2, 0x94, 0x5f, 0x8c, 0x73, 0xeb, - 0x7d, 0x55, 0xac, 0xb8, 0x43, 0x57, 0xa2, 0xd4, 0x04, 0x1d, 0x8e, 0x40, 0x23, 0x4c, 0x42, 0x1e, - 0xe2, 0xc8, 0x13, 0xbb, 0xf5, 0xce, 0x64, 0x9b, 0xcc, 0xac, 0x6c, 0x54, 0xde, 0xd4, 0xdf, 0x59, - 0xf6, 0xbc, 0x3d, 0xda, 0x62, 0xd1, 0xdb, 0x8c, 0x11, 0xde, 0xf9, 0x50, 0xb7, 0xb4, 0xae, 0xaa, - 0xcc, 0x83, 0x42, 0x2e, 0xd4, 0x6e, 0x91, 0xa6, 0xc6, 0xc8, 0x20, 0x03, 0xaf, 0x39, 0xce, 0x7c, - 0xc2, 0x1f, 0x96, 0xad, 0x3e, 0xad, 0x2c, 0xd2, 0x65, 0x9b, 0xaa, 0xec, 0x1c, 0x24, 0xe4, 0xae, - 0x2a, 0xef, 0x4c, 0x51, 0xf4, 0x57, 0x19, 0x00, 0x61, 0xeb, 0xfd, 0x9d, 0x80, 0x17, 0xec, 0x0c, - 0xa7, 0xde, 0x80, 0xa8, 0xed, 0xad, 0x74, 0xb6, 0x05, 0xee, 0xef, 0xb9, 0xf5, 0x91, 0x1f, 0xf2, - 0x60, 0xd8, 0xb5, 0x7b, 0x34, 0xd6, 0x32, 0xd5, 0x3f, 0x6d, 0xd6, 0x3f, 0x75, 0xf8, 0x45, 0x4a, - 0x98, 0xbd, 0x4b, 0x7a, 0xd3, 0xf1, 0x16, 0x38, 0xc8, 0xad, 0x89, 0xe3, 0x97, 0x84, 0x08, 0x74, - 0x72, 0x1e, 0x72, 0x89, 0x5e, 0xfe, 0x7f, 0xe8, 0x05, 0x0e, 0x72, 0x6b, 0xe2, 0x28, 0xd0, 0x7f, - 0x30, 0xc0, 0x3a, 0x93, 0xc2, 0xd4, 0x1d, 0x7b, 0x3d, 0x29, 0x4d, 0x2f, 0x95, 0xbd, 0x99, 0x15, - 0xa9, 0x1a, 0x7b, 0xfe, 0x20, 0x17, 0x29, 0xba, 0xf3, 0xf1, 0x4d, 0x6e, 0x19, 0xe3, 0xdc, 0x42, - 0xba, 0xab, 0xc5, 0x05, 0x90, 0x6b, 0xb2, 0x05, 0x28, 0xe8, 0x47, 0x03, 0xac, 0x4c, 0x76, 0x05, - 0xf7, 0xc0, 0x12, 0xa7, 0xa7, 0x24, 0xd1, 0x0f, 0x64, 0xcd, 0xd6, 0xef, 0x5e, 0x3c, 0xb9, 0x09, - 0xa3, 0x1d, 0x1a, 0x26, 0x9d, 0x86, 0xde, 0xea, 0x4b, 0xbd, 0x55, 0x91, 0x85, 0x5c, 0x95, 0x0d, - 0x8f, 0xc0, 0xb2, 0xe2, 0xa1, 0x87, 0xf9, 0xc5, 0x33, 0x86, 0xb9, 0x9f, 0xf0, 0x71, 0x6e, 0xbd, - 0xa7, 0x60, 0x15, 0x0a, 0x72, 0x35, 0x1c, 0xfa, 0xb9, 0x0a, 0xaa, 0x82, 0x2d, 0x7c, 0x0b, 0x6a, - 0xb8, 0xdf, 0xcf, 0x08, 0x63, 0x5a, 0x0d, 0x70, 0x9c, 0x5b, 0xaf, 0x54, 0x92, 0xbe, 0x40, 0x6e, - 0x11, 0x02, 0x5f, 0x81, 0x72, 0xd8, 0x97, 0x5c, 0xaa, 0x6e, 0x39, 0xec, 0xc3, 0x01, 0xa8, 0x4b, - 0xfd, 0x3d, 0x98, 0xff, 0xc6, 0x62, 0x21, 0xeb, 0x89, 0x3f, 0x7a, 0x40, 0xc5, 0xa7, 0xd4, 0x9b, - 0xc1, 0x42, 0x2e, 0x48, 0xa7, 0xa2, 0xfd, 0x1a, 0x34, 0x06, 0x43, 0x3e, 0xcc, 0x88, 0x0a, 0xf1, - 0xe9, 0x88, 0x64, 0x09, 0xcd, 0xcc, 0xaa, 0xa4, 0x6c, 0x4d, 0xa1, 0xe6, 0x45, 0x21, 0x17, 0x2a, - 0xb7, 0x60, 0xf0, 0x95, 0x76, 0xc2, 0x6f, 0xc1, 0x4b, 0x4e, 0x39, 0x8e, 0x3c, 0x16, 0xe0, 0x8c, - 0x30, 0x73, 0xe9, 0xbf, 0x16, 0xb5, 0xae, 0x49, 0xbf, 0x2e, 0x16, 0x35, 0x4d, 0x46, 0x6e, 0x5d, - 0x9a, 0x87, 0xd2, 0x82, 0x27, 0x7a, 0x2a, 0x58, 0x48, 0x81, 0x99, 0xcb, 0x4f, 0x7b, 0xde, 0x4d, - 0x8d, 0x0f, 0x15, 0xfe, 0x0c, 0x82, 0x9e, 0x85, 0x0c, 0x63, 0x30, 0x28, 0x88, 0x6b, 0x65, 0xd4, - 0xe4, 0x0c, 0xf6, 0x9e, 0xad, 0x8c, 0x07, 0x7d, 0x14, 0xfa, 0x50, 0x7d, 0x28, 0x79, 0x6f, 0xad, - 0x7e, 0x7f, 0x6d, 0x95, 0xae, 0xae, 0xad, 0xd2, 0x2f, 0x3f, 0xb5, 0x97, 0x04, 0xd1, 0xfd, 0xce, - 0xf1, 0xcd, 0x5d, 0xcb, 0xb8, 0xbd, 0x6b, 0x19, 0x7f, 0xde, 0xb5, 0x8c, 0xcb, 0xfb, 0x56, 0xe9, - 0xf6, 0xbe, 0x55, 0xfa, 0xed, 0xbe, 0x55, 0xfa, 0xee, 0xf3, 0x99, 0xc2, 0xba, 0xd3, 0x76, 0x84, - 0xbb, 0xac, 0x30, 0x9c, 0xd1, 0x67, 0xce, 0xf9, 0xe2, 0xff, 0xd3, 0xee, 0xb2, 0xfc, 0xc6, 0x7f, - 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x54, 0xdd, 0x49, 0x11, 0x7b, 0x07, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0x8f, 0x93, 0xb4, 0xd9, 0x4e, 0x96, 0x45, 0x9d, 0xcd, 0xc1, 0x4d, 0x45, 0x5c, 0x0d, 0x12, + 0x5a, 0xa1, 0x8d, 0x4d, 0x16, 0x4e, 0x7b, 0x59, 0x6d, 0xda, 0x82, 0x7a, 0x2b, 0x2e, 0x52, 0x29, + 0xaa, 0x64, 0x4d, 0x92, 0x89, 0x6d, 0xd5, 0xf6, 0x58, 0x9e, 0x49, 0xda, 0x7e, 0x03, 0x8e, 0x3d, + 0x96, 0x5b, 0xef, 0x5c, 0xe1, 0x3b, 0x54, 0x70, 0xe9, 0x11, 0x71, 0x30, 0xa8, 0xe5, 0xc4, 0x31, + 0x9f, 0x00, 0xcd, 0x1f, 0x27, 0x69, 0x49, 0x44, 0x2b, 0x4e, 0x99, 0xf7, 0xe6, 0xbd, 0xdf, 0xfb, + 0xbd, 0xf7, 0x7e, 0xe3, 0x80, 0x2f, 0x28, 0x8b, 0x29, 0x0b, 0x99, 0xe3, 0xe3, 0x38, 0x76, 0x52, + 0x4a, 0xa3, 0x76, 0x4c, 0x07, 0x24, 0x62, 0x4e, 0x0f, 0x47, 0x38, 0xe9, 0x93, 0x6c, 0x7a, 0xd8, + 0xa7, 0x34, 0xb2, 0xd3, 0x8c, 0x72, 0x0a, 0x1b, 0x3a, 0xcb, 0x16, 0x59, 0xf6, 0xb8, 0xd3, 0x23, + 0x1c, 0x77, 0x9a, 0x1b, 0x7d, 0xe9, 0xf6, 0x64, 0x8c, 0xa3, 0x0c, 0x95, 0xd0, 0x6c, 0xf8, 0xd4, + 0xa7, 0xca, 0x2f, 0x4e, 0xda, 0xdb, 0xf2, 0x29, 0xf5, 0x23, 0xe2, 0x48, 0xab, 0x37, 0x1a, 0x3a, + 0x83, 0x51, 0x86, 0x79, 0x48, 0x13, 0x7d, 0x6f, 0x3d, 0xbc, 0xe7, 0x61, 0x4c, 0x18, 0xc7, 0x71, + 0x5a, 0x00, 0xa8, 0x22, 0x0e, 0x1e, 0xf1, 0xc0, 0xd1, 0x34, 0xa4, 0xf1, 0xe0, 0xbe, 0x87, 0x19, + 0x99, 0xde, 0xf7, 0x69, 0xa8, 0x0b, 0xa0, 0x5f, 0x2b, 0xc0, 0x3c, 0x88, 0x29, 0xe5, 0xc1, 0x21, + 0x09, 0xfd, 0x80, 0x6f, 0x07, 0x38, 0xf1, 0xc9, 0x3e, 0xce, 0x70, 0xcc, 0xe0, 0xb7, 0x00, 0x30, + 0x8e, 0x33, 0xee, 0x89, 0xaa, 0xa6, 0xb1, 0x65, 0xbc, 0xaa, 0xbf, 0x69, 0xda, 0x8a, 0x92, 0x5d, + 0x50, 0xb2, 0xbf, 0x29, 0x28, 0x75, 0x3f, 0xba, 0xce, 0xad, 0xd2, 0x24, 0xb7, 0xd6, 0xcf, 0x71, + 0x1c, 0xbd, 0x45, 0xb3, 0x5c, 0x74, 0xf1, 0x87, 0x65, 0xb8, 0x6b, 0xd2, 0x21, 0xc2, 0x61, 0x00, + 0x9e, 0x15, 0x9d, 0x9a, 0x65, 0x89, 0xbb, 0xf1, 0x2f, 0xdc, 0x1d, 0x1d, 0xd0, 0xed, 0x08, 0xd8, + 0xbf, 0x73, 0x0b, 0x16, 0x29, 0xaf, 0x69, 0x1c, 0x72, 0x12, 0xa7, 0xfc, 0x7c, 0x92, 0x5b, 0x1f, + 0xaa, 0x62, 0xc5, 0x1d, 0xba, 0x14, 0xa5, 0xa6, 0xe8, 0x70, 0x0c, 0x1a, 0x61, 0x12, 0xf2, 0x10, + 0x47, 0x9e, 0xd8, 0xad, 0x77, 0x2a, 0xdb, 0x64, 0x66, 0x65, 0xab, 0xf2, 0xaa, 0xfe, 0xc6, 0xb2, + 0x17, 0xed, 0xd1, 0x16, 0x8b, 0x7e, 0xcf, 0x18, 0xe1, 0xdd, 0x8f, 0x75, 0x4b, 0x9b, 0xaa, 0xca, + 0x22, 0x28, 0xe4, 0x42, 0xed, 0x16, 0x69, 0x6a, 0x8c, 0x0c, 0x32, 0xf0, 0x92, 0xe3, 0xcc, 0x27, + 0xfc, 0x7e, 0xd9, 0xea, 0xe3, 0xca, 0x22, 0x5d, 0xb6, 0xa9, 0xca, 0x2e, 0x40, 0x42, 0xee, 0xba, + 0xf2, 0xce, 0x15, 0x45, 0x7f, 0x95, 0x01, 0x10, 0xb6, 0xde, 0xdf, 0x31, 0x78, 0xc6, 0x4e, 0x71, + 0xea, 0x0d, 0x89, 0xda, 0xde, 0x5a, 0xf7, 0xbd, 0xc0, 0xfd, 0x3d, 0xb7, 0x3e, 0xf1, 0x43, 0x1e, + 0x8c, 0x7a, 0x76, 0x9f, 0xc6, 0x5a, 0xa6, 0xfa, 0xa7, 0xcd, 0x06, 0x27, 0x0e, 0x3f, 0x4f, 0x09, + 0xb3, 0x77, 0x48, 0x7f, 0x36, 0xde, 0x02, 0x07, 0xb9, 0x35, 0x71, 0xfc, 0x92, 0x10, 0x81, 0x4e, + 0xce, 0x42, 0x2e, 0xd1, 0xcb, 0xff, 0x0f, 0xbd, 0xc0, 0x41, 0x6e, 0x4d, 0x1c, 0x05, 0xfa, 0x0f, + 0x06, 0xd8, 0x64, 0x52, 0x98, 0xba, 0x63, 0xaf, 0x2f, 0xa5, 0xe9, 0xa5, 0xb2, 0x37, 0xb3, 0x22, + 0x55, 0x63, 0x2f, 0x1e, 0xe4, 0x32, 0x45, 0x77, 0x3f, 0xbd, 0xce, 0x2d, 0x63, 0x92, 0x5b, 0x48, + 0x77, 0xb5, 0xbc, 0x00, 0x72, 0x4d, 0xb6, 0x04, 0x05, 0xfd, 0x68, 0x80, 0xb5, 0xe9, 0xae, 0xe0, + 0x2e, 0x58, 0xe1, 0xf4, 0x84, 0x24, 0xfa, 0x81, 0x6c, 0xd8, 0xfa, 0xdd, 0x8b, 0x27, 0x37, 0x65, + 0xb4, 0x4d, 0xc3, 0xa4, 0xdb, 0xd0, 0x5b, 0x7d, 0xae, 0xb7, 0x2a, 0xb2, 0x90, 0xab, 0xb2, 0xe1, + 0x21, 0x58, 0x55, 0x3c, 0xf4, 0x30, 0xdf, 0x3d, 0x61, 0x98, 0x7b, 0x09, 0x9f, 0xe4, 0xd6, 0x07, + 0x0a, 0x56, 0xa1, 0x20, 0x57, 0xc3, 0xa1, 0x9f, 0xab, 0xa0, 0x2a, 0xd8, 0xc2, 0xd7, 0xa0, 0x86, + 0x07, 0x83, 0x8c, 0x30, 0xa6, 0xd5, 0x00, 0x27, 0xb9, 0xf5, 0x42, 0x25, 0xe9, 0x0b, 0xe4, 0x16, + 0x21, 0xf0, 0x05, 0x28, 0x87, 0x03, 0xc9, 0xa5, 0xea, 0x96, 0xc3, 0x01, 0x1c, 0x82, 0xba, 0xd4, + 0xdf, 0xbd, 0xf9, 0x6f, 0x2d, 0x17, 0xb2, 0x9e, 0xf8, 0x83, 0x07, 0x54, 0x7c, 0x4a, 0xbd, 0x39, + 0x2c, 0xe4, 0x82, 0x74, 0x26, 0xda, 0xaf, 0x41, 0x63, 0x38, 0xe2, 0xa3, 0x8c, 0xa8, 0x10, 0x9f, + 0x8e, 0x49, 0x96, 0xd0, 0xcc, 0xac, 0x4a, 0xca, 0xd6, 0x0c, 0x6a, 0x51, 0x14, 0x72, 0xa1, 0x72, + 0x0b, 0x06, 0x5f, 0x69, 0x27, 0x3c, 0x02, 0xcf, 0x39, 0xe5, 0x38, 0xf2, 0x58, 0x80, 0x33, 0xc2, + 0xcc, 0x95, 0xff, 0x5a, 0xd4, 0xa6, 0x26, 0xfd, 0xb2, 0x58, 0xd4, 0x2c, 0x19, 0xb9, 0x75, 0x69, + 0x1e, 0x48, 0x0b, 0x1e, 0xeb, 0xa9, 0x60, 0x21, 0x05, 0x66, 0xae, 0x3e, 0xee, 0x79, 0x37, 0x35, + 0x3e, 0x54, 0xf8, 0x73, 0x08, 0x7a, 0x16, 0x32, 0x8c, 0xc1, 0xa0, 0x20, 0xae, 0x95, 0x51, 0x93, + 0x33, 0xd8, 0x7d, 0xb2, 0x32, 0xee, 0xf5, 0x51, 0xe8, 0x43, 0xf5, 0xa1, 0xe4, 0xfd, 0x76, 0xfd, + 0xfb, 0x2b, 0xab, 0x74, 0x79, 0x65, 0x95, 0x7e, 0xf9, 0xa9, 0xbd, 0x22, 0x88, 0xee, 0x75, 0x8f, + 0xae, 0x6f, 0x5b, 0xc6, 0xcd, 0x6d, 0xcb, 0xf8, 0xf3, 0xb6, 0x65, 0x5c, 0xdc, 0xb5, 0x4a, 0x37, + 0x77, 0xad, 0xd2, 0x6f, 0x77, 0xad, 0xd2, 0x77, 0xef, 0xe6, 0x0a, 0xeb, 0x4e, 0xdb, 0x11, 0xee, + 0xb1, 0xc2, 0x70, 0xc6, 0x9d, 0xcf, 0x9c, 0xb3, 0xe5, 0x7f, 0xa8, 0xbd, 0x55, 0xf9, 0x91, 0xff, + 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x85, 0x4a, 0xe3, 0x7c, 0x07, 0x00, 0x00, } func (m *SmoothWeightChangeParams) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/pool-models/balancer/codec.go b/x/gamm/pool-models/balancer/codec.go index e01898a4b8e..06f6a4c3c08 100644 --- a/x/gamm/pool-models/balancer/codec.go +++ b/x/gamm/pool-models/balancer/codec.go @@ -1,7 +1,7 @@ package balancer import ( - types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/gamm/pool-models/balancer/marshal_test.go b/x/gamm/pool-models/balancer/marshal_test.go index 56756466942..656c894ea88 100644 --- a/x/gamm/pool-models/balancer/marshal_test.go +++ b/x/gamm/pool-models/balancer/marshal_test.go @@ -8,7 +8,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/pool-models/balancer/msgs.go b/x/gamm/pool-models/balancer/msgs.go index 400fa26f93a..229b02e0eb2 100644 --- a/x/gamm/pool-models/balancer/msgs.go +++ b/x/gamm/pool-models/balancer/msgs.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/msgs_test.go b/x/gamm/pool-models/balancer/msgs_test.go index c0d556994c9..420ce37ae63 100644 --- a/x/gamm/pool-models/balancer/msgs_test.go +++ b/x/gamm/pool-models/balancer/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestMsgCreateBalancerPool(t *testing.T) { diff --git a/x/gamm/pool-models/balancer/pool.go b/x/gamm/pool-models/balancer/pool.go index 4169067aa0e..f0c887b7bd8 100644 --- a/x/gamm/pool-models/balancer/pool.go +++ b/x/gamm/pool-models/balancer/pool.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/osmomath" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmomath" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) //nolint:deadcode diff --git a/x/gamm/pool-models/balancer/pool_asset.go b/x/gamm/pool-models/balancer/pool_asset.go index ecfc06411cc..2041ccd9ed8 100644 --- a/x/gamm/pool-models/balancer/pool_asset.go +++ b/x/gamm/pool-models/balancer/pool_asset.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "gopkg.in/yaml.v2" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/pool-models/balancer/pool_params.go b/x/gamm/pool-models/balancer/pool_params.go index 1d25fe33402..886363851c8 100644 --- a/x/gamm/pool-models/balancer/pool_params.go +++ b/x/gamm/pool-models/balancer/pool_params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func NewPoolParams(swapFee, exitFee sdk.Dec, params *SmoothWeightChangeParams) PoolParams { diff --git a/x/gamm/pool-models/balancer/pool_suite_test.go b/x/gamm/pool-models/balancer/pool_suite_test.go index 20c21e5734a..0459810672f 100644 --- a/x/gamm/pool-models/balancer/pool_suite_test.go +++ b/x/gamm/pool-models/balancer/pool_suite_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v10" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/pool_test.go b/x/gamm/pool-models/balancer/pool_test.go index fd13bd7766a..f96943d7510 100644 --- a/x/gamm/pool-models/balancer/pool_test.go +++ b/x/gamm/pool-models/balancer/pool_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/balancer/tx.pb.go b/x/gamm/pool-models/balancer/tx.pb.go index b10cb4e3eed..dd2f853aa3c 100644 --- a/x/gamm/pool-models/balancer/tx.pb.go +++ b/x/gamm/pool-models/balancer/tx.pb.go @@ -152,33 +152,33 @@ func init() { var fileDescriptor_0647ee155de97433 = []byte{ // 427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xc1, 0x8a, 0xd4, 0x30, - 0x18, 0x80, 0x27, 0x3b, 0x43, 0xc5, 0x0c, 0x1e, 0x0c, 0xab, 0x94, 0x11, 0xdb, 0x52, 0x2f, 0xf5, - 0x30, 0x09, 0x3b, 0x0a, 0x82, 0x07, 0xc5, 0xba, 0xb8, 0xec, 0x61, 0x61, 0xed, 0x49, 0xbd, 0x2c, - 0xe9, 0x36, 0xd6, 0x81, 0xb6, 0x29, 0x49, 0x66, 0x18, 0xdf, 0xc2, 0x27, 0xf0, 0xe8, 0x33, 0xf8, - 0x08, 0x7b, 0xdc, 0xa3, 0xa7, 0x22, 0x9d, 0x37, 0x98, 0x27, 0x90, 0x24, 0xad, 0xac, 0xd0, 0x41, - 0xc1, 0x5b, 0xfa, 0xe7, 0xfb, 0xbf, 0xff, 0xff, 0xd3, 0x1f, 0xce, 0xb9, 0x2c, 0xb9, 0x5c, 0x4a, - 0x92, 0xd3, 0xb2, 0x24, 0x35, 0xe7, 0xc5, 0xbc, 0xe4, 0x19, 0x2b, 0x24, 0x49, 0x69, 0x41, 0xab, - 0x4b, 0x26, 0x88, 0xda, 0x10, 0xb5, 0xc1, 0xb5, 0xe0, 0x8a, 0xa3, 0xa8, 0xc3, 0xb1, 0xc6, 0xb1, - 0xc6, 0x2d, 0x8d, 0x7b, 0x1a, 0xaf, 0x8f, 0x52, 0xa6, 0xe8, 0xd1, 0xec, 0x30, 0xe7, 0x39, 0x37, - 0x49, 0x44, 0x9f, 0x6c, 0xfe, 0xec, 0xe9, 0xdf, 0xcb, 0xf5, 0x87, 0x73, 0xce, 0x0b, 0x9b, 0x15, - 0x7e, 0x3f, 0x80, 0xf7, 0xce, 0x64, 0xfe, 0x5a, 0x30, 0xaa, 0x58, 0x7c, 0xe3, 0x1e, 0x3d, 0x86, - 0x8e, 0x64, 0x55, 0xc6, 0x84, 0x0b, 0x02, 0x10, 0xdd, 0x8e, 0xef, 0xee, 0x1a, 0xff, 0xce, 0x67, - 0x5a, 0x16, 0xcf, 0x43, 0x1b, 0x0f, 0x93, 0x0e, 0x40, 0xef, 0xe1, 0x54, 0xd7, 0xbb, 0xa8, 0xa9, - 0xa0, 0xa5, 0x74, 0x0f, 0x02, 0x10, 0x4d, 0x17, 0x01, 0xfe, 0x63, 0xa0, 0xae, 0x79, 0xac, 0xdd, - 0xe7, 0x86, 0x8b, 0xef, 0xef, 0x1a, 0x1f, 0x59, 0xe3, 0x8d, 0xf4, 0x30, 0x81, 0xf5, 0x6f, 0x06, - 0xbd, 0xe9, 0xd4, 0x54, 0x4a, 0xa6, 0xa4, 0x3b, 0x0e, 0xc6, 0xd1, 0x74, 0xe1, 0xef, 0x57, 0xbf, - 0xd2, 0x5c, 0x3c, 0xb9, 0x6a, 0xfc, 0x91, 0xf5, 0x98, 0x80, 0x44, 0x6f, 0xe1, 0xe1, 0xc7, 0x95, - 0x5a, 0x09, 0x76, 0x61, 0x74, 0x39, 0x5f, 0x33, 0x51, 0x71, 0xe1, 0x4e, 0xcc, 0x6c, 0xfe, 0xae, - 0xf1, 0x1f, 0xd8, 0x4e, 0x86, 0xa8, 0x30, 0x41, 0x36, 0xac, 0x2b, 0x9c, 0xf4, 0xc1, 0x63, 0xf8, - 0x70, 0xf0, 0xe5, 0x12, 0x26, 0x6b, 0x5e, 0x49, 0x86, 0x1e, 0xc1, 0x5b, 0x46, 0xb3, 0xcc, 0xcc, - 0x13, 0x4e, 0x62, 0xd8, 0x36, 0xbe, 0xa3, 0x91, 0xd3, 0xe3, 0xc4, 0xd1, 0x57, 0xa7, 0xd9, 0xe2, - 0x1b, 0x80, 0xe3, 0x33, 0x99, 0xa3, 0xaf, 0x00, 0xa2, 0x81, 0xbf, 0xf0, 0x12, 0xff, 0xeb, 0x5a, - 0xe0, 0xc1, 0x66, 0x66, 0x27, 0xff, 0x29, 0xe8, 0xa7, 0x89, 0xdf, 0x5d, 0xb5, 0x1e, 0xb8, 0x6e, - 0x3d, 0xf0, 0xb3, 0xf5, 0xc0, 0x97, 0xad, 0x37, 0xba, 0xde, 0x7a, 0xa3, 0x1f, 0x5b, 0x6f, 0xf4, - 0xe1, 0x45, 0xbe, 0x54, 0x9f, 0x56, 0x29, 0xbe, 0xe4, 0x25, 0xe9, 0x8a, 0xcd, 0x0b, 0x9a, 0xca, - 0xfe, 0x83, 0xac, 0x9f, 0x91, 0xcd, 0xfe, 0xb5, 0x4c, 0x1d, 0xb3, 0x8a, 0x4f, 0x7e, 0x05, 0x00, - 0x00, 0xff, 0xff, 0x56, 0x65, 0x86, 0x28, 0x31, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xc1, 0x6e, 0xd3, 0x30, + 0x18, 0x80, 0xeb, 0xb5, 0x0a, 0xc2, 0x15, 0x07, 0xac, 0x81, 0xa2, 0x22, 0x92, 0x28, 0x5c, 0xc2, + 0xa1, 0x36, 0x2d, 0x9c, 0xb8, 0x4c, 0x84, 0x89, 0x69, 0x87, 0x49, 0x23, 0xb7, 0x71, 0x99, 0x9c, + 0xc5, 0x84, 0x4a, 0x49, 0x1c, 0xd9, 0x6e, 0x55, 0xde, 0x82, 0x27, 0xe0, 0xc8, 0x33, 0xf0, 0x08, + 0x3b, 0xee, 0xc8, 0x29, 0x42, 0xe9, 0x1b, 0xf4, 0x09, 0x90, 0xed, 0x04, 0x0d, 0x29, 0x13, 0x48, + 0xdc, 0x9c, 0xdf, 0xdf, 0xff, 0xfd, 0xff, 0xef, 0xfc, 0x70, 0xce, 0x65, 0xc9, 0xe5, 0x4a, 0x92, + 0x9c, 0x96, 0x25, 0xa9, 0x39, 0x2f, 0xe6, 0x25, 0xcf, 0x58, 0x21, 0x49, 0x4a, 0x0b, 0x5a, 0x5d, + 0x31, 0x41, 0xd4, 0x96, 0xa8, 0x2d, 0xae, 0x05, 0x57, 0x1c, 0x45, 0x1d, 0x8e, 0x35, 0x8e, 0x35, + 0x6e, 0x69, 0xdc, 0xd3, 0x78, 0xb3, 0x48, 0x99, 0xa2, 0x8b, 0xd9, 0x61, 0xce, 0x73, 0x6e, 0x92, + 0x88, 0x3e, 0xd9, 0xfc, 0xd9, 0xab, 0xbf, 0x97, 0xeb, 0x0f, 0xe7, 0x9c, 0x17, 0x36, 0x2b, 0xfc, + 0x7e, 0x00, 0x1f, 0x9d, 0xc9, 0xfc, 0xad, 0x60, 0x54, 0xb1, 0xf8, 0xd6, 0x3d, 0x7a, 0x0e, 0x1d, + 0xc9, 0xaa, 0x8c, 0x09, 0x17, 0x04, 0x20, 0xba, 0x1f, 0x3f, 0xdc, 0x37, 0xfe, 0x83, 0xcf, 0xb4, + 0x2c, 0x5e, 0x87, 0x36, 0x1e, 0x26, 0x1d, 0x80, 0x2e, 0xe0, 0x54, 0xd7, 0xbb, 0xac, 0xa9, 0xa0, + 0xa5, 0x74, 0x0f, 0x02, 0x10, 0x4d, 0x97, 0x01, 0xfe, 0x63, 0xa0, 0xae, 0x79, 0xac, 0xdd, 0xe7, + 0x86, 0x8b, 0x1f, 0xef, 0x1b, 0x1f, 0x59, 0xe3, 0xad, 0xf4, 0x30, 0x81, 0xf5, 0x6f, 0x06, 0xbd, + 0xeb, 0xd4, 0x54, 0x4a, 0xa6, 0xa4, 0x3b, 0x0e, 0xc6, 0xd1, 0x74, 0xe9, 0xdf, 0xad, 0x7e, 0xa3, + 0xb9, 0x78, 0x72, 0xdd, 0xf8, 0x23, 0xeb, 0x31, 0x01, 0x89, 0xde, 0xc3, 0xc3, 0x8f, 0x6b, 0xb5, + 0x16, 0xec, 0xd2, 0xe8, 0x72, 0xbe, 0x61, 0xa2, 0xe2, 0xc2, 0x9d, 0x98, 0xd9, 0xfc, 0x7d, 0xe3, + 0x3f, 0xb1, 0x9d, 0x0c, 0x51, 0x61, 0x82, 0x6c, 0x58, 0x57, 0x38, 0xe9, 0x83, 0xc7, 0xf0, 0xe9, + 0xe0, 0xcb, 0x25, 0x4c, 0xd6, 0xbc, 0x92, 0x0c, 0x3d, 0x83, 0xf7, 0x8c, 0x66, 0x95, 0x99, 0x27, + 0x9c, 0xc4, 0xb0, 0x6d, 0x7c, 0x47, 0x23, 0xa7, 0xc7, 0x89, 0xa3, 0xaf, 0x4e, 0xb3, 0xe5, 0x37, + 0x00, 0xc7, 0x67, 0x32, 0x47, 0x5f, 0x01, 0x44, 0x03, 0x7f, 0xe1, 0x08, 0xff, 0xeb, 0x5a, 0xe0, + 0xc1, 0x66, 0x66, 0x27, 0xff, 0x29, 0xe8, 0xa7, 0x89, 0x2f, 0xae, 0x5b, 0x0f, 0xdc, 0xb4, 0x1e, + 0xf8, 0xd9, 0x7a, 0xe0, 0xcb, 0xce, 0x1b, 0xdd, 0xec, 0xbc, 0xd1, 0x8f, 0x9d, 0x37, 0xfa, 0x70, + 0x94, 0xaf, 0xd4, 0xa7, 0x75, 0x8a, 0xaf, 0x78, 0x49, 0xba, 0x62, 0xf3, 0x82, 0xa6, 0xb2, 0xff, + 0x20, 0x9b, 0xc5, 0x0b, 0xb2, 0xbd, 0x7b, 0x2f, 0x53, 0xc7, 0xec, 0xe2, 0xcb, 0x5f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x69, 0x2b, 0x7d, 0x0d, 0x32, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/pool-models/balancer/util_test.go b/x/gamm/pool-models/balancer/util_test.go index c5e8405b696..bfab4df455d 100644 --- a/x/gamm/pool-models/balancer/util_test.go +++ b/x/gamm/pool-models/balancer/util_test.go @@ -12,9 +12,9 @@ import ( tmtypes "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func createTestPool(t *testing.T, swapFee, exitFee sdk.Dec, poolAssets ...balancer.PoolAsset) types.PoolI { diff --git a/x/gamm/pool-models/internal/cfmm_common/lp.go b/x/gamm/pool-models/internal/cfmm_common/lp.go index ffcd9559f5e..f963fe18cbc 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const errMsgFormatSharesLargerThanMax = "%s resulted shares is larger than the max amount of %s" diff --git a/x/gamm/pool-models/internal/cfmm_common/lp_test.go b/x/gamm/pool-models/internal/cfmm_common/lp_test.go index abb62f267c8..e203acd6aff 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp_test.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/pool-models/internal/test_helpers/test_helpers.go b/x/gamm/pool-models/internal/test_helpers/test_helpers.go index ba1f7dad435..60921ef9529 100644 --- a/x/gamm/pool-models/internal/test_helpers/test_helpers.go +++ b/x/gamm/pool-models/internal/test_helpers/test_helpers.go @@ -10,8 +10,8 @@ import ( tmtypes "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // CfmmCommonTestSuite is the common test suite struct of Constant Function Market Maker, diff --git a/x/gamm/pool-models/stableswap/amm.go b/x/gamm/pool-models/stableswap/amm.go index 7872d5d02fe..47356e3e27e 100644 --- a/x/gamm/pool-models/stableswap/amm.go +++ b/x/gamm/pool-models/stableswap/amm.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/cfmm_common" - types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/stableswap/amm_test.go b/x/gamm/pool-models/stableswap/amm_test.go index 881de9fcc41..e77f83d5ec8 100644 --- a/x/gamm/pool-models/stableswap/amm_test.go +++ b/x/gamm/pool-models/stableswap/amm_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/test_helpers" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/test_helpers" ) type StableSwapTestSuite struct { diff --git a/x/gamm/pool-models/stableswap/codec.go b/x/gamm/pool-models/stableswap/codec.go index 168d535d33b..2d1a01f57d8 100644 --- a/x/gamm/pool-models/stableswap/codec.go +++ b/x/gamm/pool-models/stableswap/codec.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // RegisterLegacyAminoCodec registers the necessary x/gamm interfaces and concrete types diff --git a/x/gamm/pool-models/stableswap/msgs.go b/x/gamm/pool-models/stableswap/msgs.go index 4661693164d..2182d825723 100644 --- a/x/gamm/pool-models/stableswap/msgs.go +++ b/x/gamm/pool-models/stableswap/msgs.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/stableswap/msgs_test.go b/x/gamm/pool-models/stableswap/msgs_test.go index 250483dc3de..301aa5ffa50 100644 --- a/x/gamm/pool-models/stableswap/msgs_test.go +++ b/x/gamm/pool-models/stableswap/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestMsgCreateStableswapPool(t *testing.T) { diff --git a/x/gamm/pool-models/stableswap/pool.go b/x/gamm/pool-models/stableswap/pool.go index 8ab7e1f962a..82eaba14aa9 100644 --- a/x/gamm/pool-models/stableswap/pool.go +++ b/x/gamm/pool-models/stableswap/pool.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var _ types.PoolI = &Pool{} diff --git a/x/gamm/pool-models/stableswap/pool_params.go b/x/gamm/pool-models/stableswap/pool_params.go index 7927e6604f8..6d5289c028e 100644 --- a/x/gamm/pool-models/stableswap/pool_params.go +++ b/x/gamm/pool-models/stableswap/pool_params.go @@ -3,7 +3,7 @@ package stableswap import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (params PoolParams) Validate() error { diff --git a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go index a2fdd1ab03f..ff197c18690 100644 --- a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go +++ b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go @@ -136,47 +136,47 @@ func init() { } var fileDescriptor_ae0f054436f9999a = []byte{ - // 632 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x8d, 0xdb, 0xb4, 0x29, 0x5b, 0x1a, 0x84, 0x29, 0xc2, 0x6d, 0x85, 0x37, 0x5a, 0x09, 0x14, - 0x21, 0x62, 0x53, 0x90, 0x40, 0xf4, 0x04, 0x01, 0x15, 0x21, 0x21, 0x51, 0xcc, 0x89, 0x0a, 0x29, - 0x5a, 0xdb, 0x1b, 0x77, 0x85, 0x9d, 0x35, 0xde, 0x75, 0x69, 0x2f, 0x9c, 0x39, 0x72, 0xe4, 0xd8, - 0x13, 0x07, 0xce, 0x7c, 0x44, 0xc5, 0xa9, 0x47, 0xc4, 0xc1, 0xa0, 0xf6, 0x0f, 0xf2, 0x05, 0x68, - 0xd7, 0xeb, 0x26, 0x29, 0x55, 0x55, 0x89, 0x53, 0x76, 0x66, 0xde, 0xbc, 0x99, 0x79, 0x33, 0x31, - 0x78, 0xc8, 0x78, 0xc2, 0x38, 0xe5, 0x6e, 0x84, 0x93, 0xc4, 0x4d, 0x19, 0x8b, 0x3b, 0x09, 0x0b, - 0x49, 0xcc, 0x5d, 0x2e, 0xb0, 0x1f, 0x13, 0xfe, 0x01, 0xa7, 0x63, 0xcf, 0x9e, 0x44, 0x38, 0x69, - 0xc6, 0x04, 0x33, 0x6f, 0xe9, 0x54, 0x47, 0xa6, 0x3a, 0x32, 0x50, 0x66, 0x3a, 0x23, 0xb8, 0xb3, - 0xbd, 0xea, 0x13, 0x81, 0x57, 0x97, 0x97, 0x02, 0x05, 0xee, 0xa9, 0x4c, 0xb7, 0x34, 0x4a, 0x9a, - 0xe5, 0xc5, 0x88, 0x45, 0xac, 0xf4, 0xcb, 0x97, 0xf6, 0xda, 0x11, 0x63, 0x51, 0x4c, 0x5c, 0x65, - 0xf9, 0x79, 0xdf, 0x0d, 0xf3, 0x0c, 0x0b, 0xca, 0x06, 0x3a, 0x0e, 0x4f, 0xc6, 0x05, 0x4d, 0x08, - 0x17, 0x38, 0x49, 0x2b, 0x82, 0xb2, 0x88, 0x8b, 0x73, 0xb1, 0xe5, 0xea, 0x36, 0x94, 0x71, 0x22, - 0xee, 0x63, 0x4e, 0x8e, 0xe3, 0x01, 0xa3, 0xba, 0x00, 0xda, 0x37, 0x00, 0xd8, 0x60, 0x2c, 0xde, - 0xc0, 0x19, 0x4e, 0xb8, 0xf9, 0x16, 0xcc, 0xa9, 0xf9, 0xfb, 0x84, 0x58, 0x46, 0xcb, 0x68, 0x5f, - 0xe8, 0x3e, 0xde, 0x2f, 0x60, 0xed, 0x57, 0x01, 0x6f, 0x46, 0x54, 0x6c, 0xe5, 0xbe, 0x13, 0xb0, - 0x44, 0x0f, 0xa6, 0x7f, 0x3a, 0x3c, 0x7c, 0xe7, 0x8a, 0xdd, 0x94, 0x70, 0xe7, 0x29, 0x09, 0x86, - 0x05, 0xbc, 0xb4, 0x8b, 0x93, 0x78, 0x0d, 0x55, 0x3c, 0xc8, 0x6b, 0xc8, 0xe7, 0x3a, 0x21, 0x92, - 0x9d, 0xec, 0x50, 0xa1, 0xd8, 0xa7, 0xfe, 0x8f, 0xbd, 0xe2, 0x41, 0x5e, 0x43, 0x3e, 0xd7, 0x09, - 0x41, 0x5f, 0x67, 0x40, 0x5d, 0x8e, 0x62, 0xde, 0x06, 0x0d, 0x1c, 0x86, 0x19, 0xe1, 0x5c, 0xcf, - 0x60, 0x0e, 0x0b, 0xd8, 0x2c, 0xf3, 0x74, 0x00, 0x79, 0x15, 0xc4, 0x6c, 0x82, 0x29, 0x1a, 0xaa, - 0x76, 0xea, 0xde, 0x14, 0x0d, 0xcd, 0x8f, 0x60, 0x5e, 0x2e, 0xb9, 0x97, 0x2a, 0x45, 0xac, 0xe9, - 0x96, 0xd1, 0x9e, 0xbf, 0x7b, 0xdf, 0x39, 0xff, 0x15, 0x38, 0x23, 0x3d, 0xbb, 0x37, 0xe4, 0x7c, - 0xc3, 0x02, 0x5e, 0xd7, 0x9a, 0x4c, 0x5e, 0x98, 0xae, 0x81, 0x3c, 0x90, 0x8e, 0x56, 0xf0, 0x0a, - 0x2c, 0xf6, 0x73, 0x91, 0x67, 0xa4, 0x84, 0x44, 0x6c, 0x9b, 0x64, 0x03, 0x96, 0x59, 0x75, 0x35, - 0x0a, 0x1c, 0x16, 0x70, 0xa5, 0x24, 0x3b, 0x0d, 0x85, 0x3c, 0xb3, 0x74, 0xcb, 0x1e, 0x9e, 0x69, - 0xa7, 0xf9, 0x06, 0x5c, 0x14, 0x4c, 0xe0, 0xb8, 0xc7, 0xb7, 0x70, 0x46, 0xb8, 0x35, 0xa3, 0x66, - 0x5a, 0x72, 0xf4, 0x81, 0xca, 0xdb, 0x38, 0x6e, 0xfe, 0x09, 0xa3, 0x83, 0xee, 0x8a, 0x6e, 0xfb, - 0x4a, 0x59, 0x69, 0x3c, 0x19, 0x79, 0xf3, 0xca, 0x7c, 0xad, 0x2c, 0x33, 0x03, 0x4d, 0xd5, 0x40, - 0x4c, 0xdf, 0xe7, 0x34, 0xa4, 0x62, 0xd7, 0x9a, 0x6d, 0x4d, 0x9f, 0x4d, 0x7e, 0x47, 0x92, 0x7f, - 0xfb, 0x0d, 0xdb, 0xe7, 0xd8, 0xb9, 0x4c, 0xe0, 0xde, 0x82, 0x2c, 0xf1, 0xa2, 0xaa, 0x60, 0xbe, - 0x04, 0x4d, 0x1e, 0xe0, 0x98, 0x0e, 0xa2, 0x5e, 0x1f, 0x07, 0x82, 0x65, 0x56, 0xa3, 0x35, 0xdd, - 0xae, 0x77, 0xdb, 0xba, 0xeb, 0xd6, 0x3f, 0x62, 0x4f, 0xc2, 0x91, 0xb7, 0xa0, 0x1d, 0xeb, 0xca, - 0x36, 0x37, 0xc1, 0xb5, 0x49, 0xc4, 0x48, 0xf5, 0x39, 0xa5, 0x3a, 0x1a, 0x16, 0xd0, 0xd6, 0xac, - 0xa7, 0x03, 0x91, 0x77, 0x75, 0x82, 0xb3, 0xd2, 0x7e, 0xed, 0xf2, 0xa7, 0x3d, 0x58, 0xfb, 0xb2, - 0x07, 0x6b, 0x3f, 0xbe, 0x77, 0x66, 0xe4, 0x56, 0x9e, 0x77, 0x37, 0xf7, 0x0f, 0x6d, 0xe3, 0xe0, - 0xd0, 0x36, 0xfe, 0x1c, 0xda, 0xc6, 0xe7, 0x23, 0xbb, 0x76, 0x70, 0x64, 0xd7, 0x7e, 0x1e, 0xd9, - 0xb5, 0xcd, 0x47, 0x63, 0x92, 0xe8, 0x83, 0xeb, 0xc4, 0xd8, 0xe7, 0x95, 0xe1, 0x6e, 0x3f, 0x70, - 0x77, 0xce, 0xfa, 0x86, 0xf9, 0xb3, 0xea, 0x6f, 0x7d, 0xef, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x44, 0x51, 0xea, 0xde, 0xf1, 0x04, 0x00, 0x00, + // 634 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0x8e, 0xdb, 0xb4, 0xe9, 0xbf, 0xfd, 0x1b, 0x84, 0x29, 0xc2, 0x6d, 0x85, 0x37, 0x5a, 0x09, + 0x14, 0x21, 0x62, 0xb7, 0x20, 0x21, 0xd1, 0x5b, 0x03, 0x2a, 0x42, 0x42, 0xa2, 0x98, 0x13, 0x05, + 0x29, 0x5a, 0xdb, 0x1b, 0x77, 0x85, 0x9d, 0x35, 0xde, 0x75, 0x69, 0x2f, 0x9c, 0x39, 0x72, 0xe4, + 0xd8, 0x13, 0x07, 0xce, 0x3c, 0x44, 0xc5, 0xa9, 0x47, 0xc4, 0xc1, 0xa0, 0xf6, 0x0d, 0xf2, 0x04, + 0x68, 0xd7, 0xeb, 0x26, 0x29, 0x55, 0x55, 0x89, 0x53, 0x76, 0x66, 0xbe, 0xf9, 0x66, 0xe6, 0x9b, + 0x89, 0xc1, 0x43, 0xc6, 0x13, 0xc6, 0x29, 0x77, 0x23, 0x9c, 0x24, 0x6e, 0xca, 0x58, 0xdc, 0x49, + 0x58, 0x48, 0x62, 0xee, 0x72, 0x81, 0xfd, 0x98, 0xf0, 0xf7, 0x38, 0x1d, 0x7b, 0xf6, 0x24, 0xc2, + 0x49, 0x33, 0x26, 0x98, 0x79, 0x47, 0xa7, 0x3a, 0x32, 0xd5, 0x91, 0x81, 0x32, 0xd3, 0x19, 0xc1, + 0x9d, 0xdd, 0x35, 0x9f, 0x08, 0xbc, 0xb6, 0xbc, 0x14, 0x28, 0x70, 0x4f, 0x65, 0xba, 0xa5, 0x51, + 0xd2, 0x2c, 0x2f, 0x46, 0x2c, 0x62, 0xa5, 0x5f, 0xbe, 0xb4, 0xd7, 0x8e, 0x18, 0x8b, 0x62, 0xe2, + 0x2a, 0xcb, 0xcf, 0xfb, 0x6e, 0x98, 0x67, 0x58, 0x50, 0x36, 0xd0, 0x71, 0x78, 0x36, 0x2e, 0x68, + 0x42, 0xb8, 0xc0, 0x49, 0x5a, 0x11, 0x94, 0x45, 0x5c, 0x9c, 0x8b, 0x1d, 0x57, 0xb7, 0xa1, 0x8c, + 0x33, 0x71, 0x1f, 0x73, 0x72, 0x1a, 0x0f, 0x18, 0xd5, 0x05, 0xd0, 0xa1, 0x01, 0xc0, 0x16, 0x63, + 0xf1, 0x16, 0xce, 0x70, 0xc2, 0xcd, 0x37, 0x60, 0x4e, 0xcd, 0xdf, 0x27, 0xc4, 0x32, 0x5a, 0x46, + 0xfb, 0xbf, 0xee, 0xc6, 0x61, 0x01, 0x6b, 0x3f, 0x0b, 0x78, 0x3b, 0xa2, 0x62, 0x27, 0xf7, 0x9d, + 0x80, 0x25, 0x7a, 0x30, 0xfd, 0xd3, 0xe1, 0xe1, 0x5b, 0x57, 0xec, 0xa7, 0x84, 0x3b, 0x8f, 0x49, + 0x30, 0x2c, 0xe0, 0x95, 0x7d, 0x9c, 0xc4, 0xeb, 0xa8, 0xe2, 0x41, 0x5e, 0x43, 0x3e, 0x37, 0x09, + 0x91, 0xec, 0x64, 0x8f, 0x0a, 0xc5, 0x3e, 0xf5, 0x6f, 0xec, 0x15, 0x0f, 0xf2, 0x1a, 0xf2, 0xb9, + 0x49, 0x08, 0xfa, 0x32, 0x03, 0xea, 0x72, 0x14, 0xf3, 0x2e, 0x68, 0xe0, 0x30, 0xcc, 0x08, 0xe7, + 0x7a, 0x06, 0x73, 0x58, 0xc0, 0x66, 0x99, 0xa7, 0x03, 0xc8, 0xab, 0x20, 0x66, 0x13, 0x4c, 0xd1, + 0x50, 0xb5, 0x53, 0xf7, 0xa6, 0x68, 0x68, 0x7e, 0x00, 0xf3, 0x72, 0xc9, 0xbd, 0x54, 0x29, 0x62, + 0x4d, 0xb7, 0x8c, 0xf6, 0xfc, 0xbd, 0x07, 0xce, 0xe5, 0xaf, 0xc0, 0x19, 0xe9, 0xd9, 0xbd, 0x25, + 0xe7, 0x1b, 0x16, 0xf0, 0xa6, 0xd6, 0x64, 0xf2, 0xc2, 0x74, 0x0d, 0xe4, 0x81, 0x74, 0xb4, 0x82, + 0x17, 0x60, 0xb1, 0x9f, 0x8b, 0x3c, 0x23, 0x25, 0x24, 0x62, 0xbb, 0x24, 0x1b, 0xb0, 0xcc, 0xaa, + 0xab, 0x51, 0xe0, 0xb0, 0x80, 0x2b, 0x25, 0xd9, 0x79, 0x28, 0xe4, 0x99, 0xa5, 0x5b, 0xf6, 0xf0, + 0x44, 0x3b, 0xcd, 0x57, 0xe0, 0x7f, 0xc1, 0x04, 0x8e, 0x7b, 0x7c, 0x07, 0x67, 0x84, 0x5b, 0x33, + 0x6a, 0xa6, 0x25, 0x47, 0x1f, 0xa8, 0xbc, 0x8d, 0xd3, 0xe6, 0x1f, 0x31, 0x3a, 0xe8, 0xae, 0xe8, + 0xb6, 0xaf, 0x95, 0x95, 0xc6, 0x93, 0x91, 0x37, 0xaf, 0xcc, 0x97, 0xca, 0x32, 0x33, 0xd0, 0x54, + 0x0d, 0xc4, 0xf4, 0x5d, 0x4e, 0x43, 0x2a, 0xf6, 0xad, 0xd9, 0xd6, 0xf4, 0xc5, 0xe4, 0xab, 0x92, + 0xfc, 0xeb, 0x2f, 0xd8, 0xbe, 0xc4, 0xce, 0x65, 0x02, 0xf7, 0x16, 0x64, 0x89, 0x67, 0x55, 0x05, + 0xf3, 0x39, 0x68, 0xf2, 0x00, 0xc7, 0x74, 0x10, 0xf5, 0xfa, 0x38, 0x10, 0x2c, 0xb3, 0x1a, 0xad, + 0xe9, 0x76, 0xbd, 0xdb, 0xd6, 0x5d, 0xb7, 0xfe, 0x12, 0x7b, 0x12, 0x8e, 0xbc, 0x05, 0xed, 0xd8, + 0x54, 0xb6, 0xb9, 0x0d, 0x6e, 0x4c, 0x22, 0x46, 0xaa, 0xcf, 0x29, 0xd5, 0xd1, 0xb0, 0x80, 0xb6, + 0x66, 0x3d, 0x1f, 0x88, 0xbc, 0xeb, 0x13, 0x9c, 0x95, 0xf6, 0xeb, 0x57, 0x3f, 0x1e, 0xc0, 0xda, + 0xe7, 0x03, 0x58, 0xfb, 0xfe, 0xad, 0x33, 0x23, 0xb7, 0xf2, 0xb4, 0xfb, 0xfa, 0xf0, 0xd8, 0x36, + 0x8e, 0x8e, 0x6d, 0xe3, 0xf7, 0xb1, 0x6d, 0x7c, 0x3a, 0xb1, 0x6b, 0x47, 0x27, 0x76, 0xed, 0xc7, + 0x89, 0x5d, 0xdb, 0xde, 0x18, 0x93, 0x44, 0x1f, 0x5c, 0x27, 0xc6, 0x3e, 0xaf, 0x0c, 0x77, 0x77, + 0x6d, 0xd5, 0xdd, 0xbb, 0xe8, 0x23, 0xe6, 0xcf, 0xaa, 0xff, 0xf5, 0xfd, 0x3f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xfa, 0x42, 0xbe, 0x54, 0xf2, 0x04, 0x00, 0x00, } func (m *PoolParams) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/pool-models/stableswap/tx.pb.go b/x/gamm/pool-models/stableswap/tx.pb.go index 40a2b7f36f3..f666bb53c64 100644 --- a/x/gamm/pool-models/stableswap/tx.pb.go +++ b/x/gamm/pool-models/stableswap/tx.pb.go @@ -256,44 +256,44 @@ func init() { } var fileDescriptor_46b7c8a0f24de97c = []byte{ - // 583 bytes of a gzipped FileDescriptorProto + // 584 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4d, 0x6f, 0xd3, 0x3e, - 0x1c, 0xc7, 0x9b, 0xb6, 0xea, 0x5f, 0x7f, 0x57, 0x80, 0x88, 0xaa, 0x51, 0x8a, 0x94, 0x94, 0x70, - 0xe9, 0x80, 0xc6, 0xac, 0x48, 0x20, 0x38, 0x41, 0x8a, 0x86, 0x26, 0xa8, 0xb4, 0xa5, 0xe2, 0xb2, - 0x4b, 0xe5, 0x34, 0x5e, 0x30, 0x24, 0x71, 0x88, 0xdd, 0x6e, 0x3d, 0x72, 0xe7, 0xc0, 0xcb, 0x40, - 0xbc, 0x90, 0x69, 0xc7, 0x1d, 0x39, 0x05, 0xd4, 0xbe, 0x83, 0xde, 0xb8, 0x21, 0xc7, 0xe9, 0xc3, - 0xa4, 0x75, 0x5b, 0xa5, 0x9d, 0xe2, 0xfc, 0xf2, 0xf1, 0xf7, 0xfb, 0x7b, 0x70, 0x0c, 0x1e, 0x53, - 0x16, 0x50, 0x46, 0x18, 0xf4, 0x50, 0x10, 0xc0, 0x88, 0x52, 0xbf, 0x19, 0x50, 0x17, 0xfb, 0x0c, - 0x32, 0x8e, 0x1c, 0x1f, 0xb3, 0x43, 0x14, 0x41, 0x7e, 0x64, 0x46, 0x31, 0xe5, 0x54, 0x7d, 0x98, - 0xd1, 0xa6, 0xa0, 0x4d, 0x41, 0x4b, 0xd8, 0x5c, 0xc0, 0xe6, 0x70, 0xcb, 0xc1, 0x1c, 0x6d, 0xd5, - 0xb4, 0x7e, 0x0a, 0x43, 0x07, 0x31, 0x0c, 0xb3, 0x20, 0xec, 0x53, 0x12, 0x4a, 0xad, 0x5a, 0xc5, - 0xa3, 0x1e, 0x4d, 0x97, 0x50, 0xac, 0xb2, 0xe8, 0x8b, 0xab, 0xe4, 0xb3, 0x58, 0xf6, 0x04, 0x21, - 0xb7, 0x1a, 0xdf, 0x0a, 0xe0, 0x4e, 0x87, 0x79, 0xed, 0x18, 0x23, 0x8e, 0xbb, 0x73, 0x64, 0x97, - 0x52, 0x5f, 0xdd, 0x04, 0x25, 0x86, 0x43, 0x17, 0xc7, 0x55, 0xa5, 0xae, 0x34, 0xfe, 0xb7, 0x6e, - 0x4f, 0x13, 0xfd, 0xc6, 0x08, 0x05, 0xfe, 0x4b, 0x43, 0xc6, 0x0d, 0x3b, 0x03, 0x54, 0x0a, 0xca, - 0x42, 0xb4, 0x17, 0xa1, 0x18, 0x05, 0xac, 0x9a, 0xaf, 0x2b, 0x8d, 0x72, 0xeb, 0x99, 0x79, 0xf5, - 0xca, 0x4d, 0xe1, 0xb8, 0x9b, 0xee, 0xb6, 0x36, 0xa6, 0x89, 0xae, 0x4a, 0x9f, 0x25, 0x51, 0xc3, - 0x06, 0xd1, 0x9c, 0x51, 0xbf, 0x2a, 0x60, 0x83, 0x84, 0x84, 0x13, 0xe4, 0xa7, 0xe5, 0xf4, 0x7c, - 0xf2, 0x65, 0x40, 0x5c, 0xc2, 0x47, 0xd5, 0x42, 0xbd, 0xd0, 0x28, 0xb7, 0xee, 0x9a, 0xb2, 0x95, - 0xa6, 0x68, 0xe5, 0xdc, 0xa5, 0x4d, 0x49, 0x68, 0x3d, 0x39, 0x49, 0xf4, 0xdc, 0xcf, 0xdf, 0x7a, - 0xc3, 0x23, 0xfc, 0xe3, 0xc0, 0x31, 0xfb, 0x34, 0x80, 0x59, 0xdf, 0xe5, 0xa3, 0xc9, 0xdc, 0xcf, - 0x90, 0x8f, 0x22, 0xcc, 0xd2, 0x0d, 0xcc, 0xae, 0x64, 0x56, 0x22, 0xc9, 0xf7, 0x33, 0x23, 0x75, - 0x0f, 0x54, 0x0e, 0x06, 0x7c, 0x10, 0x63, 0x99, 0x81, 0x47, 0x87, 0x38, 0x0e, 0x69, 0x5c, 0x2d, - 0xa6, 0xdd, 0xd2, 0xa7, 0x89, 0x7e, 0x4f, 0x56, 0x71, 0x1e, 0x65, 0xd8, 0xaa, 0x0c, 0x0b, 0xcd, - 0xb7, 0xb3, 0xe0, 0x36, 0xd0, 0x57, 0x4c, 0xc3, 0xc6, 0x2c, 0xa2, 0x21, 0xc3, 0xea, 0x03, 0xf0, - 0x5f, 0x2a, 0x44, 0xdc, 0x74, 0x2c, 0x45, 0x0b, 0x8c, 0x13, 0xbd, 0x24, 0x90, 0x9d, 0x37, 0x76, - 0x49, 0x7c, 0xda, 0x71, 0x8d, 0x63, 0x05, 0xdc, 0xef, 0x30, 0x4f, 0x4a, 0x74, 0x0f, 0x51, 0xf4, - 0xda, 0xfd, 0x34, 0x60, 0xbc, 0xdb, 0x47, 0x3e, 0x09, 0xbd, 0x6d, 0xd4, 0xe7, 0x34, 0x66, 0xeb, - 0x0c, 0x78, 0xc9, 0x35, 0xbf, 0xca, 0x55, 0xdd, 0x03, 0xb7, 0x98, 0x74, 0xe8, 0x1d, 0x48, 0x8b, - 0x74, 0x18, 0x45, 0xab, 0x21, 0x3a, 0x3e, 0x4d, 0xf4, 0x7a, 0x26, 0xbe, 0x38, 0x8a, 0x67, 0x79, - 0xc3, 0xbe, 0xc9, 0xce, 0xa4, 0x68, 0x3c, 0x02, 0x9b, 0x97, 0xd6, 0x31, 0x6b, 0x4d, 0xeb, 0x6f, - 0x1e, 0x14, 0x3a, 0xcc, 0x53, 0x7f, 0x28, 0xa0, 0x72, 0xee, 0x89, 0x6e, 0xaf, 0x73, 0x22, 0x57, - 0x0c, 0xa2, 0xf6, 0xee, 0x1a, 0x44, 0xe6, 0xd3, 0x3c, 0x56, 0x80, 0x76, 0xc9, 0x94, 0x3a, 0x6b, - 0xfa, 0x5d, 0x2c, 0x57, 0xfb, 0x70, 0xad, 0x72, 0xb3, 0x42, 0xac, 0xfd, 0x93, 0xb1, 0xa6, 0x9c, - 0x8e, 0x35, 0xe5, 0xcf, 0x58, 0x53, 0xbe, 0x4f, 0xb4, 0xdc, 0xe9, 0x44, 0xcb, 0xfd, 0x9a, 0x68, - 0xb9, 0xfd, 0x57, 0x4b, 0xbf, 0x59, 0x66, 0xdd, 0xf4, 0x91, 0xc3, 0x66, 0x2f, 0x70, 0xf8, 0x1c, - 0x1e, 0x5d, 0x74, 0x75, 0x39, 0xa5, 0xf4, 0xae, 0x7a, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x28, - 0x03, 0x33, 0x73, 0x78, 0x05, 0x00, 0x00, + 0x1c, 0xc7, 0x9b, 0xb5, 0xea, 0x5f, 0x7f, 0x57, 0x80, 0x88, 0xaa, 0x51, 0x8a, 0x94, 0x94, 0x70, + 0xe9, 0x80, 0xc6, 0x6b, 0x91, 0x90, 0xe0, 0xb6, 0x14, 0x0d, 0x4d, 0x50, 0x69, 0x4b, 0xc5, 0x05, + 0x0e, 0x95, 0xd3, 0x78, 0xc1, 0x90, 0xc4, 0x21, 0x76, 0xbb, 0xf5, 0xc8, 0x9d, 0x03, 0x2f, 0x03, + 0xf1, 0x42, 0xa6, 0x1d, 0x77, 0xe4, 0x14, 0x50, 0xfb, 0x0e, 0x7a, 0xe3, 0x86, 0x1c, 0xa7, 0x0f, + 0x93, 0xd6, 0x6d, 0x95, 0x76, 0x8a, 0xf3, 0xcb, 0xc7, 0xdf, 0xef, 0xef, 0xc1, 0x31, 0x78, 0x4a, + 0x59, 0x40, 0x19, 0x61, 0xd0, 0x43, 0x41, 0x00, 0x23, 0x4a, 0xfd, 0x46, 0x40, 0x5d, 0xec, 0x33, + 0xc8, 0x38, 0x72, 0x7c, 0xcc, 0x8e, 0x50, 0x04, 0xf9, 0xb1, 0x19, 0xc5, 0x94, 0x53, 0xf5, 0x71, + 0x46, 0x9b, 0x82, 0x36, 0x05, 0x2d, 0x61, 0x73, 0x01, 0x9b, 0xc3, 0xa6, 0x83, 0x39, 0x6a, 0x56, + 0xb5, 0x7e, 0x0a, 0x43, 0x07, 0x31, 0x0c, 0xb3, 0x20, 0xec, 0x53, 0x12, 0x4a, 0xad, 0x6a, 0xd9, + 0xa3, 0x1e, 0x4d, 0x97, 0x50, 0xac, 0xb2, 0xe8, 0x8b, 0xeb, 0xe4, 0xb3, 0x58, 0xf6, 0x04, 0x21, + 0xb7, 0x1a, 0xdf, 0xf2, 0xe0, 0x5e, 0x87, 0x79, 0xed, 0x18, 0x23, 0x8e, 0xbb, 0x73, 0x64, 0x9f, + 0x52, 0x5f, 0xdd, 0x02, 0x45, 0x86, 0x43, 0x17, 0xc7, 0x15, 0xa5, 0xa6, 0xd4, 0xff, 0xb7, 0xee, + 0x4e, 0x13, 0xfd, 0xd6, 0x08, 0x05, 0xfe, 0x4b, 0x43, 0xc6, 0x0d, 0x3b, 0x03, 0x54, 0x0a, 0x4a, + 0x42, 0xb4, 0x17, 0xa1, 0x18, 0x05, 0xac, 0xb2, 0x51, 0x53, 0xea, 0xa5, 0xd6, 0x73, 0xf3, 0xfa, + 0x95, 0x9b, 0xc2, 0x71, 0x3f, 0xdd, 0x6d, 0x6d, 0x4e, 0x13, 0x5d, 0x95, 0x3e, 0x4b, 0xa2, 0x86, + 0x0d, 0xa2, 0x39, 0xa3, 0x7e, 0x55, 0xc0, 0x26, 0x09, 0x09, 0x27, 0xc8, 0x4f, 0xcb, 0xe9, 0xf9, + 0xe4, 0xcb, 0x80, 0xb8, 0x84, 0x8f, 0x2a, 0xf9, 0x5a, 0xbe, 0x5e, 0x6a, 0xdd, 0x37, 0x65, 0x2b, + 0x4d, 0xd1, 0xca, 0xb9, 0x4b, 0x9b, 0x92, 0xd0, 0xda, 0x3e, 0x4d, 0xf4, 0xdc, 0xcf, 0xdf, 0x7a, + 0xdd, 0x23, 0xfc, 0xe3, 0xc0, 0x31, 0xfb, 0x34, 0x80, 0x59, 0xdf, 0xe5, 0xa3, 0xc1, 0xdc, 0xcf, + 0x90, 0x8f, 0x22, 0xcc, 0xd2, 0x0d, 0xcc, 0x2e, 0x67, 0x56, 0x22, 0xc9, 0xb7, 0x33, 0x23, 0xf5, + 0x00, 0x94, 0x0f, 0x07, 0x7c, 0x10, 0x63, 0x99, 0x81, 0x47, 0x87, 0x38, 0x0e, 0x69, 0x5c, 0x29, + 0xa4, 0xdd, 0xd2, 0xa7, 0x89, 0xfe, 0x40, 0x56, 0x71, 0x11, 0x65, 0xd8, 0xaa, 0x0c, 0x0b, 0xcd, + 0xd7, 0xb3, 0xe0, 0x2e, 0xd0, 0x57, 0x4c, 0xc3, 0xc6, 0x2c, 0xa2, 0x21, 0xc3, 0xea, 0x23, 0xf0, + 0x5f, 0x2a, 0x44, 0xdc, 0x74, 0x2c, 0x05, 0x0b, 0x8c, 0x13, 0xbd, 0x28, 0x90, 0xbd, 0x57, 0x76, + 0x51, 0x7c, 0xda, 0x73, 0x8d, 0x13, 0x05, 0x3c, 0xec, 0x30, 0x4f, 0x4a, 0x74, 0x8f, 0x50, 0xb4, + 0xe3, 0x7e, 0x1a, 0x30, 0xde, 0xed, 0x23, 0x9f, 0x84, 0xde, 0x2e, 0xea, 0x73, 0x1a, 0xb3, 0x75, + 0x06, 0xbc, 0xe4, 0xba, 0xb1, 0xca, 0x55, 0x3d, 0x00, 0x77, 0x98, 0x74, 0xe8, 0x1d, 0x4a, 0x8b, + 0x74, 0x18, 0x05, 0xab, 0x2e, 0x3a, 0x3e, 0x4d, 0xf4, 0x5a, 0x26, 0xbe, 0x38, 0x8a, 0xe7, 0x79, + 0xc3, 0xbe, 0xcd, 0xce, 0xa5, 0x68, 0x3c, 0x01, 0x5b, 0x57, 0xd6, 0x31, 0x6b, 0x4d, 0xeb, 0xef, + 0x06, 0xc8, 0x77, 0x98, 0xa7, 0xfe, 0x50, 0x40, 0xf9, 0xc2, 0x13, 0xdd, 0x5e, 0xe7, 0x44, 0xae, + 0x18, 0x44, 0xf5, 0xcd, 0x0d, 0x88, 0xcc, 0xa7, 0x79, 0xa2, 0x00, 0xed, 0x8a, 0x29, 0x75, 0xd6, + 0xf4, 0xbb, 0x5c, 0xae, 0xfa, 0xee, 0x46, 0xe5, 0x66, 0x85, 0x58, 0x1f, 0x4e, 0xc7, 0x9a, 0x72, + 0x36, 0xd6, 0x94, 0x3f, 0x63, 0x4d, 0xf9, 0x3e, 0xd1, 0x72, 0x67, 0x13, 0x2d, 0xf7, 0x6b, 0xa2, + 0xe5, 0xde, 0xef, 0x2c, 0xfd, 0x66, 0x99, 0x75, 0xc3, 0x47, 0x0e, 0x9b, 0xbd, 0xc0, 0x61, 0x73, + 0x1b, 0x1e, 0x5f, 0x76, 0x77, 0x39, 0xc5, 0xf4, 0xb2, 0x7a, 0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, + 0xdb, 0xb6, 0x17, 0x10, 0x79, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/pool-models/stableswap/util_test.go b/x/gamm/pool-models/stableswap/util_test.go index d1dbaa82702..eba4517ad31 100644 --- a/x/gamm/pool-models/stableswap/util_test.go +++ b/x/gamm/pool-models/stableswap/util_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func createTestPool(t *testing.T, poolLiquidity sdk.Coins, swapFee, exitFee sdk.Dec) types.PoolI { diff --git a/x/gamm/simulation/sim_msgs.go b/x/gamm/simulation/sim_msgs.go index 29841a1c087..bb6fe0dc672 100644 --- a/x/gamm/simulation/sim_msgs.go +++ b/x/gamm/simulation/sim_msgs.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/cosmos-sdk/server/rosetta/lib/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func CurrySimMsgJoinPool(k keeper.Keeper) func(sim *simulation.SimCtx, ctx sdk.Context) (*gammtypes.MsgJoinPool, error) { diff --git a/x/gamm/twap/hook_listener.go b/x/gamm/twap/hook_listener.go index 4b84676b3d4..2a5163577d4 100644 --- a/x/gamm/twap/hook_listener.go +++ b/x/gamm/twap/hook_listener.go @@ -3,7 +3,7 @@ package twap import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var _ types.GammHooks = &gammhook{} diff --git a/x/gamm/twap/module.go b/x/gamm/twap/module.go index 9dae3925b85..e15b401601f 100644 --- a/x/gamm/twap/module.go +++ b/x/gamm/twap/module.go @@ -16,9 +16,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" - twaptypes "github.com/osmosis-labs/osmosis/v7/x/gamm/twap/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + twaptypes "github.com/osmosis-labs/osmosis/v10/x/gamm/twap/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/types/genesis.pb.go b/x/gamm/types/genesis.pb.go index be2e2adf324..29f5c0a0f7a 100644 --- a/x/gamm/types/genesis.pb.go +++ b/x/gamm/types/genesis.pb.go @@ -143,32 +143,33 @@ func init() { } var fileDescriptor_5a324eb7f1dd793e = []byte{ - // 400 bytes of a gzipped FileDescriptorProto + // 401 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xcf, 0xaa, 0xd3, 0x40, 0x18, 0xc5, 0x33, 0xde, 0x7b, 0x0b, 0xe6, 0x8a, 0x7f, 0x42, 0x17, 0xb9, 0x17, 0x49, 0x4b, 0x56, - 0xd9, 0x74, 0x86, 0x5b, 0x11, 0xa1, 0x3b, 0x53, 0x50, 0x0a, 0x22, 0x25, 0xee, 0xdc, 0x84, 0x49, - 0x9c, 0xc6, 0x60, 0x32, 0x5f, 0xc8, 0x4c, 0x4b, 0xf3, 0x16, 0x82, 0x7b, 0x1f, 0x40, 0xb7, 0x3e, - 0x44, 0x71, 0xd5, 0xa5, 0xab, 0x2a, 0xed, 0x1b, 0xf8, 0x04, 0x32, 0x7f, 0x22, 0x82, 0x77, 0x95, - 0x7c, 0xf3, 0xfd, 0xce, 0xe1, 0xcc, 0x49, 0xdc, 0x10, 0x44, 0x0d, 0xa2, 0x14, 0xa4, 0xa0, 0x75, - 0x4d, 0x36, 0x37, 0x19, 0x93, 0xf4, 0x86, 0x14, 0x8c, 0x33, 0x51, 0x0a, 0xdc, 0xb4, 0x20, 0xc1, - 0x1b, 0x5a, 0x06, 0x2b, 0x06, 0x5b, 0xe6, 0x7a, 0x58, 0x40, 0x01, 0x1a, 0x20, 0xea, 0xcd, 0xb0, - 0xd7, 0x57, 0x05, 0x40, 0x51, 0x31, 0xa2, 0xa7, 0x6c, 0xbd, 0x22, 0x94, 0x77, 0xfd, 0x2a, 0xd7, - 0x3e, 0xa9, 0xd1, 0x98, 0xc1, 0xae, 0x02, 0x33, 0x91, 0x8c, 0x0a, 0xf6, 0x37, 0x44, 0x0e, 0x25, - 0x37, 0xfb, 0xf0, 0x33, 0x72, 0x07, 0x4b, 0xda, 0xd2, 0x5a, 0x78, 0x9f, 0x90, 0xfb, 0xa8, 0x01, - 0xa8, 0xd2, 0xbc, 0x65, 0x54, 0x96, 0xc0, 0xd3, 0x15, 0x63, 0x3e, 0x1a, 0x9f, 0x45, 0x97, 0xd3, - 0x2b, 0x6c, 0x5d, 0x95, 0x4f, 0x1f, 0x14, 0xcf, 0xa1, 0xe4, 0xf1, 0xab, 0xdd, 0x61, 0xe4, 0xfc, - 0x3e, 0x8c, 0xfc, 0x8e, 0xd6, 0xd5, 0x2c, 0xfc, 0xcf, 0x21, 0xfc, 0xf2, 0x73, 0x14, 0x15, 0xa5, - 0x7c, 0xbf, 0xce, 0x70, 0x0e, 0xb5, 0x8d, 0x67, 0x1f, 0x13, 0xf1, 0xee, 0x03, 0x91, 0x5d, 0xc3, - 0x84, 0x36, 0x13, 0xc9, 0x03, 0xa5, 0x9f, 0x5b, 0xf9, 0x0b, 0xc6, 0xc2, 0xaf, 0xc8, 0xbd, 0xf7, - 0xd2, 0x94, 0xf6, 0x46, 0x52, 0xc9, 0xbc, 0xa7, 0xee, 0x85, 0x62, 0x84, 0x4d, 0x36, 0xc4, 0xa6, - 0x17, 0xdc, 0xf7, 0x82, 0x9f, 0xf3, 0x2e, 0xbe, 0xfb, 0xfd, 0xdb, 0xe4, 0x62, 0x09, 0x50, 0x2d, - 0x12, 0x43, 0x7b, 0x91, 0xfb, 0x90, 0xb3, 0xad, 0x4c, 0x75, 0x3e, 0xbe, 0xae, 0x33, 0xd6, 0xfa, - 0x77, 0xc6, 0x28, 0x3a, 0x4f, 0xee, 0xab, 0x73, 0xc5, 0xbe, 0xd6, 0xa7, 0xde, 0xcc, 0x1d, 0x34, - 0xba, 0x11, 0xff, 0x6c, 0x8c, 0xa2, 0xcb, 0xe9, 0x63, 0x7c, 0xdb, 0x57, 0xc2, 0xa6, 0xb5, 0xf8, - 0x5c, 0x5d, 0x3f, 0xb1, 0x8a, 0x78, 0xb1, 0x3b, 0x06, 0x68, 0x7f, 0x0c, 0xd0, 0xaf, 0x63, 0x80, - 0x3e, 0x9e, 0x02, 0x67, 0x7f, 0x0a, 0x9c, 0x1f, 0xa7, 0xc0, 0x79, 0x4b, 0xfe, 0xa9, 0xc0, 0xfa, - 0x4d, 0x2a, 0x9a, 0x89, 0x7e, 0x20, 0x9b, 0x67, 0x64, 0x6b, 0xfe, 0x15, 0xdd, 0x47, 0x36, 0xd0, - 0x17, 0x7a, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0xda, 0xf2, 0x18, 0x37, 0x48, 0x02, 0x00, 0x00, + 0xd9, 0x74, 0xe6, 0xb6, 0xe2, 0xa6, 0x3b, 0x53, 0x50, 0x14, 0x91, 0x12, 0x77, 0x6e, 0xc2, 0x24, + 0x4e, 0x63, 0x30, 0x99, 0x2f, 0x64, 0xa6, 0xa5, 0x79, 0x0b, 0xc1, 0xbd, 0x0f, 0xa0, 0x5b, 0x1f, + 0xa2, 0xb8, 0xea, 0xd2, 0x55, 0x95, 0xf6, 0x0d, 0x7c, 0x02, 0x99, 0x3f, 0x11, 0x41, 0x57, 0xc9, + 0x37, 0xdf, 0xef, 0x1c, 0xce, 0x9c, 0xc4, 0x0d, 0x41, 0xd4, 0x20, 0x4a, 0x41, 0x0a, 0x5a, 0xd7, + 0x64, 0x33, 0xcd, 0x98, 0xa4, 0x53, 0x52, 0x30, 0xce, 0x44, 0x29, 0x70, 0xd3, 0x82, 0x04, 0x6f, + 0x68, 0x19, 0xac, 0x18, 0x6c, 0x99, 0xeb, 0x61, 0x01, 0x05, 0x68, 0x80, 0xa8, 0x37, 0xc3, 0x5e, + 0x5f, 0x15, 0x00, 0x45, 0xc5, 0x88, 0x9e, 0xb2, 0xf5, 0x8a, 0x50, 0xde, 0xf5, 0xab, 0x5c, 0xfb, + 0xa4, 0x46, 0x63, 0x06, 0xbb, 0x0a, 0xcc, 0x44, 0x32, 0x2a, 0xd8, 0x9f, 0x10, 0x39, 0x94, 0xdc, + 0xec, 0xc3, 0x4f, 0xc8, 0x1d, 0x2c, 0x69, 0x4b, 0x6b, 0xe1, 0x7d, 0x44, 0xee, 0x83, 0x06, 0xa0, + 0x4a, 0xf3, 0x96, 0x51, 0x59, 0x02, 0x4f, 0x57, 0x8c, 0xf9, 0x68, 0x7c, 0x16, 0x5d, 0xce, 0xae, + 0xb0, 0x75, 0x55, 0x3e, 0x7d, 0x50, 0xbc, 0x80, 0x92, 0xc7, 0x2f, 0x77, 0x87, 0x91, 0xf3, 0xeb, + 0x30, 0xf2, 0x3b, 0x5a, 0x57, 0xf3, 0xf0, 0x1f, 0x87, 0xf0, 0xf3, 0x8f, 0x51, 0x54, 0x94, 0xf2, + 0xdd, 0x3a, 0xc3, 0x39, 0xd4, 0x36, 0x9e, 0x7d, 0x4c, 0xc4, 0xdb, 0xf7, 0x44, 0x76, 0x0d, 0x13, + 0xda, 0x4c, 0x24, 0xf7, 0x94, 0x7e, 0x61, 0xe5, 0x4f, 0x19, 0x0b, 0xbf, 0x20, 0xf7, 0xce, 0x33, + 0x53, 0xda, 0x6b, 0x49, 0x25, 0xf3, 0x1e, 0xbb, 0x17, 0x8a, 0x11, 0x36, 0xd9, 0x10, 0x9b, 0x5e, + 0x70, 0xdf, 0x0b, 0x7e, 0xc2, 0xbb, 0xf8, 0xf6, 0xb7, 0xaf, 0x93, 0x8b, 0x25, 0x40, 0xf5, 0x3c, + 0x31, 0xb4, 0x17, 0xb9, 0xf7, 0x39, 0xdb, 0xca, 0x54, 0xe7, 0xe3, 0xeb, 0x3a, 0x63, 0xad, 0x7f, + 0x6b, 0x8c, 0xa2, 0xf3, 0xe4, 0xae, 0x3a, 0x57, 0xec, 0x2b, 0x7d, 0xea, 0xcd, 0xdd, 0x41, 0xa3, + 0x1b, 0xf1, 0xcf, 0xc6, 0x28, 0xba, 0x9c, 0x3d, 0xc4, 0xff, 0xfb, 0x4a, 0xd8, 0xb4, 0x16, 0x9f, + 0xab, 0xeb, 0x27, 0x56, 0x11, 0xbf, 0xd8, 0x1d, 0x03, 0xb4, 0x3f, 0x06, 0xe8, 0xe7, 0x31, 0x40, + 0x1f, 0x4e, 0x81, 0xb3, 0x3f, 0x05, 0xce, 0xf7, 0x53, 0xe0, 0xbc, 0xb9, 0xf9, 0xab, 0x02, 0xeb, + 0x37, 0xa9, 0x68, 0x26, 0xfa, 0x81, 0x6c, 0xa6, 0x37, 0x64, 0x6b, 0x7e, 0x16, 0x5d, 0x48, 0x36, + 0xd0, 0x37, 0x7a, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x03, 0xb5, 0xea, 0x6a, 0x49, 0x02, 0x00, + 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/types/msgs_test.go b/x/gamm/types/msgs_test.go index 9643f354b5e..3cfee6629dc 100644 --- a/x/gamm/types/msgs_test.go +++ b/x/gamm/types/msgs_test.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v7/app/params" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" ) func TestMsgSwapExactAmountIn(t *testing.T) { diff --git a/x/gamm/types/params.go b/x/gamm/types/params.go index 72dfd3d46f4..db3d72166b3 100644 --- a/x/gamm/types/params.go +++ b/x/gamm/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index d723db2e7d0..8178f3cf7b6 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -997,90 +997,90 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) } var fileDescriptor_d9a717df9ca609ef = []byte{ - // 1321 bytes of a gzipped FileDescriptorProto + // 1322 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0xcd, 0x6f, 0x1b, 0x45, 0x14, 0xc0, 0xb3, 0xa9, 0x93, 0xc6, 0x13, 0x9a, 0x26, 0xd3, 0xb4, 0x75, 0x37, 0xad, 0xb7, 0x0c, - 0xa2, 0x09, 0x6d, 0xb2, 0x4b, 0xda, 0x54, 0x48, 0x15, 0x50, 0x6a, 0x9a, 0xb4, 0xae, 0xa0, 0x0d, - 0x5b, 0x04, 0x02, 0x0e, 0xd6, 0x26, 0x59, 0xdc, 0x55, 0xed, 0x9d, 0x8d, 0x67, 0xb6, 0x69, 0x84, - 0x2a, 0x24, 0x84, 0x38, 0x71, 0x40, 0x2a, 0xdc, 0x2a, 0x95, 0x03, 0x07, 0xc4, 0x99, 0x7f, 0x01, - 0xa9, 0x42, 0x42, 0x2a, 0xe2, 0x82, 0x38, 0x18, 0xd4, 0x72, 0xe0, 0xec, 0x7f, 0x00, 0x34, 0x33, - 0x6f, 0x3f, 0x1c, 0x6f, 0xfc, 0x11, 0x84, 0xc4, 0x29, 0xf6, 0xfb, 0xfc, 0xbd, 0xf7, 0x66, 0x3c, - 0x2f, 0xe8, 0x24, 0x65, 0x75, 0xca, 0x3c, 0x66, 0x55, 0x9d, 0x7a, 0xdd, 0xba, 0xb3, 0xb8, 0xe6, - 0x72, 0x67, 0xd1, 0xda, 0x0c, 0xdd, 0xc6, 0xb6, 0x19, 0x34, 0x28, 0xa7, 0x78, 0x1a, 0x2c, 0x4c, - 0x61, 0x61, 0x82, 0x85, 0x3e, 0x5d, 0xa5, 0x55, 0x2a, 0x0d, 0x2c, 0xf1, 0x49, 0xd9, 0xea, 0x27, - 0x32, 0xa3, 0xf1, 0xbb, 0xa0, 0x2e, 0xae, 0x4b, 0xbd, 0xb5, 0xe6, 0x30, 0x37, 0xd6, 0xae, 0x53, - 0xcf, 0x07, 0xfd, 0xe9, 0xb4, 0x5e, 0x32, 0xc4, 0x56, 0x81, 0x53, 0xf5, 0x7c, 0x87, 0x7b, 0x34, - 0xb2, 0x3d, 0x5e, 0xa5, 0xb4, 0x5a, 0x73, 0x2d, 0x27, 0xf0, 0x2c, 0xc7, 0xf7, 0x29, 0x97, 0x4a, - 0x06, 0xda, 0x63, 0xa0, 0x95, 0xdf, 0xd6, 0xc2, 0x0f, 0x2d, 0xc7, 0xdf, 0x8e, 0x54, 0x2a, 0x49, - 0x45, 0xc1, 0xab, 0x2f, 0x4a, 0x45, 0x2e, 0xa2, 0xc9, 0xb7, 0x44, 0xd6, 0x55, 0x4a, 0x6b, 0xb6, - 0xbb, 0x19, 0xba, 0x8c, 0xe3, 0x33, 0x68, 0x7f, 0x40, 0x69, 0xad, 0xe2, 0x6d, 0x14, 0xb4, 0x93, - 0xda, 0x5c, 0xae, 0x84, 0x5b, 0x4d, 0x63, 0x62, 0xdb, 0xa9, 0xd7, 0x2e, 0x10, 0x50, 0x10, 0x7b, - 0x54, 0x7c, 0x2a, 0x6f, 0x90, 0xab, 0x68, 0x2a, 0x15, 0x80, 0x05, 0xd4, 0x67, 0x2e, 0x3e, 0x87, - 0x72, 0x42, 0x2d, 0xdd, 0xc7, 0xcf, 0x4e, 0x9b, 0x0a, 0xcd, 0x8c, 0xd0, 0xcc, 0x4b, 0xfe, 0x76, - 0x29, 0xff, 0xe3, 0xf7, 0x0b, 0x23, 0xc2, 0xab, 0x6c, 0x4b, 0x63, 0xf2, 0x41, 0x2a, 0x12, 0x8b, - 0x58, 0x56, 0x10, 0x4a, 0xfa, 0x50, 0x18, 0x96, 0xf1, 0x4e, 0x99, 0x50, 0x82, 0x68, 0x9a, 0xa9, - 0x06, 0x07, 0x4d, 0x33, 0x57, 0x9d, 0xaa, 0x0b, 0xbe, 0x76, 0xca, 0x93, 0x7c, 0xa9, 0x21, 0x9c, - 0x8e, 0x0e, 0xa0, 0xe7, 0xd1, 0x88, 0xc8, 0xcd, 0x0a, 0xda, 0xc9, 0x7d, 0xfd, 0x90, 0x2a, 0x6b, - 0x7c, 0x25, 0x83, 0x6a, 0xb6, 0x27, 0x95, 0xca, 0xd9, 0x86, 0x75, 0x04, 0x4d, 0x4b, 0xaa, 0xeb, - 0x61, 0x3d, 0x5d, 0x36, 0xb9, 0x86, 0x0e, 0xef, 0x90, 0x03, 0xf0, 0x22, 0xca, 0xfb, 0x61, 0xbd, - 0x12, 0x41, 0x8b, 0xe9, 0x4c, 0xb7, 0x9a, 0xc6, 0xa4, 0x9a, 0x4e, 0xac, 0x22, 0xf6, 0x98, 0x0f, - 0xae, 0x64, 0x19, 0x1d, 0x89, 0x2b, 0x5f, 0x75, 0x1a, 0x4e, 0x9d, 0xed, 0x69, 0xd0, 0x57, 0xd0, - 0xd1, 0x8e, 0x30, 0x00, 0x35, 0x8f, 0x46, 0x03, 0x29, 0xe9, 0x36, 0x70, 0x1b, 0x6c, 0xc8, 0x9b, - 0xa8, 0x28, 0x03, 0xbd, 0x4d, 0xb9, 0x53, 0x13, 0xd1, 0xde, 0xf0, 0x36, 0x43, 0x6f, 0xc3, 0xe3, - 0xdb, 0x7b, 0xe2, 0xfa, 0x5a, 0x43, 0xc6, 0xae, 0xf1, 0x00, 0xf0, 0x1e, 0xca, 0xd7, 0x22, 0x21, - 0x8c, 0xfa, 0x58, 0xdb, 0xb8, 0xa2, 0x41, 0xbd, 0x4e, 0x3d, 0xbf, 0x74, 0xf9, 0x51, 0xd3, 0x18, - 0x4a, 0x9a, 0x1a, 0x7b, 0x92, 0xef, 0x7e, 0x37, 0xe6, 0xaa, 0x1e, 0xbf, 0x15, 0xae, 0x99, 0xeb, - 0xb4, 0x0e, 0x17, 0x09, 0xfe, 0x2c, 0xb0, 0x8d, 0xdb, 0x16, 0xdf, 0x0e, 0x5c, 0x26, 0x83, 0x30, - 0x3b, 0xc9, 0x48, 0x56, 0xa0, 0x75, 0x92, 0xf0, 0xe6, 0x2d, 0xa7, 0xe1, 0xee, 0x6d, 0x04, 0x21, - 0x2a, 0x74, 0xc6, 0x81, 0x12, 0xdf, 0x43, 0xcf, 0x70, 0x21, 0xae, 0x30, 0x29, 0x87, 0x49, 0x74, - 0xa9, 0x72, 0x06, 0xaa, 0x3c, 0xa4, 0x92, 0xa5, 0x9d, 0x89, 0x3d, 0xce, 0x93, 0x14, 0xe4, 0x2f, - 0x0d, 0x4e, 0xe3, 0xcd, 0x80, 0xf2, 0xd5, 0x86, 0xb7, 0xee, 0xee, 0x85, 0x1e, 0x2f, 0xa3, 0x49, - 0x41, 0x51, 0x71, 0x18, 0x73, 0x79, 0x65, 0xc3, 0xf5, 0x69, 0x5d, 0x5e, 0x9d, 0x7c, 0x69, 0xa6, - 0xd5, 0x34, 0x8e, 0x2a, 0xaf, 0x9d, 0x16, 0xc4, 0x9e, 0x10, 0xa2, 0x4b, 0x42, 0x72, 0x59, 0x08, - 0xf0, 0x55, 0x34, 0xb5, 0x19, 0x52, 0xde, 0x1e, 0x67, 0x9f, 0x8c, 0x73, 0xbc, 0xd5, 0x34, 0x0a, - 0x2a, 0x4e, 0x87, 0x09, 0xb1, 0x0f, 0x4a, 0x59, 0x12, 0xe9, 0x5a, 0x6e, 0x2c, 0x37, 0x39, 0x62, - 0x8f, 0x6f, 0x79, 0xfc, 0xd6, 0xcd, 0x2d, 0x27, 0x58, 0x71, 0x5d, 0x72, 0x1d, 0xee, 0x4a, 0xaa, - 0x52, 0xe8, 0xef, 0x12, 0x42, 0x2c, 0xa0, 0xbc, 0x12, 0x08, 0xa9, 0xac, 0x36, 0x5f, 0x3a, 0xdc, - 0x6a, 0x1a, 0x53, 0x2a, 0x5f, 0xa2, 0x23, 0x76, 0x9e, 0x45, 0xde, 0xe4, 0x6f, 0x0d, 0x9d, 0x50, - 0x01, 0xb7, 0x9c, 0x60, 0xf9, 0xae, 0xb3, 0xce, 0x2f, 0xd5, 0x69, 0xe8, 0xf3, 0xb2, 0x1f, 0xb5, - 0xf0, 0x05, 0x34, 0xca, 0x5c, 0x7f, 0xc3, 0x6d, 0x40, 0xcc, 0xa9, 0x56, 0xd3, 0x38, 0x00, 0x31, - 0xa5, 0x9c, 0xd8, 0x60, 0x90, 0xee, 0xf6, 0x70, 0xcf, 0x6e, 0x9b, 0x68, 0x8c, 0xd3, 0xdb, 0xae, - 0x5f, 0xf1, 0x7c, 0xe8, 0xce, 0xa1, 0x56, 0xd3, 0x38, 0x18, 0x0d, 0x5b, 0x69, 0x88, 0xbd, 0x5f, - 0x7e, 0x2c, 0xfb, 0xf8, 0x1d, 0x34, 0xda, 0xa0, 0x21, 0x77, 0x59, 0x21, 0x27, 0xef, 0xc7, 0xac, - 0x99, 0xf5, 0x08, 0x9a, 0xa2, 0x8e, 0xb8, 0x04, 0x61, 0x5f, 0x3a, 0x0c, 0xe7, 0x08, 0xa0, 0x55, - 0x10, 0x62, 0x43, 0x34, 0xf2, 0x95, 0x06, 0xd7, 0x3d, 0xa3, 0x03, 0xd0, 0x5a, 0x86, 0x26, 0x15, - 0x10, 0x0d, 0x79, 0xc5, 0x91, 0x5a, 0x68, 0x46, 0x59, 0xc4, 0xfe, 0xad, 0x69, 0x9c, 0xea, 0xe3, - 0xd6, 0x95, 0x7d, 0x9e, 0x1c, 0xa3, 0x9d, 0xf1, 0x88, 0x3d, 0x21, 0x45, 0x37, 0x42, 0x48, 0x4f, - 0x3e, 0x1d, 0xce, 0xe6, 0xba, 0x11, 0xf2, 0xff, 0x7a, 0x34, 0xef, 0xc6, 0xad, 0xde, 0x27, 0x5b, + 0xa2, 0x09, 0x6d, 0xb2, 0xdb, 0xb4, 0xe9, 0xa5, 0x02, 0x4a, 0x4d, 0x93, 0x36, 0x15, 0xb4, 0x61, + 0x8b, 0x40, 0xc0, 0xc1, 0xda, 0x24, 0x8b, 0xbb, 0xaa, 0xbd, 0xb3, 0xf1, 0xcc, 0x36, 0x8d, 0x50, + 0x85, 0x84, 0x10, 0x27, 0x0e, 0x48, 0x85, 0x5b, 0xa5, 0x72, 0xe0, 0x80, 0x38, 0xf3, 0x2f, 0x20, + 0x55, 0x48, 0x48, 0x45, 0x5c, 0x10, 0x07, 0x83, 0x5a, 0x0e, 0x9c, 0xfd, 0x0f, 0x80, 0x66, 0xe6, + 0xed, 0x87, 0xed, 0x8d, 0x3f, 0x82, 0x90, 0x38, 0xc5, 0x7e, 0x9f, 0xbf, 0xf7, 0xde, 0x8c, 0xe7, + 0x05, 0x9d, 0xa4, 0xac, 0x46, 0x99, 0xc7, 0xac, 0x8a, 0x53, 0xab, 0x59, 0x77, 0x17, 0xd7, 0x5d, + 0xee, 0x2c, 0x5a, 0x5b, 0xa1, 0x5b, 0xdf, 0x31, 0x83, 0x3a, 0xe5, 0x14, 0x4f, 0x83, 0x85, 0x29, + 0x2c, 0x4c, 0xb0, 0xd0, 0xa7, 0x2b, 0xb4, 0x42, 0xa5, 0x81, 0x25, 0x3e, 0x29, 0x5b, 0xfd, 0x44, + 0x66, 0x34, 0x7e, 0x0f, 0xd4, 0xc5, 0x0d, 0xa9, 0xb7, 0xd6, 0x1d, 0xe6, 0xc6, 0xda, 0x0d, 0xea, + 0xf9, 0xa0, 0x3f, 0x9d, 0xd6, 0x4b, 0x86, 0xd8, 0x2a, 0x70, 0x2a, 0x9e, 0xef, 0x70, 0x8f, 0x46, + 0xb6, 0xc7, 0x2b, 0x94, 0x56, 0xaa, 0xae, 0xe5, 0x04, 0x9e, 0xe5, 0xf8, 0x3e, 0xe5, 0x52, 0xc9, + 0x40, 0x7b, 0x0c, 0xb4, 0xf2, 0xdb, 0x7a, 0xf8, 0xa1, 0xe5, 0xf8, 0x3b, 0x91, 0x4a, 0x25, 0x29, + 0x2b, 0x78, 0xf5, 0x45, 0xa9, 0xc8, 0x25, 0x34, 0xf9, 0x96, 0xc8, 0xba, 0x46, 0x69, 0xd5, 0x76, + 0xb7, 0x42, 0x97, 0x71, 0x7c, 0x06, 0xed, 0x0f, 0x28, 0xad, 0x96, 0xbd, 0xcd, 0x82, 0x76, 0x52, + 0x9b, 0xcb, 0x95, 0x70, 0xb3, 0x61, 0x4c, 0xec, 0x38, 0xb5, 0xea, 0x45, 0x02, 0x0a, 0x62, 0x8f, + 0x8a, 0x4f, 0xab, 0x9b, 0xe4, 0x1a, 0x9a, 0x4a, 0x05, 0x60, 0x01, 0xf5, 0x99, 0x8b, 0xcf, 0xa3, + 0x9c, 0x50, 0x4b, 0xf7, 0xf1, 0x73, 0xd3, 0xa6, 0x42, 0x33, 0x23, 0x34, 0xf3, 0xb2, 0xbf, 0x53, + 0xca, 0xff, 0xf8, 0xfd, 0xc2, 0x88, 0xf0, 0x5a, 0xb5, 0xa5, 0x31, 0xf9, 0x20, 0x15, 0x89, 0x45, + 0x2c, 0x2b, 0x08, 0x25, 0x7d, 0x28, 0x0c, 0xcb, 0x78, 0xa7, 0x4c, 0x28, 0x41, 0x34, 0xcd, 0x54, + 0x83, 0x83, 0xa6, 0x99, 0x6b, 0x4e, 0xc5, 0x05, 0x5f, 0x3b, 0xe5, 0x49, 0xbe, 0xd4, 0x10, 0x4e, + 0x47, 0x07, 0xd0, 0x0b, 0x68, 0x44, 0xe4, 0x66, 0x05, 0xed, 0xe4, 0xbe, 0x7e, 0x48, 0x95, 0x35, + 0xbe, 0x9a, 0x41, 0x35, 0xdb, 0x93, 0x4a, 0xe5, 0x6c, 0xc1, 0x3a, 0x82, 0xa6, 0x25, 0xd5, 0x8d, + 0xb0, 0x96, 0x2e, 0x9b, 0x5c, 0x47, 0x87, 0xdb, 0xe4, 0x00, 0xbc, 0x88, 0xf2, 0x7e, 0x58, 0x2b, + 0x47, 0xd0, 0x62, 0x3a, 0xd3, 0xcd, 0x86, 0x31, 0xa9, 0xa6, 0x13, 0xab, 0x88, 0x3d, 0xe6, 0x83, + 0x2b, 0x59, 0x46, 0x47, 0xe2, 0xca, 0xd7, 0x9c, 0xba, 0x53, 0x63, 0x7b, 0x1a, 0xf4, 0x55, 0x74, + 0xb4, 0x23, 0x0c, 0x40, 0xcd, 0xa3, 0xd1, 0x40, 0x4a, 0xba, 0x0d, 0xdc, 0x06, 0x1b, 0xf2, 0x26, + 0x2a, 0xca, 0x40, 0x6f, 0x53, 0xee, 0x54, 0x45, 0xb4, 0x37, 0xbc, 0xad, 0xd0, 0xdb, 0xf4, 0xf8, + 0xce, 0x9e, 0xb8, 0xbe, 0xd6, 0x90, 0xb1, 0x6b, 0x3c, 0x00, 0xbc, 0x8f, 0xf2, 0xd5, 0x48, 0x08, + 0xa3, 0x3e, 0xd6, 0x32, 0xae, 0x68, 0x50, 0xaf, 0x53, 0xcf, 0x2f, 0x5d, 0x79, 0xdc, 0x30, 0x86, + 0x92, 0xa6, 0xc6, 0x9e, 0xe4, 0xbb, 0xdf, 0x8d, 0xb9, 0x8a, 0xc7, 0x6f, 0x87, 0xeb, 0xe6, 0x06, + 0xad, 0xc1, 0x45, 0x82, 0x3f, 0x0b, 0x6c, 0xf3, 0x8e, 0xc5, 0x77, 0x02, 0x97, 0xc9, 0x20, 0xcc, + 0x4e, 0x32, 0x92, 0x15, 0x68, 0x9d, 0x24, 0xbc, 0x75, 0xdb, 0xa9, 0xbb, 0x7b, 0x1b, 0x41, 0x88, + 0x0a, 0x9d, 0x71, 0xa0, 0xc4, 0xf7, 0xd0, 0x73, 0x5c, 0x88, 0xcb, 0x4c, 0xca, 0x61, 0x12, 0x5d, + 0xaa, 0x9c, 0x81, 0x2a, 0x0f, 0xa9, 0x64, 0x69, 0x67, 0x62, 0x8f, 0xf3, 0x24, 0x05, 0xf9, 0x4b, + 0x83, 0xd3, 0x78, 0x2b, 0xa0, 0x7c, 0xad, 0xee, 0x6d, 0xb8, 0x7b, 0xa1, 0xc7, 0xcb, 0x68, 0x52, + 0x50, 0x94, 0x1d, 0xc6, 0x5c, 0x5e, 0xde, 0x74, 0x7d, 0x5a, 0x93, 0x57, 0x27, 0x5f, 0x9a, 0x69, + 0x36, 0x8c, 0xa3, 0xca, 0xab, 0xdd, 0x82, 0xd8, 0x13, 0x42, 0x74, 0x59, 0x48, 0xae, 0x08, 0x01, + 0xbe, 0x86, 0xa6, 0xb6, 0x42, 0xca, 0x5b, 0xe3, 0xec, 0x93, 0x71, 0x8e, 0x37, 0x1b, 0x46, 0x41, + 0xc5, 0xe9, 0x30, 0x21, 0xf6, 0x41, 0x29, 0x4b, 0x22, 0x5d, 0xcf, 0x8d, 0xe5, 0x26, 0x47, 0xec, + 0xf1, 0x6d, 0x8f, 0xdf, 0xbe, 0xb5, 0xed, 0x04, 0x2b, 0xae, 0x4b, 0x6e, 0xc0, 0x5d, 0x49, 0x55, + 0x0a, 0xfd, 0x5d, 0x42, 0x88, 0x05, 0x94, 0x97, 0x03, 0x21, 0x95, 0xd5, 0xe6, 0x4b, 0x87, 0x9b, + 0x0d, 0x63, 0x4a, 0xe5, 0x4b, 0x74, 0xc4, 0xce, 0xb3, 0xc8, 0x9b, 0xfc, 0xad, 0xa1, 0x13, 0x2a, + 0xe0, 0xb6, 0x13, 0x2c, 0xdf, 0x73, 0x36, 0xf8, 0xe5, 0x1a, 0x0d, 0x7d, 0xbe, 0xea, 0x47, 0x2d, + 0x7c, 0x09, 0x8d, 0x32, 0xd7, 0xdf, 0x74, 0xeb, 0x10, 0x73, 0xaa, 0xd9, 0x30, 0x0e, 0x40, 0x4c, + 0x29, 0x27, 0x36, 0x18, 0xa4, 0xbb, 0x3d, 0xdc, 0xb3, 0xdb, 0x26, 0x1a, 0xe3, 0xf4, 0x8e, 0xeb, + 0x97, 0x3d, 0x1f, 0xba, 0x73, 0xa8, 0xd9, 0x30, 0x0e, 0x46, 0xc3, 0x56, 0x1a, 0x62, 0xef, 0x97, + 0x1f, 0x57, 0x7d, 0xfc, 0x0e, 0x1a, 0xad, 0xd3, 0x90, 0xbb, 0xac, 0x90, 0x93, 0xf7, 0x63, 0xd6, + 0xcc, 0x7a, 0x04, 0x4d, 0x51, 0x47, 0x5c, 0x82, 0xb0, 0x2f, 0x1d, 0x86, 0x73, 0x04, 0xd0, 0x2a, + 0x08, 0xb1, 0x21, 0x1a, 0xf9, 0x4a, 0x83, 0xeb, 0x9e, 0xd1, 0x01, 0x68, 0x2d, 0x43, 0x93, 0x0a, + 0x88, 0x86, 0xbc, 0xec, 0x48, 0x2d, 0x34, 0x63, 0x55, 0xc4, 0xfe, 0xad, 0x61, 0x9c, 0xea, 0xe3, + 0xd6, 0xad, 0xfa, 0x3c, 0x39, 0x46, 0xed, 0xf1, 0x88, 0x3d, 0x21, 0x45, 0x37, 0x43, 0x48, 0x4f, + 0x3e, 0x1d, 0xce, 0xe6, 0xba, 0x19, 0xf2, 0xff, 0x7a, 0x34, 0xef, 0xc6, 0xad, 0xde, 0x27, 0x5b, 0x3d, 0xd7, 0xab, 0xd5, 0x82, 0xa9, 0x8f, 0x5e, 0x8b, 0xc7, 0x21, 0x2e, 0xbc, 0x90, 0x93, 0xcc, - 0xa9, 0xc7, 0x21, 0x56, 0x11, 0x7b, 0x2c, 0x6a, 0x06, 0xb9, 0x1f, 0xfd, 0x7a, 0x66, 0xb5, 0x01, - 0xe6, 0x13, 0xa0, 0x83, 0xd1, 0x81, 0x69, 0x1f, 0xcf, 0xd5, 0x81, 0xc7, 0x73, 0xa4, 0xfd, 0xfc, - 0xc5, 0xd3, 0x39, 0x00, 0xc7, 0x10, 0x86, 0x73, 0x1c, 0xe9, 0xc9, 0x0f, 0xdd, 0xce, 0xe7, 0x81, - 0x3c, 0xd0, 0xd0, 0x4c, 0xa6, 0xfa, 0x7f, 0xf1, 0x6b, 0x7f, 0xf6, 0xe1, 0x01, 0x34, 0x22, 0xf1, - 0xf0, 0xc7, 0x48, 0xae, 0x0d, 0x0c, 0xef, 0x72, 0x99, 0x3a, 0xd6, 0x1d, 0x7d, 0xae, 0xb7, 0xa1, - 0x2a, 0x92, 0x3c, 0xf7, 0xc9, 0x2f, 0x7f, 0xde, 0x1f, 0x3e, 0x81, 0x67, 0xac, 0xcc, 0x05, 0x54, - 0xed, 0x29, 0x9f, 0x6b, 0x68, 0x2c, 0x5a, 0x21, 0xf0, 0xe9, 0x2e, 0xb1, 0x77, 0xec, 0x1f, 0xfa, - 0x99, 0xbe, 0x6c, 0x01, 0x65, 0x56, 0xa2, 0x3c, 0x8b, 0x8d, 0x6c, 0x94, 0x78, 0x29, 0xc1, 0xdf, - 0x68, 0x68, 0xa2, 0x7d, 0x66, 0xf8, 0xc5, 0x2e, 0x89, 0x32, 0xa7, 0xaf, 0x2f, 0x0e, 0xe0, 0x01, - 0x80, 0x0b, 0x12, 0x70, 0x16, 0x3f, 0x9f, 0x0d, 0xa8, 0x9e, 0xbe, 0x78, 0x80, 0xf8, 0x33, 0x0d, - 0xe5, 0x44, 0x85, 0xf8, 0x54, 0x8f, 0x69, 0x44, 0x48, 0xb3, 0x3d, 0xed, 0xfa, 0x03, 0x91, 0x5d, - 0xb2, 0x3e, 0x82, 0x1f, 0x8c, 0x7b, 0xf8, 0xa1, 0x86, 0x50, 0xb2, 0x6e, 0xe1, 0xf9, 0x1e, 0x69, - 0xda, 0x96, 0x3b, 0x7d, 0xa1, 0x4f, 0x6b, 0x40, 0x5b, 0x92, 0x68, 0x26, 0x9e, 0xef, 0x0b, 0xcd, - 0x52, 0xbb, 0x1c, 0xfe, 0x41, 0x43, 0xb8, 0x73, 0xef, 0xc2, 0x4b, 0xbd, 0x66, 0x94, 0xb5, 0xf6, - 0xe9, 0xe7, 0x07, 0xf4, 0x02, 0xf2, 0x92, 0x24, 0x7f, 0x19, 0x5f, 0xe8, 0x8f, 0x5c, 0x4d, 0x5b, - 0x7e, 0x4d, 0x46, 0xfe, 0xad, 0x86, 0xc6, 0x53, 0x5b, 0x15, 0x5e, 0xe8, 0x85, 0xd2, 0xb6, 0xc5, - 0xe9, 0x66, 0xbf, 0xe6, 0x80, 0x7c, 0x41, 0x22, 0x2f, 0xe1, 0xb3, 0x83, 0x20, 0xab, 0xdd, 0x0c, - 0x3f, 0xd0, 0x50, 0x3e, 0x5e, 0x4f, 0x70, 0xb7, 0x8b, 0xba, 0x73, 0x5d, 0xd3, 0xe7, 0xfb, 0x33, - 0xde, 0xe3, 0x89, 0x10, 0xce, 0x0c, 0xff, 0xa4, 0xa1, 0x63, 0xcb, 0x8c, 0x7b, 0x75, 0x87, 0xbb, - 0x1d, 0x4f, 0x3e, 0x3e, 0xd7, 0x8d, 0x60, 0x97, 0x15, 0x49, 0x5f, 0x1a, 0xcc, 0x09, 0xf0, 0x97, - 0x25, 0xfe, 0x45, 0xfc, 0x4a, 0x36, 0x7e, 0x02, 0xee, 0x02, 0xad, 0xc5, 0xb6, 0x9c, 0xa0, 0xe2, - 0x8a, 0x60, 0xf0, 0x2e, 0x55, 0x3c, 0x1f, 0xff, 0xac, 0x21, 0x7d, 0x97, 0x7a, 0x6e, 0x84, 0x1c, - 0x0f, 0xc0, 0x96, 0x6c, 0x16, 0x5d, 0x4f, 0xfa, 0xee, 0x0f, 0x31, 0x59, 0x91, 0x25, 0xbd, 0x86, - 0x5f, 0xfd, 0x17, 0x25, 0xd1, 0x90, 0x97, 0xca, 0x8f, 0x9e, 0x14, 0xb5, 0xc7, 0x4f, 0x8a, 0xda, - 0x1f, 0x4f, 0x8a, 0xda, 0x17, 0x4f, 0x8b, 0x43, 0x8f, 0x9f, 0x16, 0x87, 0x7e, 0x7d, 0x5a, 0x1c, - 0x7a, 0xdf, 0x4a, 0x3d, 0x78, 0x90, 0x63, 0xa1, 0xe6, 0xac, 0xb1, 0x38, 0xe1, 0x9d, 0x97, 0xac, - 0xbb, 0x2a, 0xab, 0x7c, 0xfd, 0xd6, 0x46, 0xe5, 0xbf, 0x78, 0xe7, 0xfe, 0x09, 0x00, 0x00, 0xff, - 0xff, 0x5d, 0x47, 0xc7, 0xb1, 0x55, 0x11, 0x00, 0x00, + 0xa9, 0xc7, 0x21, 0x56, 0x11, 0x7b, 0x2c, 0x6a, 0x06, 0x79, 0x10, 0xfd, 0x7a, 0x66, 0xb5, 0x01, + 0xe6, 0x13, 0xa0, 0x83, 0xd1, 0x81, 0x69, 0x1d, 0xcf, 0xb5, 0x81, 0xc7, 0x73, 0xa4, 0xf5, 0xfc, + 0xc5, 0xd3, 0x39, 0x00, 0xc7, 0x10, 0x86, 0x73, 0x1c, 0xe9, 0xc9, 0x0f, 0x5d, 0xfb, 0xf3, 0x40, + 0x1e, 0x6a, 0x68, 0x26, 0x53, 0xfd, 0xbf, 0xf8, 0xb5, 0x3f, 0xf7, 0xe8, 0x00, 0x1a, 0x91, 0x78, + 0xf8, 0x63, 0x24, 0xd7, 0x06, 0x86, 0x77, 0xb9, 0x4c, 0x1d, 0xeb, 0x8e, 0x3e, 0xd7, 0xdb, 0x50, + 0x15, 0x49, 0x5e, 0xf8, 0xe4, 0x97, 0x3f, 0x1f, 0x0c, 0x9f, 0xc0, 0x33, 0x56, 0xe6, 0x02, 0xaa, + 0xf6, 0x94, 0xcf, 0x35, 0x34, 0x16, 0xad, 0x10, 0xf8, 0x74, 0x97, 0xd8, 0x6d, 0xfb, 0x87, 0x7e, + 0xa6, 0x2f, 0x5b, 0x40, 0x99, 0x95, 0x28, 0xcf, 0x63, 0x23, 0x1b, 0x25, 0x5e, 0x4a, 0xf0, 0x37, + 0x1a, 0x9a, 0x68, 0x9d, 0x19, 0x3e, 0xdb, 0x25, 0x51, 0xe6, 0xf4, 0xf5, 0xc5, 0x01, 0x3c, 0x00, + 0x70, 0x41, 0x02, 0xce, 0xe2, 0x17, 0xb3, 0x01, 0xd5, 0xd3, 0x17, 0x0f, 0x10, 0x7f, 0xa6, 0xa1, + 0x9c, 0xa8, 0x10, 0x9f, 0xea, 0x31, 0x8d, 0x08, 0x69, 0xb6, 0xa7, 0x5d, 0x7f, 0x20, 0xb2, 0x4b, + 0xd6, 0x47, 0xf0, 0x83, 0x71, 0x1f, 0x3f, 0xd2, 0x10, 0x4a, 0xd6, 0x2d, 0x3c, 0xdf, 0x23, 0x4d, + 0xcb, 0x72, 0xa7, 0x2f, 0xf4, 0x69, 0x0d, 0x68, 0x4b, 0x12, 0xcd, 0xc4, 0xf3, 0x7d, 0xa1, 0x59, + 0x6a, 0x97, 0xc3, 0x3f, 0x68, 0x08, 0x77, 0xee, 0x5d, 0x78, 0xa9, 0xd7, 0x8c, 0xb2, 0xd6, 0x3e, + 0xfd, 0xc2, 0x80, 0x5e, 0x40, 0x5e, 0x92, 0xe4, 0x2f, 0xe3, 0x8b, 0xfd, 0x91, 0xab, 0x69, 0xcb, + 0xaf, 0xc9, 0xc8, 0xbf, 0xd5, 0xd0, 0x78, 0x6a, 0xab, 0xc2, 0x0b, 0xbd, 0x50, 0x5a, 0xb6, 0x38, + 0xdd, 0xec, 0xd7, 0x1c, 0x90, 0x2f, 0x4a, 0xe4, 0x25, 0x7c, 0x6e, 0x10, 0x64, 0xb5, 0x9b, 0xe1, + 0x87, 0x1a, 0xca, 0xc7, 0xeb, 0x09, 0xee, 0x76, 0x51, 0xdb, 0xd7, 0x35, 0x7d, 0xbe, 0x3f, 0xe3, + 0x3d, 0x9e, 0x08, 0xe1, 0xcc, 0xf0, 0x4f, 0x1a, 0x3a, 0xb6, 0xcc, 0xb8, 0x57, 0x73, 0xb8, 0xdb, + 0xf1, 0xe4, 0xe3, 0xf3, 0xdd, 0x08, 0x76, 0x59, 0x91, 0xf4, 0xa5, 0xc1, 0x9c, 0x00, 0x7f, 0x59, + 0xe2, 0x5f, 0xc2, 0xaf, 0x64, 0xe3, 0x27, 0xe0, 0x2e, 0xd0, 0x5a, 0x6c, 0xdb, 0x09, 0xca, 0xae, + 0x08, 0x06, 0xef, 0x52, 0xd9, 0xf3, 0xf1, 0xcf, 0x1a, 0xd2, 0x77, 0xa9, 0xe7, 0x66, 0xc8, 0xf1, + 0x00, 0x6c, 0xc9, 0x66, 0xd1, 0xf5, 0xa4, 0xef, 0xfe, 0x10, 0x93, 0x15, 0x59, 0xd2, 0x6b, 0xf8, + 0xd5, 0x7f, 0x51, 0x12, 0x0d, 0x79, 0xe9, 0xfa, 0xe3, 0xa7, 0x45, 0xed, 0xc9, 0xd3, 0xa2, 0xf6, + 0xc7, 0xd3, 0xa2, 0xf6, 0xc5, 0xb3, 0xe2, 0xd0, 0x93, 0x67, 0xc5, 0xa1, 0x5f, 0x9f, 0x15, 0x87, + 0xde, 0x3f, 0x9b, 0x7a, 0xf0, 0x20, 0xc7, 0x42, 0xd5, 0x59, 0x67, 0x71, 0xc2, 0xbb, 0x8b, 0x67, + 0xad, 0x7b, 0x2a, 0xad, 0x7c, 0xfe, 0xd6, 0x47, 0xe5, 0xff, 0x78, 0xe7, 0xff, 0x09, 0x00, 0x00, + 0xff, 0xff, 0x35, 0x7c, 0xb0, 0x19, 0x56, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/types/tx.pb.go b/x/gamm/types/tx.pb.go index 75e649d559d..901f7672f57 100644 --- a/x/gamm/types/tx.pb.go +++ b/x/gamm/types/tx.pb.go @@ -969,77 +969,78 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/tx.proto", fileDescriptor_cfc8fd3ac7df3247) } var fileDescriptor_cfc8fd3ac7df3247 = []byte{ - // 1119 bytes of a gzipped FileDescriptorProto + // 1121 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x6f, 0x1b, 0x45, 0x1c, 0xcf, 0xd8, 0x6e, 0x1e, 0x93, 0xe6, 0xb5, 0x4d, 0x1a, 0x67, 0xdb, 0xda, 0xe9, 0x80, 0x20, - 0xa5, 0xea, 0x2e, 0x4d, 0x25, 0x8a, 0xb8, 0x00, 0x86, 0x20, 0x8c, 0xb0, 0x5c, 0x6d, 0x2f, 0x15, - 0x17, 0x6b, 0x1d, 0xaf, 0xdc, 0x55, 0xb3, 0x33, 0x96, 0x67, 0x36, 0xb8, 0x42, 0x02, 0x89, 0xc7, - 0x1d, 0x84, 0x78, 0x7c, 0x02, 0xc4, 0x57, 0xe0, 0x00, 0x07, 0xb8, 0xf4, 0xd8, 0x1b, 0x94, 0x83, - 0x85, 0x92, 0x6f, 0xe0, 0x4f, 0x80, 0x76, 0x67, 0xf6, 0xe9, 0xdd, 0xd8, 0x9b, 0xd8, 0xc9, 0x29, - 0xf1, 0xce, 0xff, 0xfd, 0xff, 0xcd, 0xef, 0xff, 0xdf, 0x85, 0x37, 0x08, 0xb5, 0x08, 0x35, 0xa9, - 0xda, 0xd6, 0x2d, 0x4b, 0x3d, 0xbc, 0xdb, 0x34, 0x98, 0x7e, 0x57, 0x65, 0x3d, 0xa5, 0xd3, 0x25, - 0x8c, 0x48, 0xeb, 0xe2, 0x58, 0x71, 0x8e, 0x15, 0x71, 0x2c, 0xaf, 0xb7, 0x49, 0x9b, 0xb8, 0x02, - 0xaa, 0xf3, 0x1f, 0x97, 0x95, 0x4b, 0xfb, 0xae, 0xb0, 0xda, 0xd4, 0xa9, 0xe1, 0x5b, 0xda, 0x27, - 0x26, 0xe6, 0xe7, 0xe8, 0xf7, 0x1c, 0x5c, 0xac, 0xd1, 0xf6, 0x47, 0xc4, 0xc4, 0x0f, 0x08, 0x39, - 0x90, 0x6e, 0xc1, 0x59, 0x6a, 0xe0, 0x96, 0xd1, 0x2d, 0x82, 0x6d, 0xb0, 0xb3, 0x50, 0x59, 0x1b, - 0xf4, 0xcb, 0x4b, 0x4f, 0x75, 0xeb, 0xe0, 0x2d, 0xc4, 0x9f, 0x23, 0x4d, 0x08, 0x48, 0xb7, 0xe1, - 0x5c, 0x87, 0x90, 0x83, 0x86, 0xd9, 0x2a, 0xe6, 0xb6, 0xc1, 0x4e, 0xa1, 0x22, 0x0d, 0xfa, 0xe5, - 0x65, 0x2e, 0x2b, 0x0e, 0x90, 0x36, 0xeb, 0xfc, 0x57, 0x6d, 0x49, 0x5d, 0xb8, 0x4a, 0x1f, 0xeb, - 0x5d, 0xa3, 0x41, 0x6c, 0xd6, 0xd0, 0x2d, 0x62, 0x63, 0x56, 0xcc, 0xbb, 0x1e, 0x3e, 0x7c, 0xd6, - 0x2f, 0xcf, 0xfc, 0xdb, 0x2f, 0xbf, 0xd2, 0x36, 0xd9, 0x63, 0xbb, 0xa9, 0xec, 0x13, 0x4b, 0x15, - 0x41, 0xf3, 0x3f, 0x77, 0x68, 0xeb, 0x89, 0xca, 0x9e, 0x76, 0x0c, 0xaa, 0x54, 0x31, 0x1b, 0xf4, - 0xcb, 0x57, 0x43, 0x3e, 0xb8, 0x29, 0xc7, 0x2a, 0xd2, 0x96, 0x5d, 0x0f, 0x75, 0x9b, 0xbd, 0xeb, - 0x3e, 0x94, 0x9a, 0x70, 0x89, 0x91, 0x27, 0x06, 0x6e, 0x98, 0xb8, 0x61, 0xe9, 0x3d, 0x5a, 0x2c, - 0x6c, 0xe7, 0x77, 0x16, 0x77, 0xb7, 0x14, 0x6e, 0x57, 0x71, 0x6a, 0xe2, 0x95, 0x4f, 0x79, 0x8f, - 0x98, 0xb8, 0xf2, 0x92, 0x13, 0xcb, 0xa0, 0x5f, 0xbe, 0xc6, 0x3d, 0x84, 0xb5, 0x85, 0x27, 0x8a, - 0xb4, 0x45, 0xf7, 0x71, 0x15, 0xd7, 0xf4, 0x1e, 0x45, 0x2f, 0x00, 0xbc, 0x12, 0xaa, 0x9f, 0x66, - 0xd0, 0x0e, 0xc1, 0xd4, 0x90, 0x68, 0x42, 0xbe, 0xbc, 0xa2, 0xd5, 0xcc, 0xf9, 0x6e, 0x8a, 0xfa, - 0xc7, 0xec, 0x0d, 0x27, 0x5c, 0x83, 0xf3, 0x5e, 0xc8, 0xc5, 0xdc, 0xa8, 0x5c, 0x37, 0x45, 0xae, - 0x2b, 0xd1, 0x5c, 0x91, 0x36, 0x27, 0xf2, 0x43, 0x7f, 0x70, 0x6c, 0xec, 0xf5, 0x4c, 0x36, 0x55, - 0x6c, 0x74, 0xe0, 0x0a, 0xcf, 0xcd, 0xc4, 0x13, 0x82, 0x46, 0xcc, 0x1c, 0xd2, 0x96, 0xdc, 0x27, - 0x55, 0x2c, 0x0a, 0x65, 0xc0, 0x65, 0x9e, 0xaf, 0x53, 0x4d, 0xcb, 0xc4, 0x63, 0x40, 0xe3, 0x65, - 0x51, 0xae, 0xeb, 0xe1, 0x72, 0x09, 0xf5, 0x00, 0x1b, 0x97, 0xdd, 0xe7, 0x75, 0x9b, 0xd5, 0x4c, - 0x4c, 0x51, 0xdb, 0xc5, 0x86, 0x57, 0x3f, 0x1f, 0x1b, 0x0f, 0xe0, 0x82, 0xaf, 0x5e, 0x04, 0xa3, - 0x1c, 0x17, 0x85, 0xe3, 0xd5, 0x98, 0x63, 0xa4, 0xcd, 0x7b, 0xce, 0xd0, 0xd7, 0x00, 0xae, 0x3d, - 0xfc, 0x54, 0xef, 0xf0, 0xf4, 0xaa, 0x58, 0x23, 0x36, 0x33, 0xc2, 0x4d, 0x00, 0x23, 0x9b, 0x50, - 0x81, 0x2b, 0x41, 0x4e, 0x2d, 0x03, 0x13, 0xcb, 0xed, 0xdc, 0x42, 0x45, 0x0e, 0xca, 0x1a, 0x13, - 0x40, 0xda, 0x92, 0x17, 0xc1, 0xfb, 0xee, 0xef, 0xbf, 0x73, 0x70, 0xbd, 0x46, 0xdb, 0x4e, 0x24, - 0x7b, 0x3d, 0x7d, 0x9f, 0x79, 0xe1, 0x64, 0x41, 0xce, 0x1e, 0x9c, 0xed, 0x3a, 0xd1, 0x53, 0x81, - 0xe0, 0x57, 0x95, 0x24, 0xb6, 0x53, 0x86, 0xb2, 0xad, 0x14, 0x9c, 0x3a, 0x69, 0x42, 0x39, 0x72, - 0x15, 0x1c, 0x30, 0x9d, 0xed, 0x2a, 0x48, 0x9f, 0xc3, 0xf5, 0xa4, 0x8e, 0x17, 0x0b, 0x6e, 0x3a, - 0xb5, 0xcc, 0x38, 0xbd, 0x96, 0x8e, 0x22, 0xa4, 0xad, 0x85, 0x40, 0xc4, 0x73, 0x44, 0xdf, 0x03, - 0x78, 0x3d, 0xa9, 0xb2, 0x61, 0xbe, 0x09, 0x8c, 0x4d, 0x86, 0x6f, 0xe2, 0xf6, 0x90, 0xb6, 0xec, - 0x05, 0x26, 0xa2, 0xfa, 0x0a, 0x40, 0x29, 0x68, 0x44, 0xdd, 0x66, 0xa7, 0xc0, 0xdd, 0x3b, 0xde, - 0x55, 0x34, 0xf1, 0xd8, 0xb0, 0xbb, 0x2c, 0xda, 0xc2, 0x51, 0xf7, 0x22, 0x07, 0x37, 0x86, 0x6b, - 0x53, 0xb7, 0x59, 0x16, 0xd8, 0x7d, 0x10, 0x83, 0xdd, 0xce, 0x28, 0xd8, 0x79, 0xd9, 0xc6, 0x70, - 0xf7, 0x19, 0xbc, 0x92, 0x30, 0x35, 0x04, 0x9f, 0x7d, 0x9c, 0xb9, 0x15, 0x72, 0xea, 0x20, 0x42, - 0xda, 0x6a, 0x30, 0x87, 0x04, 0xad, 0x45, 0x88, 0xa5, 0x30, 0x0a, 0xf5, 0xe3, 0x10, 0xcb, 0x77, - 0x00, 0xde, 0x48, 0xac, 0xad, 0x0f, 0xbc, 0x8e, 0xc7, 0x1b, 0xc1, 0xa5, 0x00, 0x67, 0x23, 0xef, - 0x98, 0x39, 0x8f, 0x65, 0x3c, 0xf2, 0x46, 0x7f, 0xe6, 0xe0, 0x96, 0x18, 0xb9, 0x3c, 0x2e, 0x66, - 0x74, 0xf1, 0x69, 0xa8, 0x26, 0xd3, 0x90, 0x9a, 0x3c, 0xa1, 0x04, 0xf3, 0x7c, 0x72, 0x84, 0x92, - 0x64, 0x13, 0x69, 0x6b, 0xde, 0x9e, 0x10, 0x10, 0xca, 0xcf, 0x00, 0xde, 0x4c, 0x2d, 0xe2, 0x85, - 0x6e, 0x31, 0xe8, 0x97, 0x7c, 0xa4, 0xbf, 0x0f, 0x9d, 0xd3, 0x53, 0xdd, 0xe9, 0x4c, 0xfd, 0x7d, - 0x7b, 0x88, 0x87, 0xf8, 0x9d, 0xdd, 0x1a, 0xf4, 0xcb, 0x1b, 0x31, 0x60, 0x26, 0xd1, 0x50, 0x62, - 0xad, 0x0a, 0xd3, 0xde, 0xf8, 0x52, 0xe8, 0xe6, 0xd2, 0x79, 0xd0, 0x0d, 0xfa, 0x21, 0x8a, 0xa1, - 0x68, 0xa3, 0x2e, 0x90, 0x20, 0x7e, 0xcd, 0xc3, 0xa2, 0xd8, 0xbb, 0x62, 0x71, 0x4d, 0x91, 0x1f, - 0x12, 0xf6, 0xa7, 0x7c, 0xc6, 0xfd, 0x29, 0x69, 0x11, 0x2e, 0x4c, 0x77, 0x11, 0x4e, 0xdb, 0x6b, - 0x2e, 0x9d, 0xd3, 0x5e, 0xf3, 0x13, 0x80, 0xdb, 0x69, 0xad, 0xba, 0xd8, 0xdd, 0xe6, 0xaf, 0x1c, - 0x94, 0x43, 0x91, 0x85, 0x09, 0x72, 0x9a, 0x34, 0x14, 0x19, 0xe1, 0xf9, 0x09, 0x8c, 0x70, 0x87, - 0x22, 0x7c, 0x14, 0x84, 0x28, 0xa2, 0x70, 0x36, 0x8a, 0x48, 0x30, 0x89, 0xb4, 0x55, 0x01, 0xae, - 0x80, 0x22, 0x7e, 0x04, 0x10, 0xa5, 0x57, 0x31, 0xcc, 0x11, 0x71, 0xe0, 0x83, 0xa9, 0x02, 0x7f, - 0xf7, 0xb7, 0x39, 0x98, 0xaf, 0xd1, 0xb6, 0xf4, 0x08, 0xce, 0xfb, 0xdf, 0x3e, 0x6e, 0x26, 0xef, - 0x7c, 0xa1, 0xd7, 0x7b, 0xf9, 0xd6, 0x48, 0x11, 0x3f, 0xa7, 0x47, 0x70, 0xde, 0x7f, 0x73, 0x4e, - 0xb7, 0xec, 0x89, 0x9c, 0x60, 0x79, 0xe8, 0xfd, 0x91, 0xf2, 0x97, 0xbd, 0xe8, 0x2b, 0xd6, 0x6b, - 0xa9, 0xfa, 0x43, 0xb2, 0xf2, 0xee, 0xf8, 0xb2, 0xbe, 0xd3, 0x43, 0xbe, 0xea, 0xc7, 0x36, 0xec, - 0xdb, 0xe3, 0x5a, 0xaa, 0xdb, 0x4c, 0xbe, 0x97, 0x41, 0xd8, 0xf7, 0xfb, 0x25, 0x80, 0x57, 0x53, - 0x56, 0x3d, 0xf5, 0xc4, 0x66, 0x0c, 0x2b, 0xc8, 0xf7, 0x33, 0x2a, 0x24, 0x06, 0x11, 0xdb, 0x47, - 0x46, 0x07, 0x11, 0x55, 0x18, 0x23, 0x88, 0x94, 0x41, 0xfa, 0x0d, 0x80, 0x9b, 0x69, 0x74, 0xf4, - 0xfa, 0x89, 0xe8, 0x49, 0xd0, 0x90, 0xdf, 0xcc, 0xaa, 0xe1, 0xc7, 0xf1, 0x05, 0xdc, 0x48, 0x1e, - 0xad, 0xca, 0x48, 0x93, 0x11, 0x79, 0xf9, 0x8d, 0x6c, 0xf2, 0x5e, 0x00, 0x95, 0xea, 0xb3, 0xa3, - 0x12, 0x78, 0x7e, 0x54, 0x02, 0xff, 0x1d, 0x95, 0xc0, 0xb7, 0xc7, 0xa5, 0x99, 0xe7, 0xc7, 0xa5, - 0x99, 0x7f, 0x8e, 0x4b, 0x33, 0x9f, 0xa8, 0x21, 0x9a, 0x10, 0xb6, 0xef, 0x1c, 0xe8, 0x4d, 0xea, - 0xfd, 0x50, 0x0f, 0xef, 0xab, 0x3d, 0xfe, 0x55, 0xd5, 0xe5, 0x8c, 0xe6, 0xac, 0xfb, 0x15, 0xf4, - 0xde, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x67, 0xe6, 0x5e, 0x56, 0x72, 0x15, 0x00, 0x00, + 0xa5, 0xea, 0x6e, 0x92, 0x4a, 0x80, 0xb8, 0x00, 0x86, 0x20, 0x5c, 0x61, 0xa5, 0xda, 0x5e, 0x2a, + 0x2e, 0xd6, 0x3a, 0x5e, 0xb9, 0xab, 0x66, 0x67, 0x2c, 0xcf, 0x6c, 0x70, 0x85, 0x04, 0x12, 0x8f, + 0x3b, 0x08, 0xf1, 0xf8, 0x04, 0x88, 0xaf, 0xc0, 0x01, 0x0e, 0x70, 0xe9, 0xb1, 0x37, 0x28, 0x07, + 0x0b, 0x25, 0xdf, 0xc0, 0x9f, 0xa0, 0xda, 0x9d, 0xd9, 0xa7, 0x77, 0x63, 0x6f, 0x62, 0x37, 0xa7, + 0xc4, 0x3b, 0xff, 0xf7, 0xff, 0x37, 0xbf, 0xff, 0x7f, 0x17, 0xde, 0x20, 0xd4, 0x22, 0xd4, 0xa4, + 0x6a, 0x4b, 0xb7, 0x2c, 0xf5, 0x68, 0xa7, 0x61, 0x30, 0x7d, 0x47, 0x65, 0x5d, 0xa5, 0xdd, 0x21, + 0x8c, 0x48, 0xab, 0xe2, 0x58, 0x71, 0x8e, 0x15, 0x71, 0x2c, 0xaf, 0xb6, 0x48, 0x8b, 0xb8, 0x02, + 0xaa, 0xf3, 0x1f, 0x97, 0x95, 0x4b, 0x07, 0xae, 0xb0, 0xda, 0xd0, 0xa9, 0xe1, 0x5b, 0x3a, 0x20, + 0x26, 0xe6, 0xe7, 0xe8, 0x8f, 0x1c, 0x9c, 0xaf, 0xd1, 0xd6, 0x3d, 0x62, 0xe2, 0xfb, 0x84, 0x1c, + 0x4a, 0xb7, 0xe0, 0x34, 0x35, 0x70, 0xd3, 0xe8, 0x14, 0xc1, 0x26, 0xd8, 0x9a, 0xab, 0xac, 0xf4, + 0x7b, 0xe5, 0x85, 0x27, 0xba, 0x75, 0xf8, 0x0e, 0xe2, 0xcf, 0x91, 0x26, 0x04, 0xa4, 0xdb, 0x70, + 0xa6, 0x4d, 0xc8, 0x61, 0xdd, 0x6c, 0x16, 0x73, 0x9b, 0x60, 0xab, 0x50, 0x91, 0xfa, 0xbd, 0xf2, + 0x22, 0x97, 0x15, 0x07, 0x48, 0x9b, 0x76, 0xfe, 0xab, 0x36, 0xa5, 0x0e, 0x5c, 0xa6, 0x8f, 0xf4, + 0x8e, 0x51, 0x27, 0x36, 0xab, 0xeb, 0x16, 0xb1, 0x31, 0x2b, 0xe6, 0x5d, 0x0f, 0x1f, 0x3f, 0xed, + 0x95, 0xa7, 0xfe, 0xeb, 0x95, 0x5f, 0x6b, 0x99, 0xec, 0x91, 0xdd, 0x50, 0x0e, 0x88, 0xa5, 0x8a, + 0xa0, 0xf9, 0x9f, 0x3b, 0xb4, 0xf9, 0x58, 0x65, 0x4f, 0xda, 0x06, 0x55, 0xaa, 0x98, 0xf5, 0x7b, + 0xe5, 0xab, 0x21, 0x1f, 0xdc, 0x94, 0x63, 0x15, 0x69, 0x8b, 0xae, 0x87, 0x7d, 0x9b, 0xbd, 0xef, + 0x3e, 0x94, 0x1a, 0x70, 0x81, 0x91, 0xc7, 0x06, 0xae, 0x9b, 0xb8, 0x6e, 0xe9, 0x5d, 0x5a, 0x2c, + 0x6c, 0xe6, 0xb7, 0xe6, 0x77, 0x37, 0x14, 0x6e, 0x57, 0x71, 0x6a, 0xe2, 0x95, 0x4f, 0xf9, 0x80, + 0x98, 0xb8, 0xf2, 0x8a, 0x13, 0x4b, 0xbf, 0x57, 0xbe, 0xc6, 0x3d, 0x84, 0xb5, 0x85, 0x27, 0x8a, + 0xb4, 0x79, 0xf7, 0x71, 0x15, 0xd7, 0xf4, 0x2e, 0x45, 0xcf, 0x01, 0xbc, 0x12, 0xaa, 0x9f, 0x66, + 0xd0, 0x36, 0xc1, 0xd4, 0x90, 0x68, 0x42, 0xbe, 0xbc, 0xa2, 0xd5, 0xcc, 0xf9, 0xae, 0x8b, 0xfa, + 0xc7, 0xec, 0x0d, 0x26, 0x5c, 0x83, 0xb3, 0x5e, 0xc8, 0xc5, 0xdc, 0xb0, 0x5c, 0xd7, 0x45, 0xae, + 0x4b, 0xd1, 0x5c, 0x91, 0x36, 0x23, 0xf2, 0x43, 0x7f, 0x72, 0x6c, 0xec, 0x75, 0x4d, 0x36, 0x51, + 0x6c, 0xb4, 0xe1, 0x12, 0xcf, 0xcd, 0xc4, 0x63, 0x82, 0x46, 0xcc, 0x1c, 0xd2, 0x16, 0xdc, 0x27, + 0x55, 0x2c, 0x0a, 0x65, 0xc0, 0x45, 0x9e, 0xaf, 0x53, 0x4d, 0xcb, 0xc4, 0x23, 0x40, 0xe3, 0x55, + 0x51, 0xae, 0xeb, 0xe1, 0x72, 0x09, 0xf5, 0x00, 0x1b, 0x97, 0xdd, 0xe7, 0xfb, 0x36, 0xab, 0x99, + 0x98, 0xa2, 0x96, 0x8b, 0x0d, 0xaf, 0x7e, 0x3e, 0x36, 0xee, 0xc3, 0x39, 0x5f, 0xbd, 0x08, 0x86, + 0x39, 0x2e, 0x0a, 0xc7, 0xcb, 0x31, 0xc7, 0x48, 0x9b, 0xf5, 0x9c, 0xa1, 0x6f, 0x00, 0x5c, 0x79, + 0xf0, 0x99, 0xde, 0xe6, 0xe9, 0x55, 0xb1, 0x46, 0x6c, 0x66, 0x84, 0x9b, 0x00, 0x86, 0x36, 0xa1, + 0x02, 0x97, 0x82, 0x9c, 0x9a, 0x06, 0x26, 0x96, 0xdb, 0xb9, 0xb9, 0x8a, 0x1c, 0x94, 0x35, 0x26, + 0x80, 0xb4, 0x05, 0x2f, 0x82, 0x0f, 0xdd, 0xdf, 0xff, 0xe4, 0xe0, 0x6a, 0x8d, 0xb6, 0x9c, 0x48, + 0xf6, 0xba, 0xfa, 0x01, 0xf3, 0xc2, 0xc9, 0x82, 0x9c, 0x3d, 0x38, 0xdd, 0x71, 0xa2, 0xa7, 0x02, + 0xc1, 0xaf, 0x2b, 0x49, 0x6c, 0xa7, 0x0c, 0x64, 0x5b, 0x29, 0x38, 0x75, 0xd2, 0x84, 0x72, 0xe4, + 0x2a, 0x38, 0x60, 0x3a, 0xdf, 0x55, 0x90, 0xbe, 0x80, 0xab, 0x49, 0x1d, 0x2f, 0x16, 0xdc, 0x74, + 0x6a, 0x99, 0x71, 0x7a, 0x2d, 0x1d, 0x45, 0x48, 0x5b, 0x09, 0x81, 0x88, 0xe7, 0x88, 0x7e, 0x00, + 0xf0, 0x7a, 0x52, 0x65, 0xc3, 0x7c, 0x13, 0x18, 0x1b, 0x0f, 0xdf, 0xc4, 0xed, 0x21, 0x6d, 0xd1, + 0x0b, 0x4c, 0x44, 0xf5, 0x35, 0x80, 0x52, 0xd0, 0x88, 0x7d, 0x9b, 0x9d, 0x01, 0x77, 0xef, 0x79, + 0x57, 0xd1, 0xc4, 0x23, 0xc3, 0xee, 0xb2, 0x68, 0x0b, 0x47, 0xdd, 0xf3, 0x1c, 0x5c, 0x1b, 0xac, + 0xcd, 0xbe, 0xcd, 0xb2, 0xc0, 0xee, 0xa3, 0x18, 0xec, 0xb6, 0x86, 0xc1, 0xce, 0xcb, 0x36, 0x86, + 0xbb, 0xcf, 0xe1, 0x95, 0x84, 0xa9, 0x21, 0xf8, 0xec, 0x93, 0xcc, 0xad, 0x90, 0x53, 0x07, 0x11, + 0xd2, 0x96, 0x83, 0x39, 0x24, 0x68, 0x2d, 0x42, 0x2c, 0x85, 0x61, 0xa8, 0x1f, 0x85, 0x58, 0xbe, + 0x07, 0xf0, 0x46, 0x62, 0x6d, 0x7d, 0xe0, 0xb5, 0x3d, 0xde, 0x08, 0x2e, 0x05, 0x38, 0x1f, 0x79, + 0xc7, 0xcc, 0x79, 0x2c, 0xe3, 0x91, 0x37, 0xfa, 0x2b, 0x07, 0x37, 0xc4, 0xc8, 0xe5, 0x71, 0x31, + 0xa3, 0x83, 0xcf, 0x42, 0x35, 0x99, 0x86, 0xd4, 0xf8, 0x09, 0x25, 0x98, 0xe7, 0xe3, 0x23, 0x94, + 0x24, 0x9b, 0x48, 0x5b, 0xf1, 0xf6, 0x84, 0x80, 0x50, 0x7e, 0x01, 0xf0, 0x66, 0x6a, 0x11, 0x2f, + 0x74, 0x8b, 0x41, 0xbf, 0xe6, 0x23, 0xfd, 0x7d, 0xe0, 0x9c, 0x9e, 0xe9, 0x4e, 0x67, 0xea, 0xef, + 0xbb, 0x03, 0x3c, 0xc4, 0xef, 0xec, 0x46, 0xbf, 0x57, 0x5e, 0x8b, 0x01, 0x33, 0x89, 0x86, 0x12, + 0x6b, 0x55, 0x98, 0xf4, 0xc6, 0x97, 0x42, 0x37, 0x97, 0x5e, 0x06, 0xdd, 0xa0, 0x1f, 0xa3, 0x18, + 0x8a, 0x36, 0xea, 0x02, 0x09, 0xe2, 0xb7, 0x3c, 0x2c, 0x8a, 0xbd, 0x2b, 0x16, 0xd7, 0x04, 0xf9, + 0x21, 0x61, 0x7f, 0xca, 0x67, 0xdc, 0x9f, 0x92, 0x16, 0xe1, 0xc2, 0x64, 0x17, 0xe1, 0xb4, 0xbd, + 0xe6, 0xd2, 0x4b, 0xda, 0x6b, 0x7e, 0x06, 0x70, 0x33, 0xad, 0x55, 0x17, 0xbb, 0xdb, 0xfc, 0x9d, + 0x83, 0x72, 0x28, 0xb2, 0x30, 0x41, 0x4e, 0x92, 0x86, 0x22, 0x23, 0x3c, 0x3f, 0x86, 0x11, 0xee, + 0x50, 0x84, 0x8f, 0x82, 0x10, 0x45, 0x14, 0xce, 0x47, 0x11, 0x09, 0x26, 0x91, 0xb6, 0x2c, 0xc0, + 0x15, 0x50, 0xc4, 0x4f, 0x00, 0xa2, 0xf4, 0x2a, 0x86, 0x39, 0x22, 0x0e, 0x7c, 0x30, 0x51, 0xe0, + 0xef, 0xfe, 0x3e, 0x03, 0xf3, 0x35, 0xda, 0x92, 0x1e, 0xc2, 0x59, 0xff, 0xdb, 0xc7, 0xcd, 0xe4, + 0x9d, 0x2f, 0xf4, 0x7a, 0x2f, 0xdf, 0x1a, 0x2a, 0xe2, 0xe7, 0xf4, 0x10, 0xce, 0xfa, 0x6f, 0xce, + 0xe9, 0x96, 0x3d, 0x91, 0x53, 0x2c, 0x0f, 0xbc, 0x3f, 0x52, 0xfe, 0xb2, 0x17, 0x7d, 0xc5, 0x7a, + 0x23, 0x55, 0x7f, 0x40, 0x56, 0xde, 0x1d, 0x5d, 0xd6, 0x77, 0x7a, 0xc4, 0x57, 0xfd, 0xd8, 0x86, + 0x7d, 0x7b, 0x54, 0x4b, 0xfb, 0x36, 0x93, 0xef, 0x66, 0x10, 0xf6, 0xfd, 0x7e, 0x05, 0xe0, 0xd5, + 0x94, 0x55, 0x4f, 0x3d, 0xb5, 0x19, 0x83, 0x0a, 0xf2, 0x5b, 0x19, 0x15, 0x12, 0x83, 0x88, 0xed, + 0x23, 0xc3, 0x83, 0x88, 0x2a, 0x8c, 0x10, 0x44, 0xca, 0x20, 0xfd, 0x16, 0xc0, 0xf5, 0x34, 0x3a, + 0xda, 0x3e, 0x15, 0x3d, 0x09, 0x1a, 0xf2, 0xdb, 0x59, 0x35, 0xfc, 0x38, 0xbe, 0x84, 0x6b, 0xc9, + 0xa3, 0x55, 0x19, 0x6a, 0x32, 0x22, 0x2f, 0xbf, 0x99, 0x4d, 0xde, 0x0b, 0xa0, 0x72, 0xef, 0xe9, + 0x71, 0x09, 0x3c, 0x3b, 0x2e, 0x81, 0xff, 0x8f, 0x4b, 0xe0, 0xbb, 0x93, 0xd2, 0xd4, 0xb3, 0x93, + 0xd2, 0xd4, 0xbf, 0x27, 0xa5, 0xa9, 0x4f, 0xb7, 0x43, 0x34, 0x21, 0x6c, 0xdf, 0x39, 0xd4, 0x1b, + 0xd4, 0xfb, 0xa1, 0x1e, 0xed, 0x6c, 0xab, 0x5d, 0xfe, 0x59, 0xd5, 0x25, 0x8d, 0xc6, 0xb4, 0xfb, + 0x19, 0xf4, 0xee, 0x8b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x26, 0x3c, 0x5b, 0xdf, 0x73, 0x15, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index 71930765188..21f6e6d5fe6 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -9,15 +9,15 @@ import ( tmcli "github.com/tendermint/tendermint/libs/cli" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" - gammtestutil "github.com/osmosis-labs/osmosis/v7/x/gamm/client/testutil" - "github.com/osmosis-labs/osmosis/v7/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptestutil "github.com/osmosis-labs/osmosis/v7/x/lockup/client/testutil" + "github.com/osmosis-labs/osmosis/v10/app" + gammtestutil "github.com/osmosis-labs/osmosis/v10/x/gamm/client/testutil" + "github.com/osmosis-labs/osmosis/v10/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptestutil "github.com/osmosis-labs/osmosis/v10/x/lockup/client/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 27a0afa89c8..6f33f7ed9bc 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 9d8b52a2094..8ea79478110 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go index 2ff1bc2c9a2..81ba4b48a48 100644 --- a/x/incentives/keeper/bench_test.go +++ b/x/incentives/keeper/bench_test.go @@ -9,9 +9,9 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index cad4970aac8..f25b233426c 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -6,8 +6,8 @@ import ( db "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index 59077e2fbf3..54745eb7026 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go index 124ed6b2948..ac465da4fe9 100644 --- a/x/incentives/keeper/export_test.go +++ b/x/incentives/keeper/export_test.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" ) // AddGaugeRefByKey appends the provided gauge ID into an array associated with the provided key. diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go index 0f1348d6a11..412ef436f69 100644 --- a/x/incentives/keeper/gauge.go +++ b/x/incentives/keeper/gauge.go @@ -10,9 +10,9 @@ import ( "github.com/gogo/protobuf/proto" db "github.com/tendermint/tm-db" - epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index e46fb22cbc7..45579973715 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go index c38b690955b..16b140667d7 100644 --- a/x/incentives/keeper/genesis.go +++ b/x/incentives/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" ) // InitGenesis initializes the incentives module's state from a provided genesis state. diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go index f48c3ed9fda..ea6a4b02ef6 100644 --- a/x/incentives/keeper/genesis_test.go +++ b/x/incentives/keeper/genesis_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v7/app" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // TestIncentivesExportGenesis tests export genesis command for the incentives module. diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index 106152cc0f3..becb8c53cd0 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -12,8 +12,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) var _ types.QueryServer = Querier{} diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index b458329e839..bd05e32bc54 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -8,9 +8,9 @@ import ( query "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - pooltypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + pooltypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go index d51d1447d50..0584fd52124 100644 --- a/x/incentives/keeper/hooks.go +++ b/x/incentives/keeper/hooks.go @@ -1,9 +1,9 @@ package keeper import ( - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go index ad95a0f1159..66fd09685f5 100644 --- a/x/incentives/keeper/iterator.go +++ b/x/incentives/keeper/iterator.go @@ -3,8 +3,8 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index 439e78f68fd..09c80d185a5 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -6,7 +6,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 3b4d80b81b1..a20a5f8f313 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" ) type KeeperTestSuite struct { diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index c83f5418b90..bfcffaf99e0 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -3,8 +3,8 @@ package keeper import ( "context" - "github.com/osmosis-labs/osmosis/v7/x/gamm/utils" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index 5975d785943..23b94c7e4a3 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/store.go b/x/incentives/keeper/store.go index c96b074955f..d325b760b29 100644 --- a/x/incentives/keeper/store.go +++ b/x/incentives/keeper/store.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index 5d71fd2a61c..793a47a9837 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go index 79efff15d48..9fd45f1af59 100644 --- a/x/incentives/keeper/utils.go +++ b/x/incentives/keeper/utils.go @@ -3,7 +3,7 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index c316e73724b..a2f5bfcd7d0 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/module.go b/x/incentives/module.go index 02824adc959..62b50e7ca52 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v7/x/incentives/simulation" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/simulation" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" ) var ( diff --git a/x/incentives/simulation/genesis.go b/x/incentives/simulation/genesis.go index a28a185b97d..d875dc5933f 100644 --- a/x/incentives/simulation/genesis.go +++ b/x/incentives/simulation/genesis.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" ) // Simulation parameter constants. diff --git a/x/incentives/simulation/operations.go b/x/incentives/simulation/operations.go index f1e656150eb..950cca38197 100644 --- a/x/incentives/simulation/operations.go +++ b/x/incentives/simulation/operations.go @@ -4,13 +4,13 @@ import ( "math/rand" "time" - osmo_simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index ddc26781e8a..e377908df79 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( time "time" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go index c1dd1b0193d..bb0f97d087c 100644 --- a/x/incentives/types/gauge.go +++ b/x/incentives/types/gauge.go @@ -3,7 +3,7 @@ package types import ( time "time" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go index 36e74c0af84..820d03b2610 100644 --- a/x/incentives/types/gauge.pb.go +++ b/x/incentives/types/gauge.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v10/x/lockup/types" io "io" math "math" math_bits "math/bits" @@ -203,40 +203,40 @@ func init() { proto.RegisterFile("osmosis/incentives/gauge.proto", fileDescripto var fileDescriptor_c0304e2bb0159901 = []byte{ // 545 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6a, 0xdb, 0x30, - 0x1c, 0xc7, 0xe3, 0x34, 0xe9, 0x3a, 0x25, 0x1d, 0x8b, 0xe8, 0xc0, 0x09, 0xcc, 0xc9, 0x32, 0x06, - 0xb9, 0x54, 0x5a, 0x3b, 0xc6, 0x60, 0xc7, 0x74, 0x63, 0x14, 0x06, 0xed, 0x42, 0x0f, 0x63, 0x17, - 0x23, 0xdb, 0x8a, 0x2b, 0x62, 0xfb, 0x67, 0x2c, 0x39, 0x34, 0x6f, 0xb0, 0x63, 0xd9, 0x69, 0xcf, - 0xb0, 0x27, 0xe9, 0xb1, 0xc7, 0x9d, 0xda, 0x91, 0xbc, 0xc1, 0x9e, 0x60, 0x58, 0xb2, 0x49, 0xc8, - 0xae, 0x3d, 0xc9, 0xfa, 0x7d, 0x7f, 0xff, 0xbe, 0x1f, 0x64, 0xe4, 0x80, 0x8c, 0x41, 0x0a, 0x49, - 0x45, 0xe2, 0xf3, 0x44, 0x89, 0x39, 0x97, 0x34, 0x64, 0x79, 0xc8, 0x49, 0x9a, 0x81, 0x02, 0x8c, - 0x4b, 0x9d, 0xac, 0xf5, 0xde, 0x41, 0x08, 0x21, 0x68, 0x99, 0x16, 0x5f, 0x26, 0xb3, 0xe7, 0x84, - 0x00, 0x61, 0xc4, 0xa9, 0xbe, 0x79, 0xf9, 0x94, 0x06, 0x79, 0xc6, 0x94, 0x80, 0xa4, 0xd4, 0xfb, - 0xdb, 0xba, 0x12, 0x31, 0x97, 0x8a, 0xc5, 0x69, 0xd5, 0xc0, 0xd7, 0xb3, 0xa8, 0xc7, 0x24, 0xa7, - 0xf3, 0x23, 0x8f, 0x2b, 0x76, 0x44, 0x7d, 0x10, 0x55, 0x83, 0x6e, 0xb5, 0x6a, 0x04, 0xfe, 0x2c, - 0x4f, 0xf5, 0x61, 0xa4, 0xe1, 0x8f, 0x06, 0x6a, 0x7e, 0x2a, 0xb6, 0xc6, 0x4f, 0x50, 0x5d, 0x04, - 0xb6, 0x35, 0xb0, 0x46, 0x8d, 0x49, 0x5d, 0x04, 0xf8, 0x05, 0x6a, 0x0b, 0xe9, 0xa6, 0x3c, 0x4b, - 0xb9, 0xca, 0x59, 0x64, 0xd7, 0x07, 0xd6, 0x68, 0x6f, 0xd2, 0x12, 0xf2, 0xbc, 0x0a, 0xe1, 0x53, - 0xb4, 0x1f, 0x08, 0xa9, 0x32, 0xe1, 0xe5, 0x8a, 0xbb, 0x0a, 0xec, 0x9d, 0x81, 0x35, 0x6a, 0x1d, - 0x3b, 0xa4, 0xb2, 0x6e, 0xe6, 0x91, 0x2f, 0x39, 0xcf, 0x16, 0x27, 0x90, 0x04, 0xa2, 0x70, 0x35, - 0x6e, 0xdc, 0xdc, 0xf5, 0x6b, 0x93, 0xf6, 0xba, 0xf4, 0x02, 0x30, 0x43, 0xcd, 0x62, 0x61, 0x69, - 0x37, 0x06, 0x3b, 0xa3, 0xd6, 0x71, 0x97, 0x18, 0x4b, 0xa4, 0xb0, 0x44, 0x4a, 0x4b, 0xe4, 0x04, - 0x44, 0x32, 0x7e, 0x5d, 0x54, 0xff, 0xba, 0xef, 0x8f, 0x42, 0xa1, 0x2e, 0x73, 0x8f, 0xf8, 0x10, - 0xd3, 0xd2, 0xbf, 0x39, 0x0e, 0x65, 0x30, 0xa3, 0x6a, 0x91, 0x72, 0xa9, 0x0b, 0xe4, 0xc4, 0x74, - 0xc6, 0x5f, 0x11, 0x92, 0x8a, 0x65, 0xca, 0x2d, 0xf0, 0xd9, 0x4d, 0xbd, 0x6a, 0x8f, 0x18, 0xb6, - 0xa4, 0x62, 0x4b, 0x2e, 0x2a, 0xb6, 0xe3, 0xe7, 0xc5, 0xa0, 0xbf, 0x77, 0xfd, 0xce, 0x82, 0xc5, - 0xd1, 0xfb, 0xe1, 0xba, 0x76, 0x78, 0x7d, 0xdf, 0xb7, 0x26, 0x8f, 0x75, 0xa0, 0x48, 0xc7, 0x14, - 0x1d, 0x24, 0x79, 0xec, 0xf2, 0x14, 0xfc, 0x4b, 0xe9, 0xa6, 0x4c, 0x04, 0x2e, 0xcc, 0x79, 0x66, - 0xef, 0x6a, 0x98, 0x9d, 0x24, 0x8f, 0x3f, 0x6a, 0xe9, 0x9c, 0x89, 0xe0, 0x6c, 0xce, 0x33, 0xfc, - 0x12, 0xed, 0x4f, 0x45, 0x14, 0xf1, 0xa0, 0xac, 0xb1, 0x1f, 0xe9, 0xcc, 0xb6, 0x09, 0x9a, 0x64, - 0x7c, 0x85, 0x3a, 0x6b, 0x44, 0x81, 0x6b, 0xf0, 0xec, 0x3d, 0x3c, 0x9e, 0xa7, 0x1b, 0x53, 0x74, - 0x64, 0xf8, 0xdd, 0x42, 0xcf, 0x3e, 0x83, 0x3f, 0x63, 0x5e, 0xc4, 0x3f, 0x94, 0x6f, 0x51, 0x9e, - 0x26, 0x53, 0xc0, 0x80, 0x70, 0x54, 0x0a, 0x6e, 0xf5, 0x4a, 0xa5, 0x6d, 0x95, 0x4b, 0x6d, 0xb3, - 0xac, 0x6a, 0xc7, 0xaf, 0x4a, 0x94, 0x5d, 0x83, 0xf2, 0xff, 0x16, 0xc3, 0x9f, 0x05, 0xd2, 0x4e, - 0xb4, 0x3d, 0x74, 0x7c, 0x76, 0xb3, 0x74, 0xac, 0xdb, 0xa5, 0x63, 0xfd, 0x59, 0x3a, 0xd6, 0xf5, - 0xca, 0xa9, 0xdd, 0xae, 0x9c, 0xda, 0xef, 0x95, 0x53, 0xfb, 0xf6, 0x76, 0xc3, 0x60, 0xf9, 0xde, - 0x0e, 0x23, 0xe6, 0xc9, 0xea, 0x42, 0xe7, 0xef, 0xe8, 0xd5, 0xe6, 0xcf, 0xa9, 0x3d, 0x7b, 0xbb, - 0x7a, 0xbb, 0x37, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xeb, 0x47, 0xca, 0xbf, 0x03, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x30, + 0x1c, 0xc7, 0x9b, 0xad, 0x1d, 0xc3, 0xed, 0x10, 0xb5, 0x86, 0x94, 0x56, 0x22, 0x2d, 0x45, 0x48, + 0xbd, 0xcc, 0x5e, 0x87, 0xc4, 0x81, 0x63, 0x07, 0x42, 0x93, 0x90, 0x28, 0xd5, 0x0e, 0x88, 0x4b, + 0xe4, 0x24, 0x6e, 0x66, 0x35, 0xc9, 0x2f, 0x8a, 0x9d, 0x6a, 0x7d, 0x03, 0x8e, 0x13, 0x27, 0x9e, + 0x81, 0x27, 0xd9, 0x71, 0x47, 0x4e, 0x1b, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0xb1, 0x13, 0xb5, 0x2a, + 0x57, 0x4e, 0x8e, 0x7f, 0xdf, 0xdf, 0xbf, 0xef, 0x47, 0x0e, 0x72, 0x40, 0xc6, 0x20, 0x85, 0xa4, + 0x22, 0xf1, 0x79, 0xa2, 0xc4, 0x82, 0x4b, 0x1a, 0xb2, 0x3c, 0xe4, 0x24, 0xcd, 0x40, 0x01, 0xc6, + 0xa5, 0x4e, 0x36, 0x7a, 0xf7, 0x38, 0x84, 0x10, 0xb4, 0x4c, 0x8b, 0x2f, 0x93, 0xd9, 0x75, 0x42, + 0x80, 0x30, 0xe2, 0x54, 0xdf, 0xbc, 0x7c, 0x46, 0x83, 0x3c, 0x63, 0x4a, 0x40, 0x52, 0xea, 0xbd, + 0x5d, 0x5d, 0x89, 0x98, 0x4b, 0xc5, 0xe2, 0xb4, 0x6a, 0xe0, 0xeb, 0x59, 0xd4, 0x63, 0x92, 0xd3, + 0xc5, 0xc8, 0xe3, 0x8a, 0x8d, 0xa8, 0x0f, 0xa2, 0x6a, 0xd0, 0xa9, 0x56, 0x8d, 0xc0, 0x9f, 0xe7, + 0xa9, 0x3e, 0x8c, 0x34, 0xf8, 0x5e, 0x47, 0x8d, 0x0f, 0xc5, 0xd6, 0xf8, 0x09, 0xda, 0x13, 0x81, + 0x6d, 0xf5, 0xad, 0x61, 0x7d, 0xba, 0x27, 0x02, 0xfc, 0x02, 0xb5, 0x84, 0x74, 0x53, 0x9e, 0xa5, + 0x5c, 0xe5, 0x2c, 0xb2, 0xf7, 0xfa, 0xd6, 0xf0, 0x70, 0xda, 0x14, 0x72, 0x52, 0x85, 0xf0, 0x05, + 0x3a, 0x0a, 0x84, 0x54, 0x99, 0xf0, 0x72, 0xc5, 0x5d, 0x05, 0xf6, 0x7e, 0xdf, 0x1a, 0x36, 0xcf, + 0x1c, 0x52, 0x59, 0x37, 0xf3, 0xc8, 0xe7, 0x9c, 0x67, 0xcb, 0x73, 0x48, 0x02, 0x51, 0xb8, 0x1a, + 0xd7, 0x6f, 0xef, 0x7b, 0xb5, 0x69, 0x6b, 0x53, 0x7a, 0x09, 0x98, 0xa1, 0x46, 0xb1, 0xb0, 0xb4, + 0xeb, 0xfd, 0xfd, 0x61, 0xf3, 0xac, 0x43, 0x8c, 0x25, 0x52, 0x58, 0x22, 0xa5, 0x25, 0x72, 0x0e, + 0x22, 0x19, 0x9f, 0x16, 0xd5, 0x3f, 0x1f, 0x7a, 0xc3, 0x50, 0xa8, 0xab, 0xdc, 0x23, 0x3e, 0xc4, + 0xb4, 0xf4, 0x6f, 0x8e, 0x13, 0x19, 0xcc, 0xa9, 0x5a, 0xa6, 0x5c, 0xea, 0x02, 0x39, 0x35, 0x9d, + 0xf1, 0x17, 0x84, 0xa4, 0x62, 0x99, 0x72, 0x0b, 0x7c, 0x76, 0x43, 0xaf, 0xda, 0x25, 0x86, 0x2d, + 0xa9, 0xd8, 0x92, 0xcb, 0x8a, 0xed, 0xf8, 0x79, 0x31, 0xe8, 0xcf, 0x7d, 0xaf, 0xbd, 0x64, 0x71, + 0xf4, 0x76, 0xb0, 0xa9, 0x1d, 0xdc, 0x3c, 0xf4, 0xac, 0xe9, 0x63, 0x1d, 0x28, 0xd2, 0x31, 0x45, + 0xc7, 0x49, 0x1e, 0xbb, 0x3c, 0x05, 0xff, 0x4a, 0xba, 0x29, 0x13, 0x81, 0x0b, 0x0b, 0x9e, 0xd9, + 0x07, 0x1a, 0x66, 0x3b, 0xc9, 0xe3, 0xf7, 0x5a, 0x9a, 0x30, 0x11, 0x7c, 0x5a, 0xf0, 0x0c, 0xbf, + 0x44, 0x47, 0x33, 0x11, 0x45, 0x3c, 0x28, 0x6b, 0xec, 0x47, 0x3a, 0xb3, 0x65, 0x82, 0x26, 0x19, + 0x5f, 0xa3, 0xf6, 0x06, 0x51, 0xe0, 0x1a, 0x3c, 0x87, 0xff, 0x1f, 0xcf, 0xd3, 0xad, 0x29, 0x3a, + 0x32, 0xf8, 0x66, 0xa1, 0x67, 0x1f, 0xc1, 0x9f, 0x33, 0x2f, 0xe2, 0xef, 0xca, 0xb7, 0x28, 0x2f, + 0x92, 0x19, 0x60, 0x40, 0x38, 0x2a, 0x05, 0xb7, 0x7a, 0xa5, 0xd2, 0xb6, 0xca, 0xa5, 0x76, 0x59, + 0x56, 0xb5, 0xe3, 0x57, 0x25, 0xca, 0x8e, 0x41, 0xf9, 0x6f, 0x8b, 0xc1, 0x8f, 0x02, 0x69, 0x3b, + 0xda, 0x1d, 0x3a, 0x9e, 0xdc, 0xae, 0x1c, 0xeb, 0x6e, 0xe5, 0x58, 0xbf, 0x57, 0x8e, 0x75, 0xb3, + 0x76, 0x6a, 0x77, 0x6b, 0xa7, 0xf6, 0x6b, 0xed, 0xd4, 0xbe, 0xbe, 0xd9, 0x32, 0x58, 0xbe, 0xb7, + 0x93, 0x88, 0x79, 0xb2, 0xba, 0xd0, 0xc5, 0xe8, 0x94, 0x5e, 0x6f, 0xff, 0x9d, 0xda, 0xb4, 0x77, + 0xa0, 0xd7, 0x7b, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x31, 0x6e, 0xbd, 0xc0, 0x03, 0x00, 0x00, } diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go index 0661e2378f7..e9870f5d8a4 100644 --- a/x/incentives/types/genesis.pb.go +++ b/x/incentives/types/genesis.pb.go @@ -110,29 +110,29 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/genesis.proto", fileDescriptor_a288ccc95d977d2d) } var fileDescriptor_a288ccc95d977d2d = []byte{ - // 339 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x86, 0x93, 0xb6, 0xea, 0x90, 0xc2, 0x80, 0xc5, 0x90, 0x76, 0x70, 0xa2, 0x48, 0x48, 0x5d, - 0xb0, 0xa5, 0x22, 0x54, 0xc4, 0x58, 0x21, 0x55, 0x4c, 0xa0, 0xb2, 0xb1, 0x54, 0x4e, 0x6b, 0x8c, - 0x45, 0x12, 0x57, 0x3d, 0xa7, 0xa2, 0x6f, 0xc1, 0x84, 0x78, 0xa4, 0x8e, 0x1d, 0x99, 0x0a, 0x6a, - 0xdf, 0x80, 0x27, 0x40, 0x71, 0x62, 0x81, 0xd4, 0x6e, 0x3e, 0xff, 0xdf, 0xfd, 0xf7, 0xdf, 0x79, - 0xa1, 0x82, 0x54, 0x81, 0x04, 0x2a, 0xb3, 0x09, 0xcf, 0xb4, 0x5c, 0x70, 0xa0, 0x82, 0x67, 0x1c, - 0x24, 0x90, 0xd9, 0x5c, 0x69, 0x85, 0x50, 0x45, 0x90, 0x3f, 0xa2, 0x73, 0x2a, 0x94, 0x50, 0x46, - 0xa6, 0xc5, 0xab, 0x24, 0x3b, 0x58, 0x28, 0x25, 0x12, 0x4e, 0x4d, 0x15, 0xe7, 0x4f, 0x74, 0x9a, - 0xcf, 0x99, 0x96, 0x2a, 0xab, 0xf4, 0xe0, 0xc0, 0xac, 0x19, 0x9b, 0xb3, 0x14, 0xac, 0xc1, 0xa1, - 0x30, 0x2c, 0x17, 0xbc, 0xd4, 0xa3, 0xf7, 0x9a, 0x77, 0x34, 0x2c, 0xc3, 0x3d, 0x68, 0xa6, 0x39, - 0xba, 0xf2, 0x9a, 0xa5, 0x81, 0xef, 0x86, 0x6e, 0xb7, 0xd5, 0xeb, 0x90, 0xfd, 0xb0, 0xe4, 0xde, - 0x10, 0x83, 0xc6, 0x6a, 0x13, 0x38, 0xa3, 0x8a, 0x47, 0x7d, 0xaf, 0x69, 0x9c, 0xc1, 0xaf, 0x85, - 0xf5, 0x6e, 0xab, 0xd7, 0x3e, 0xd4, 0x39, 0x2c, 0x08, 0xdb, 0x58, 0xe2, 0x48, 0x79, 0x28, 0x51, - 0x93, 0x17, 0x16, 0x27, 0x7c, 0x6c, 0xf7, 0x03, 0xbf, 0x5e, 0x99, 0x94, 0x17, 0x20, 0xf6, 0x02, - 0xe4, 0xa6, 0x22, 0x06, 0x67, 0x85, 0xc9, 0xcf, 0x26, 0x68, 0x2f, 0x59, 0x9a, 0x5c, 0x47, 0xfb, - 0x16, 0xd1, 0xc7, 0x57, 0xe0, 0x8e, 0x4e, 0xac, 0x60, 0x1b, 0x01, 0x45, 0xde, 0x71, 0xc2, 0x40, - 0x8f, 0xcd, 0xfc, 0xb1, 0x9c, 0xfa, 0x8d, 0xd0, 0xed, 0x36, 0x46, 0xad, 0xe2, 0xd3, 0x04, 0xbc, - 0x9d, 0x0e, 0xee, 0x56, 0x5b, 0xec, 0xae, 0xb7, 0xd8, 0xfd, 0xde, 0x62, 0xf7, 0x6d, 0x87, 0x9d, - 0xf5, 0x0e, 0x3b, 0x9f, 0x3b, 0xec, 0x3c, 0x5e, 0x0a, 0xa9, 0x9f, 0xf3, 0x98, 0x4c, 0x54, 0x4a, - 0xab, 0x0d, 0xcf, 0x13, 0x16, 0x83, 0x2d, 0xe8, 0xa2, 0x4f, 0x5f, 0xff, 0xdf, 0x5b, 0x2f, 0x67, - 0x1c, 0xe2, 0xa6, 0xd9, 0xe0, 0xe2, 0x37, 0x00, 0x00, 0xff, 0xff, 0x51, 0x99, 0x95, 0x16, 0x1f, - 0x02, 0x00, 0x00, + // 342 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xfb, 0x30, + 0x10, 0xc6, 0x93, 0xb6, 0xea, 0x90, 0xfe, 0xff, 0x03, 0x16, 0x43, 0xda, 0xc1, 0x89, 0x22, 0x21, + 0x75, 0xc1, 0x86, 0x22, 0x01, 0x62, 0xac, 0x90, 0x2a, 0xb6, 0xaa, 0x6c, 0x2c, 0x95, 0xd3, 0x1a, + 0x63, 0x91, 0xc4, 0x55, 0xcf, 0xa9, 0xe8, 0x5b, 0x30, 0x21, 0x1e, 0xa9, 0x63, 0x47, 0xa6, 0x82, + 0xda, 0x37, 0xe0, 0x09, 0x50, 0x9c, 0x58, 0x20, 0xb5, 0x9b, 0xcf, 0xdf, 0xef, 0xbe, 0xfb, 0xee, + 0xbc, 0x50, 0x41, 0xaa, 0x40, 0x02, 0x95, 0xd9, 0x84, 0x67, 0x5a, 0x2e, 0x38, 0x50, 0xc1, 0x33, + 0x0e, 0x12, 0xc8, 0x6c, 0xae, 0xb4, 0x42, 0xa8, 0x22, 0xc8, 0x2f, 0xd1, 0x39, 0x16, 0x4a, 0x28, + 0x23, 0xd3, 0xe2, 0x55, 0x92, 0x1d, 0x2c, 0x94, 0x12, 0x09, 0xa7, 0xa6, 0x8a, 0xf3, 0x47, 0x3a, + 0xcd, 0xe7, 0x4c, 0x4b, 0x95, 0x55, 0x7a, 0x70, 0x60, 0xd6, 0x8c, 0xcd, 0x59, 0x0a, 0xd6, 0xe0, + 0x50, 0x18, 0x96, 0x0b, 0x5e, 0xea, 0xd1, 0x5b, 0xcd, 0xfb, 0x37, 0x28, 0xc3, 0xdd, 0x6b, 0xa6, + 0x39, 0xba, 0xf6, 0x9a, 0xa5, 0x81, 0xef, 0x86, 0x6e, 0xb7, 0xd5, 0xeb, 0x90, 0xfd, 0xb0, 0x64, + 0x68, 0x88, 0x7e, 0x63, 0xb5, 0x09, 0x9c, 0x51, 0xc5, 0xa3, 0x2b, 0xaf, 0x69, 0x9c, 0xc1, 0xaf, + 0x85, 0xf5, 0x6e, 0xab, 0xd7, 0x3e, 0xd4, 0x39, 0x28, 0x08, 0xdb, 0x58, 0xe2, 0x48, 0x79, 0x28, + 0x51, 0x93, 0x67, 0x16, 0x27, 0x7c, 0x6c, 0xf7, 0x03, 0xbf, 0x5e, 0x99, 0x94, 0x17, 0x20, 0xf6, + 0x02, 0xe4, 0xb6, 0x22, 0xfa, 0x27, 0x85, 0xc9, 0xf7, 0x26, 0x68, 0x2f, 0x59, 0x9a, 0xdc, 0x44, + 0xfb, 0x16, 0xd1, 0xfb, 0x67, 0xe0, 0x8e, 0x8e, 0xac, 0x60, 0x1b, 0x01, 0x45, 0xde, 0xff, 0x84, + 0x81, 0x1e, 0x9b, 0xf9, 0x63, 0x39, 0xf5, 0x1b, 0xa1, 0xdb, 0x6d, 0x8c, 0x5a, 0xc5, 0xa7, 0x09, + 0x78, 0x37, 0xed, 0x0f, 0x57, 0x5b, 0xec, 0xae, 0xb7, 0xd8, 0xfd, 0xda, 0x62, 0xf7, 0x75, 0x87, + 0x9d, 0xf5, 0x0e, 0x3b, 0x1f, 0x3b, 0xec, 0x3c, 0x5c, 0x0a, 0xa9, 0x9f, 0xf2, 0x98, 0x4c, 0x54, + 0x4a, 0xab, 0x0d, 0x4f, 0x13, 0x16, 0x83, 0x2d, 0xe8, 0xe2, 0xfc, 0x8c, 0xbe, 0xfc, 0x3d, 0xb8, + 0x5e, 0xce, 0x38, 0xc4, 0x4d, 0xb3, 0xc2, 0xc5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0xb4, + 0xd0, 0x4a, 0x20, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index a9b61de5dfd..4873cb9f174 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -4,7 +4,7 @@ import ( "errors" "time" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go index 4ef99c55b71..cc906cd5ac5 100644 --- a/x/incentives/types/msgs_test.go +++ b/x/incentives/types/msgs_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index b9e5a8fa145..c5956b0bd8e 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -1,7 +1,7 @@ package types import ( - epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go index ba4e8aed481..d0ffe0e001a 100644 --- a/x/incentives/types/params.pb.go +++ b/x/incentives/types/params.pb.go @@ -77,7 +77,7 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/params.proto", fileDescriptor_1cc8b460d089f845) } var fileDescriptor_1cc8b460d089f845 = []byte{ - // 206 bytes of a gzipped FileDescriptorProto + // 207 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, @@ -85,12 +85,12 @@ var fileDescriptor_1cc8b460d089f845 = []byte{ 0x89, 0x5c, 0x6c, 0x01, 0x60, 0x9d, 0x42, 0xe1, 0x5c, 0x62, 0x29, 0x99, 0xc5, 0x25, 0x45, 0xf1, 0xa9, 0x05, 0xf9, 0xc9, 0x19, 0xf1, 0x99, 0x29, 0x20, 0x8d, 0x69, 0x99, 0xa9, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x8a, 0x9f, 0xee, 0xc9, 0xcb, 0x56, 0x26, 0xe6, 0xe6, 0x58, 0x29, - 0x61, 0x57, 0xa7, 0x14, 0x24, 0x02, 0x96, 0x70, 0x05, 0x89, 0x7b, 0xc2, 0x85, 0x9d, 0xfc, 0x4f, + 0x61, 0x57, 0xa7, 0x14, 0x24, 0x02, 0x96, 0x70, 0x05, 0x89, 0x7b, 0xc2, 0x85, 0x9d, 0x02, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, - 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x34, 0x3d, 0xb3, 0x24, 0xa3, 0x34, + 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x2c, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x62, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, - 0xcc, 0x5c, 0xbf, 0x02, 0xd9, 0x93, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xa7, 0x1b, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x27, 0x6e, 0x20, 0x07, 0x01, 0x00, 0x00, + 0xcc, 0xd0, 0x40, 0xbf, 0x02, 0xd9, 0x97, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xb7, + 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xad, 0x8e, 0x18, 0x08, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go index 846c7f939a3..30394a462c8 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -14,7 +14,7 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + _ "github.com/osmosis-labs/osmosis/v10/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1019,76 +1019,77 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/query.proto", fileDescriptor_8124258a89427f98) } var fileDescriptor_8124258a89427f98 = []byte{ - // 1103 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xc7, 0x33, 0x4e, 0x52, 0x9a, 0x87, 0x36, 0x34, 0x43, 0x28, 0x89, 0xdb, 0xae, 0xcd, 0xaa, - 0x4d, 0xdd, 0x94, 0xec, 0xc6, 0x76, 0x93, 0x20, 0xde, 0x24, 0x8c, 0x4b, 0xa9, 0x04, 0xa2, 0xac, - 0x40, 0x48, 0x48, 0x68, 0xb5, 0xf6, 0x0e, 0xdb, 0x55, 0xec, 0x1d, 0xd7, 0xb3, 0x9b, 0x60, 0x45, - 0xb9, 0x00, 0xe7, 0x0a, 0x44, 0x54, 0x71, 0xe8, 0x27, 0xe0, 0x08, 0x12, 0x37, 0x38, 0x70, 0xea, - 0xb1, 0x12, 0x17, 0x4e, 0x29, 0x4a, 0xf8, 0x04, 0xfd, 0x04, 0x68, 0x67, 0x66, 0xfd, 0xba, 0x5e, - 0x3b, 0x88, 0x46, 0x39, 0x39, 0x93, 0xe7, 0xed, 0xf7, 0x3c, 0x1e, 0xcf, 0xff, 0x01, 0x85, 0xb2, - 0x3a, 0x65, 0x2e, 0xd3, 0x5d, 0xaf, 0x4a, 0x3c, 0xdf, 0xdd, 0x22, 0x4c, 0xbf, 0x17, 0x90, 0x66, - 0x4b, 0x6b, 0x34, 0xa9, 0x4f, 0x31, 0x96, 0x76, 0xad, 0x63, 0x4f, 0xcf, 0x3b, 0xd4, 0xa1, 0xdc, - 0xac, 0x87, 0x7f, 0x09, 0xcf, 0xf4, 0x45, 0x87, 0x52, 0xa7, 0x46, 0x74, 0xab, 0xe1, 0xea, 0x96, - 0xe7, 0x51, 0xdf, 0xf2, 0x5d, 0xea, 0x31, 0x69, 0x55, 0xa4, 0x95, 0x9f, 0x2a, 0xc1, 0x97, 0xba, - 0x1d, 0x34, 0xb9, 0x43, 0x64, 0xaf, 0xf2, 0x42, 0x7a, 0xc5, 0x62, 0x44, 0xdf, 0xca, 0x57, 0x88, - 0x6f, 0xe5, 0xf5, 0x2a, 0x75, 0x23, 0xfb, 0x72, 0xb7, 0x9d, 0x03, 0xb6, 0xbd, 0x1a, 0x96, 0xe3, - 0x7a, 0x3d, 0xb9, 0x62, 0x7a, 0x72, 0xac, 0xc0, 0x21, 0xd2, 0xbe, 0x18, 0xd9, 0x6b, 0xb4, 0xba, - 0x19, 0x34, 0xf8, 0x87, 0x30, 0xa9, 0x59, 0x50, 0x3e, 0xa4, 0x76, 0x50, 0x23, 0x9f, 0xd0, 0xb2, - 0xcb, 0xfc, 0xa6, 0x5b, 0x09, 0x7c, 0xf2, 0x2e, 0x75, 0x3d, 0x66, 0x90, 0x7b, 0x01, 0x61, 0xbe, - 0xfa, 0x2d, 0x82, 0xcc, 0x50, 0x17, 0xd6, 0xa0, 0x1e, 0x23, 0xd8, 0x82, 0xe9, 0x10, 0x9d, 0x2d, - 0xa0, 0xec, 0x64, 0xee, 0xf9, 0xc2, 0xa2, 0x26, 0xe0, 0xb5, 0x10, 0x5e, 0x93, 0xd8, 0x5a, 0x18, - 0x52, 0x5a, 0x7d, 0xb4, 0x9f, 0x99, 0xf8, 0xe9, 0x49, 0x26, 0xe7, 0xb8, 0xfe, 0xdd, 0xa0, 0xa2, - 0x55, 0x69, 0x5d, 0x97, 0x9d, 0x8a, 0x8f, 0x15, 0x66, 0x6f, 0xea, 0x7e, 0xab, 0x41, 0x98, 0x26, - 0x6a, 0x88, 0xcc, 0x6a, 0x06, 0x2e, 0x09, 0x8a, 0x0e, 0x83, 0xdd, 0xc3, 0xf9, 0x0d, 0x8a, 0x5a, - 0x19, 0xf4, 0x38, 0x3e, 0x4c, 0x15, 0xce, 0xdd, 0x0a, 0x27, 0x5f, 0x6a, 0xdd, 0x2e, 0x4b, 0x32, - 0x3c, 0x0b, 0x29, 0xd7, 0x5e, 0x40, 0x59, 0x94, 0x9b, 0x32, 0x52, 0xae, 0xad, 0x96, 0x61, 0xae, - 0xcb, 0x47, 0xb2, 0xe9, 0x30, 0xcd, 0xbf, 0x32, 0xee, 0x17, 0xb2, 0x0d, 0xde, 0x43, 0x8d, 0x47, - 0x19, 0xc2, 0x4f, 0xfd, 0x0c, 0xce, 0xf2, 0x73, 0x34, 0x00, 0xfc, 0x1e, 0x40, 0xe7, 0x66, 0xc8, - 0x34, 0x4b, 0x3d, 0x2d, 0x8a, 0x7b, 0x1e, 0x35, 0x7a, 0xc7, 0x72, 0x88, 0x8c, 0x35, 0xba, 0x22, - 0xd5, 0xfb, 0x08, 0x66, 0xa3, 0xcc, 0x12, 0xae, 0x08, 0x53, 0xb6, 0xe5, 0x5b, 0xed, 0xb9, 0x0d, - 0x63, 0x2b, 0x4d, 0x85, 0x73, 0x33, 0xb8, 0x33, 0xbe, 0xd5, 0xc3, 0x93, 0xe2, 0x3c, 0x57, 0x47, - 0xf2, 0x88, 0x8a, 0x3d, 0x40, 0x5f, 0xc0, 0x8b, 0xef, 0x54, 0xc3, 0x2a, 0xcf, 0xa6, 0xdf, 0x3d, - 0x04, 0xf3, 0xbd, 0xf9, 0x4f, 0x44, 0xd7, 0x3b, 0x70, 0xa1, 0x9b, 0xea, 0x0e, 0x69, 0x96, 0x89, - 0x47, 0xeb, 0x51, 0xf7, 0xf3, 0x30, 0x6d, 0x87, 0x67, 0xde, 0xf8, 0x8c, 0x21, 0x0e, 0x7d, 0x33, - 0x49, 0xfd, 0xe7, 0x99, 0x3c, 0x44, 0x70, 0x31, 0xbe, 0xfa, 0x89, 0x98, 0x8d, 0x09, 0x2f, 0x7d, - 0xda, 0xa8, 0xd2, 0xba, 0xeb, 0x39, 0xcf, 0xe6, 0x4e, 0x3c, 0x40, 0x70, 0xbe, 0xbf, 0xc2, 0x89, - 0xe8, 0x7c, 0x17, 0x2e, 0xf5, 0x72, 0x1d, 0xef, 0xbd, 0xf8, 0x05, 0x81, 0x32, 0xac, 0xbe, 0x9c, - 0xcf, 0xfb, 0xf0, 0x42, 0x20, 0x3d, 0x4c, 0xfe, 0x52, 0xb1, 0x71, 0x47, 0x35, 0x1b, 0xf4, 0x64, - 0xfe, 0xff, 0x86, 0xc6, 0x60, 0xce, 0x20, 0xdb, 0x56, 0xd3, 0x66, 0x37, 0x99, 0x1f, 0x0d, 0x6a, - 0x09, 0xa6, 0xe9, 0xb6, 0x47, 0x9a, 0x62, 0x50, 0xa5, 0x73, 0x4f, 0xf7, 0x33, 0x67, 0x5a, 0x56, - 0xbd, 0xf6, 0xba, 0xca, 0xff, 0xad, 0x1a, 0xc2, 0x8c, 0x17, 0xe1, 0x74, 0xa8, 0x97, 0xa6, 0x6b, - 0xb3, 0x85, 0x54, 0x76, 0x32, 0x37, 0x65, 0x3c, 0x17, 0x9e, 0x6f, 0xdb, 0x0c, 0x5f, 0x80, 0x19, - 0xe2, 0xd9, 0x26, 0x69, 0xd0, 0xea, 0xdd, 0x85, 0xc9, 0x2c, 0xca, 0x4d, 0x1a, 0xa7, 0x89, 0x67, - 0xdf, 0x0c, 0xcf, 0xea, 0x36, 0xe0, 0xee, 0xa2, 0xc7, 0xaa, 0x94, 0x1f, 0x87, 0x73, 0xf9, 0x80, - 0x56, 0x37, 0xad, 0x4a, 0x8d, 0x94, 0xe5, 0xe2, 0xd1, 0x56, 0xca, 0xef, 0x11, 0x28, 0xc3, 0x3c, - 0x24, 0x26, 0x05, 0x5c, 0x93, 0x46, 0x33, 0x5a, 0x5c, 0x3a, 0xcc, 0x62, 0xb5, 0xd1, 0xa2, 0xd5, - 0x46, 0x8b, 0xe2, 0x4b, 0x57, 0x42, 0xe6, 0xa7, 0xfb, 0x99, 0x45, 0x31, 0xc8, 0xc1, 0x14, 0xea, - 0x8f, 0x4f, 0x32, 0xc8, 0x98, 0xab, 0xf5, 0x17, 0x2e, 0x3c, 0x38, 0x0b, 0xd3, 0x9c, 0x09, 0xff, - 0x81, 0xe0, 0xe5, 0x21, 0xfb, 0x06, 0x2e, 0xc4, 0x5d, 0xa1, 0xe4, 0xfd, 0x25, 0x5d, 0x3c, 0x52, - 0x8c, 0xe8, 0x5f, 0x7d, 0xfb, 0xeb, 0x3f, 0xff, 0xf9, 0x21, 0xf5, 0x1a, 0x5e, 0xd7, 0x63, 0x56, - 0xab, 0x68, 0x0f, 0xab, 0xf3, 0x24, 0xa6, 0x4f, 0x4d, 0xbb, 0x9d, 0xc6, 0xe4, 0xdf, 0x01, 0xfe, - 0x0d, 0xc1, 0xf9, 0xf8, 0x65, 0x04, 0xe7, 0x87, 0xf3, 0x0c, 0x59, 0x6d, 0xd2, 0x85, 0xa3, 0x84, - 0xc8, 0x0e, 0xde, 0xe4, 0x1d, 0xac, 0xe3, 0x1b, 0x63, 0x74, 0xd0, 0xc1, 0xb7, 0x25, 0xff, 0x7d, - 0x04, 0x33, 0xed, 0x1d, 0x05, 0x5f, 0x1e, 0xfe, 0xcb, 0xed, 0xac, 0x39, 0xe9, 0x2b, 0x23, 0xbc, - 0x24, 0xd8, 0x0d, 0x0e, 0xa6, 0xe1, 0x57, 0x93, 0xc0, 0xf8, 0xc3, 0x61, 0x56, 0x5a, 0xa6, 0x6b, - 0xeb, 0x3b, 0xae, 0xbd, 0x8b, 0x77, 0xe0, 0x94, 0x7c, 0x15, 0x5e, 0x19, 0x5a, 0xa6, 0x3d, 0x2f, - 0x35, 0xc9, 0x45, 0x62, 0x2c, 0x73, 0x8c, 0xcb, 0x58, 0x1d, 0x89, 0xc1, 0xf0, 0x1e, 0x82, 0x33, - 0xdd, 0x6a, 0x88, 0xaf, 0xc6, 0x15, 0x88, 0xd9, 0x51, 0xd2, 0xb9, 0xd1, 0x8e, 0x92, 0x27, 0xcf, - 0x79, 0xae, 0xe3, 0x6b, 0x49, 0x3c, 0x16, 0x8f, 0x94, 0xcf, 0x2a, 0xfe, 0xb5, 0x6f, 0x71, 0x89, - 0x9e, 0x62, 0xac, 0x8f, 0xaa, 0xda, 0x27, 0x1a, 0xe9, 0xd5, 0xf1, 0x03, 0x24, 0xee, 0x1b, 0x1c, - 0x77, 0x0d, 0x17, 0xc7, 0xc6, 0x35, 0x1b, 0xa4, 0x69, 0x0a, 0x35, 0x7a, 0x88, 0x60, 0xb6, 0x57, - 0x45, 0xf0, 0xb5, 0x38, 0x82, 0x58, 0x8d, 0x4f, 0x2f, 0x8f, 0xe3, 0x2a, 0x31, 0x8b, 0x1c, 0x73, - 0x05, 0x5f, 0x4f, 0xc2, 0xec, 0x93, 0x2b, 0xfc, 0xfb, 0x80, 0xf8, 0xb7, 0x27, 0x9b, 0x1f, 0x5d, - 0xbb, 0x7f, 0xb6, 0x85, 0xa3, 0x84, 0x48, 0xec, 0xb7, 0x38, 0xf6, 0x06, 0x5e, 0x3b, 0x02, 0x76, - 0xd7, 0x7c, 0xf7, 0x10, 0x40, 0x47, 0x7b, 0x70, 0xec, 0x0f, 0x73, 0x40, 0x10, 0xd3, 0x4b, 0xa3, - 0xdc, 0x24, 0xdc, 0x06, 0x87, 0xcb, 0x63, 0x3d, 0x09, 0xae, 0x29, 0xe2, 0x4c, 0xc2, 0x7c, 0x7d, - 0x87, 0x0b, 0xe9, 0x2e, 0xfe, 0x19, 0xc1, 0xdc, 0x80, 0xe4, 0xc4, 0x8f, 0x34, 0x51, 0xc0, 0xe2, - 0x47, 0x9a, 0xac, 0x68, 0xea, 0x3a, 0xa7, 0x5e, 0xc5, 0x5a, 0x12, 0xf5, 0xa0, 0x60, 0x95, 0x3e, - 0x7a, 0x74, 0xa0, 0xa0, 0xc7, 0x07, 0x0a, 0xfa, 0xfb, 0x40, 0x41, 0xdf, 0x1d, 0x2a, 0x13, 0x8f, - 0x0f, 0x95, 0x89, 0xbf, 0x0e, 0x95, 0x89, 0xcf, 0xd7, 0xba, 0x84, 0x59, 0xe6, 0x5c, 0xa9, 0x59, - 0x15, 0xd6, 0x2e, 0xb0, 0xb5, 0xa1, 0x7f, 0xd5, 0x5d, 0x85, 0x6b, 0x75, 0xe5, 0x14, 0x97, 0xcd, - 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0x04, 0x4d, 0xb2, 0x89, 0x10, 0x00, 0x00, + // 1105 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x4f, 0x6f, 0x1b, 0xc5, + 0x1b, 0xc7, 0x33, 0x4e, 0xdc, 0x5f, 0xf3, 0xfc, 0xda, 0xd0, 0x0c, 0xa1, 0x24, 0x6e, 0xbb, 0x36, + 0xab, 0x36, 0x75, 0x53, 0xb2, 0x1b, 0xdb, 0x6d, 0x8a, 0xf8, 0x27, 0x61, 0x5c, 0x4a, 0x25, 0x90, + 0xc2, 0x0a, 0x84, 0x84, 0x84, 0x56, 0x6b, 0xef, 0xb0, 0x5d, 0xc5, 0xde, 0x71, 0x3d, 0xbb, 0x09, + 0x56, 0x94, 0x0b, 0x70, 0xae, 0x40, 0x44, 0x15, 0x87, 0xbe, 0x02, 0x8e, 0x20, 0x71, 0x83, 0x03, + 0xa7, 0x1e, 0x2b, 0x71, 0xe1, 0x94, 0xa2, 0x84, 0x57, 0xd0, 0x57, 0x80, 0x76, 0x66, 0xd6, 0x7f, + 0xd7, 0x6b, 0x07, 0xd1, 0x28, 0x27, 0x67, 0xf2, 0xfc, 0xfb, 0x3c, 0x8f, 0xc7, 0xf3, 0x7d, 0x40, + 0xa1, 0xac, 0x41, 0x99, 0xcb, 0x74, 0xd7, 0xab, 0x11, 0xcf, 0x77, 0xb7, 0x08, 0xd3, 0xef, 0x07, + 0xa4, 0xd5, 0xd6, 0x9a, 0x2d, 0xea, 0x53, 0x8c, 0xa5, 0x5d, 0xeb, 0xda, 0x33, 0x0b, 0x0e, 0x75, + 0x28, 0x37, 0xeb, 0xe1, 0x5f, 0xc2, 0x33, 0x73, 0xd1, 0xa1, 0xd4, 0xa9, 0x13, 0xdd, 0x6a, 0xba, + 0xba, 0xe5, 0x79, 0xd4, 0xb7, 0x7c, 0x97, 0x7a, 0x4c, 0x5a, 0x15, 0x69, 0xe5, 0xa7, 0x6a, 0xf0, + 0x85, 0x6e, 0x07, 0x2d, 0xee, 0x10, 0xd9, 0x6b, 0xbc, 0x90, 0x5e, 0xb5, 0x18, 0xd1, 0xb7, 0x0a, + 0x55, 0xe2, 0x5b, 0x05, 0xbd, 0x46, 0xdd, 0xc8, 0xbe, 0xd2, 0x6b, 0xe7, 0x80, 0x1d, 0xaf, 0xa6, + 0xe5, 0xb8, 0x5e, 0x5f, 0xae, 0x98, 0x9e, 0x1c, 0x2b, 0x70, 0x88, 0xb4, 0x2f, 0x45, 0xf6, 0x3a, + 0xad, 0x6d, 0x06, 0x4d, 0xfe, 0x21, 0x4c, 0x6a, 0x0e, 0x94, 0x0f, 0xa9, 0x1d, 0xd4, 0xc9, 0xc7, + 0xb4, 0xe2, 0x32, 0xbf, 0xe5, 0x56, 0x03, 0x9f, 0xbc, 0x4b, 0x5d, 0x8f, 0x19, 0xe4, 0x7e, 0x40, + 0x98, 0xaf, 0x7e, 0x83, 0x20, 0x3b, 0xd2, 0x85, 0x35, 0xa9, 0xc7, 0x08, 0xb6, 0x20, 0x1d, 0xa2, + 0xb3, 0x45, 0x94, 0x9b, 0xce, 0xff, 0xbf, 0xb8, 0xa4, 0x09, 0x78, 0x2d, 0x84, 0xd7, 0x24, 0xb6, + 0x16, 0x86, 0x94, 0xd7, 0x1e, 0xef, 0x67, 0xa7, 0x7e, 0x7c, 0x9a, 0xcd, 0x3b, 0xae, 0x7f, 0x2f, + 0xa8, 0x6a, 0x35, 0xda, 0xd0, 0x65, 0xa7, 0xe2, 0x63, 0x95, 0xd9, 0x9b, 0xba, 0xdf, 0x6e, 0x12, + 0xa6, 0x89, 0x1a, 0x22, 0xb3, 0x9a, 0x85, 0x4b, 0x82, 0xa2, 0xcb, 0x60, 0xf7, 0x71, 0x7e, 0x8d, + 0xa2, 0x56, 0x86, 0x3d, 0x8e, 0x0f, 0x53, 0x85, 0x73, 0x77, 0xc2, 0xc9, 0x97, 0xdb, 0x77, 0x2b, + 0x92, 0x0c, 0xcf, 0x41, 0xca, 0xb5, 0x17, 0x51, 0x0e, 0xe5, 0x67, 0x8c, 0x94, 0x6b, 0xab, 0x15, + 0x98, 0xef, 0xf1, 0x91, 0x6c, 0x3a, 0xa4, 0xf9, 0x57, 0xc6, 0xfd, 0x42, 0xb6, 0xe1, 0x7b, 0xa8, + 0xf1, 0x28, 0x43, 0xf8, 0xa9, 0x9f, 0xc2, 0x59, 0x7e, 0x8e, 0x06, 0x80, 0xdf, 0x03, 0xe8, 0xde, + 0x0c, 0x99, 0x66, 0xb9, 0xaf, 0x45, 0x71, 0xcf, 0xa3, 0x46, 0x37, 0x2c, 0x87, 0xc8, 0x58, 0xa3, + 0x27, 0x52, 0x7d, 0x80, 0x60, 0x2e, 0xca, 0x2c, 0xe1, 0x4a, 0x30, 0x63, 0x5b, 0xbe, 0xd5, 0x99, + 0xdb, 0x28, 0xb6, 0xf2, 0x4c, 0x38, 0x37, 0x83, 0x3b, 0xe3, 0x3b, 0x7d, 0x3c, 0x29, 0xce, 0x73, + 0x75, 0x2c, 0x8f, 0xa8, 0xd8, 0x07, 0xf4, 0x39, 0xbc, 0xf8, 0x4e, 0x2d, 0xac, 0xf2, 0x7c, 0xfa, + 0xdd, 0x43, 0xb0, 0xd0, 0x9f, 0xff, 0x44, 0x74, 0xbd, 0x03, 0x17, 0x7a, 0xa9, 0x36, 0x48, 0xab, + 0x42, 0x3c, 0xda, 0x88, 0xba, 0x5f, 0x80, 0xb4, 0x1d, 0x9e, 0x79, 0xe3, 0xb3, 0x86, 0x38, 0x0c, + 0xcc, 0x24, 0xf5, 0xaf, 0x67, 0xf2, 0x08, 0xc1, 0xc5, 0xf8, 0xea, 0x27, 0x62, 0x36, 0x26, 0xbc, + 0xf4, 0x49, 0xb3, 0x46, 0x1b, 0xae, 0xe7, 0x3c, 0x9f, 0x3b, 0xf1, 0x10, 0xc1, 0xf9, 0xc1, 0x0a, + 0x27, 0xa2, 0xf3, 0x5d, 0xb8, 0xd4, 0xcf, 0x75, 0xbc, 0xf7, 0xe2, 0x67, 0x04, 0xca, 0xa8, 0xfa, + 0x72, 0x3e, 0xef, 0xc3, 0x0b, 0x81, 0xf4, 0x30, 0xf9, 0x4b, 0xc5, 0x26, 0x1d, 0xd5, 0x5c, 0xd0, + 0x97, 0xf9, 0xbf, 0x1b, 0x1a, 0x83, 0x79, 0x83, 0x6c, 0x5b, 0x2d, 0x9b, 0xdd, 0x66, 0x7e, 0x34, + 0xa8, 0x65, 0x48, 0xd3, 0x6d, 0x8f, 0xb4, 0xc4, 0xa0, 0xca, 0xe7, 0x9e, 0xed, 0x67, 0xcf, 0xb4, + 0xad, 0x46, 0xfd, 0x75, 0x95, 0xff, 0x5b, 0x35, 0x84, 0x19, 0x2f, 0xc1, 0xe9, 0x50, 0x2f, 0x4d, + 0xd7, 0x66, 0x8b, 0xa9, 0xdc, 0x74, 0x7e, 0xc6, 0xf8, 0x5f, 0x78, 0xbe, 0x6b, 0x33, 0x7c, 0x01, + 0x66, 0x89, 0x67, 0x9b, 0xa4, 0x49, 0x6b, 0xf7, 0x16, 0xa7, 0x73, 0x28, 0x3f, 0x6d, 0x9c, 0x26, + 0x9e, 0x7d, 0x3b, 0x3c, 0xab, 0xdb, 0x80, 0x7b, 0x8b, 0x1e, 0xab, 0x52, 0x7e, 0x14, 0xce, 0xe5, + 0x03, 0x5a, 0xdb, 0xb4, 0xaa, 0x75, 0x52, 0x91, 0x8b, 0x47, 0x47, 0x29, 0xbf, 0x43, 0xa0, 0x8c, + 0xf2, 0x90, 0x98, 0x14, 0x70, 0x5d, 0x1a, 0xcd, 0x68, 0x71, 0xe9, 0x32, 0x8b, 0xd5, 0x46, 0x8b, + 0x56, 0x1b, 0x2d, 0x8a, 0x2f, 0x5f, 0x09, 0x99, 0x9f, 0xed, 0x67, 0x97, 0xc4, 0x20, 0x87, 0x53, + 0xa8, 0x3f, 0x3c, 0xcd, 0x22, 0x63, 0xbe, 0x3e, 0x58, 0xb8, 0xf8, 0xf0, 0x2c, 0xa4, 0x39, 0x13, + 0xfe, 0x1d, 0xc1, 0xcb, 0x23, 0xf6, 0x0d, 0x5c, 0x8c, 0xbb, 0x42, 0xc9, 0xfb, 0x4b, 0xa6, 0x74, + 0xa4, 0x18, 0xd1, 0xbf, 0xfa, 0xf6, 0x57, 0x7f, 0xfc, 0xfd, 0x7d, 0xea, 0x35, 0xbc, 0xae, 0xc7, + 0xac, 0x56, 0xd1, 0x1e, 0xd6, 0xe0, 0x49, 0x4c, 0x9f, 0x9a, 0x76, 0x27, 0x8d, 0xc9, 0xbf, 0x03, + 0xfc, 0x2b, 0x82, 0xf3, 0xf1, 0xcb, 0x08, 0x2e, 0x8c, 0xe6, 0x19, 0xb1, 0xda, 0x64, 0x8a, 0x47, + 0x09, 0x91, 0x1d, 0xbc, 0xc9, 0x3b, 0x58, 0xc7, 0x37, 0x26, 0xe8, 0xa0, 0x8b, 0x6f, 0x4b, 0xfe, + 0x07, 0x08, 0x66, 0x3b, 0x3b, 0x0a, 0xbe, 0x3c, 0xfa, 0x97, 0xdb, 0x5d, 0x73, 0x32, 0x57, 0xc6, + 0x78, 0x49, 0xb0, 0x1b, 0x1c, 0x4c, 0xc3, 0xaf, 0x26, 0x81, 0xf1, 0x87, 0xc3, 0xac, 0xb6, 0x4d, + 0xd7, 0xd6, 0x77, 0x5c, 0x7b, 0x17, 0xef, 0xc0, 0x29, 0xf9, 0x2a, 0xbc, 0x32, 0xb2, 0x4c, 0x67, + 0x5e, 0x6a, 0x92, 0x8b, 0xc4, 0x58, 0xe1, 0x18, 0x97, 0xb1, 0x3a, 0x16, 0x83, 0xe1, 0x3d, 0x04, + 0x67, 0x7a, 0xd5, 0x10, 0x5f, 0x8d, 0x2b, 0x10, 0xb3, 0xa3, 0x64, 0xf2, 0xe3, 0x1d, 0x25, 0x4f, + 0x81, 0xf3, 0x5c, 0xc7, 0xd7, 0x92, 0x78, 0x2c, 0x1e, 0x29, 0x9f, 0x55, 0xfc, 0xcb, 0xc0, 0xe2, + 0x12, 0x3d, 0xc5, 0x58, 0x1f, 0x57, 0x75, 0x40, 0x34, 0x32, 0x6b, 0x93, 0x07, 0x48, 0xdc, 0x37, + 0x38, 0xee, 0x4d, 0x5c, 0x9a, 0x18, 0xd7, 0x6c, 0x92, 0x96, 0x29, 0xd4, 0xe8, 0x11, 0x82, 0xb9, + 0x7e, 0x15, 0xc1, 0xd7, 0xe2, 0x08, 0x62, 0x35, 0x3e, 0xb3, 0x32, 0x89, 0xab, 0xc4, 0x2c, 0x71, + 0xcc, 0x55, 0x7c, 0x3d, 0x09, 0x73, 0x40, 0xae, 0xf0, 0x6f, 0x43, 0xe2, 0xdf, 0x99, 0x6c, 0x61, + 0x7c, 0xed, 0xc1, 0xd9, 0x16, 0x8f, 0x12, 0x22, 0xb1, 0xdf, 0xe2, 0xd8, 0xb7, 0xf0, 0xcd, 0x23, + 0x60, 0xf7, 0xcc, 0x77, 0x0f, 0x01, 0x74, 0xb5, 0x07, 0xc7, 0xfe, 0x30, 0x87, 0x04, 0x31, 0xb3, + 0x3c, 0xce, 0x4d, 0xc2, 0xdd, 0xe2, 0x70, 0x05, 0xac, 0x27, 0xc1, 0xb5, 0x44, 0x9c, 0x49, 0x98, + 0xaf, 0xef, 0x70, 0x21, 0xdd, 0xc5, 0x3f, 0x21, 0x98, 0x1f, 0x92, 0x9c, 0xf8, 0x91, 0x26, 0x0a, + 0x58, 0xfc, 0x48, 0x93, 0x15, 0x4d, 0x5d, 0xe7, 0xd4, 0x6b, 0x58, 0x4b, 0xa2, 0x1e, 0x16, 0xac, + 0xf2, 0xc6, 0xe3, 0x03, 0x05, 0x3d, 0x39, 0x50, 0xd0, 0x5f, 0x07, 0x0a, 0xfa, 0xf6, 0x50, 0x99, + 0x7a, 0x72, 0xa8, 0x4c, 0xfd, 0x79, 0xa8, 0x4c, 0x7d, 0xb6, 0xde, 0x23, 0xcc, 0x32, 0xe7, 0x6a, + 0xdd, 0xaa, 0xb2, 0x4e, 0x81, 0xad, 0xc2, 0x9a, 0xfe, 0x65, 0x6f, 0x19, 0x2e, 0xd6, 0xd5, 0x53, + 0x5c, 0x37, 0x4b, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x42, 0x98, 0x1e, 0x3a, 0x8a, 0x10, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 740c33d7bb7..186516a7e94 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -13,7 +13,7 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v10/x/lockup/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -278,45 +278,45 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/tx.proto", fileDescriptor_8ea120e22291556e) } var fileDescriptor_8ea120e22291556e = []byte{ - // 596 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xcd, 0x7c, 0x49, 0xff, 0x26, 0xed, 0xa7, 0x62, 0x15, 0x70, 0x03, 0xb2, 0x53, 0x2f, 0x90, - 0x41, 0xea, 0x0c, 0x2d, 0x42, 0x48, 0xec, 0x48, 0x84, 0x50, 0x17, 0x51, 0x8b, 0x15, 0x09, 0xa9, - 0x12, 0xb2, 0xc6, 0xf6, 0xe0, 0x8e, 0x1a, 0x7b, 0x2c, 0xcf, 0x38, 0x6d, 0xde, 0xa2, 0x12, 0x6f, - 0xc1, 0x1b, 0xb0, 0x63, 0xd9, 0x65, 0x97, 0xac, 0x52, 0x94, 0xbc, 0x41, 0x9f, 0x00, 0x79, 0x6c, - 0x37, 0x89, 0xf8, 0xe9, 0x86, 0xd5, 0x64, 0xe6, 0x9c, 0x7b, 0xe6, 0xce, 0x39, 0x37, 0x86, 0x8f, - 0xb8, 0x88, 0xb8, 0x60, 0x02, 0xb3, 0xd8, 0xa7, 0xb1, 0x64, 0x43, 0x2a, 0xb0, 0x3c, 0x47, 0x49, - 0xca, 0x25, 0xd7, 0xb4, 0x12, 0x44, 0x33, 0xb0, 0xb5, 0x15, 0xf2, 0x90, 0x2b, 0x18, 0xe7, 0xbf, - 0x0a, 0x66, 0xcb, 0x0c, 0x39, 0x0f, 0x07, 0x14, 0xab, 0x9d, 0x97, 0x7d, 0xc2, 0x92, 0x45, 0x54, - 0x48, 0x12, 0x25, 0x25, 0xc1, 0xf0, 0x95, 0x16, 0xf6, 0x88, 0xa0, 0x78, 0xb8, 0xe7, 0x51, 0x49, - 0xf6, 0xb0, 0xcf, 0x59, 0x5c, 0xe1, 0xbf, 0xe9, 0x23, 0x24, 0x59, 0x48, 0x4b, 0x7c, 0xbb, 0xc2, - 0x07, 0xdc, 0x3f, 0xcd, 0x12, 0xb5, 0x14, 0x90, 0xf5, 0xb9, 0x0e, 0xff, 0xef, 0x89, 0xb0, 0x9b, - 0x52, 0x22, 0xe9, 0xbb, 0xbc, 0x46, 0xdb, 0x81, 0xeb, 0x4c, 0xb8, 0x09, 0x4d, 0x13, 0x2a, 0x33, - 0x32, 0xd0, 0x41, 0x1b, 0xd8, 0xab, 0x4e, 0x93, 0x89, 0xa3, 0xea, 0x48, 0x7b, 0x02, 0x97, 0xf8, - 0x59, 0x4c, 0x53, 0xfd, 0xbf, 0x36, 0xb0, 0xd7, 0x3a, 0x9b, 0x37, 0x63, 0x73, 0x7d, 0x44, 0xa2, - 0xc1, 0x6b, 0x4b, 0x1d, 0x5b, 0x4e, 0x01, 0x6b, 0x07, 0x70, 0x23, 0x60, 0x42, 0xa6, 0xcc, 0xcb, - 0x24, 0x75, 0x25, 0xd7, 0xeb, 0x6d, 0x60, 0x37, 0xf7, 0x0d, 0x54, 0x79, 0x53, 0x34, 0x84, 0xde, - 0x67, 0x34, 0x1d, 0x75, 0x79, 0x1c, 0x30, 0xc9, 0x78, 0xdc, 0x69, 0x5c, 0x8e, 0xcd, 0x9a, 0xb3, - 0x3e, 0x2b, 0xed, 0x73, 0x8d, 0xc0, 0xa5, 0xfc, 0xc5, 0x42, 0x6f, 0xb4, 0xeb, 0x76, 0x73, 0x7f, - 0x1b, 0x15, 0x9e, 0xa0, 0xdc, 0x13, 0x54, 0x7a, 0x82, 0xba, 0x9c, 0xc5, 0x9d, 0xe7, 0x79, 0xf5, - 0x97, 0x6b, 0xd3, 0x0e, 0x99, 0x3c, 0xc9, 0x3c, 0xe4, 0xf3, 0x08, 0x97, 0x06, 0x16, 0xcb, 0xae, - 0x08, 0x4e, 0xb1, 0x1c, 0x25, 0x54, 0xa8, 0x02, 0xe1, 0x14, 0xca, 0xda, 0x07, 0x08, 0x85, 0x24, - 0xa9, 0x74, 0x73, 0xff, 0xf5, 0x25, 0xd5, 0x6a, 0x0b, 0x15, 0xe1, 0xa0, 0x2a, 0x1c, 0xd4, 0xaf, - 0xc2, 0xe9, 0x3c, 0xce, 0x2f, 0xba, 0x19, 0x9b, 0x9b, 0xc5, 0xd3, 0x6f, 0x53, 0xb3, 0x2e, 0xae, - 0x4d, 0xe0, 0xac, 0x29, 0xad, 0x9c, 0xad, 0x61, 0xb8, 0x15, 0x67, 0x91, 0x4b, 0x13, 0xee, 0x9f, - 0x08, 0x37, 0x21, 0x2c, 0x70, 0xf9, 0x90, 0xa6, 0xfa, 0x72, 0x1b, 0xd8, 0x0d, 0xe7, 0x5e, 0x9c, - 0x45, 0x6f, 0x15, 0x74, 0x44, 0x58, 0x70, 0x38, 0xa4, 0xa9, 0xa5, 0xc3, 0x07, 0x8b, 0xa1, 0x38, - 0x54, 0x24, 0x3c, 0x16, 0xd4, 0xfa, 0x0a, 0xe0, 0x46, 0x4f, 0x84, 0x6f, 0x82, 0xa0, 0xcf, 0x8b, - 0xb8, 0x6e, 0xb3, 0x00, 0x7f, 0xcf, 0x62, 0x1b, 0xae, 0xaa, 0x99, 0x70, 0x59, 0xa0, 0x62, 0x6b, - 0x38, 0x2b, 0x6a, 0x7f, 0x10, 0x68, 0x14, 0xae, 0xa4, 0xf4, 0x8c, 0xa4, 0x81, 0xd0, 0xeb, 0xff, - 0xde, 0xdd, 0x4a, 0xdb, 0x7a, 0x08, 0xef, 0x2f, 0xb4, 0x5e, 0x3d, 0x6a, 0xff, 0x1b, 0x80, 0xf5, - 0x9e, 0x08, 0xb5, 0x8f, 0xb0, 0x39, 0x3f, 0x88, 0x16, 0xfa, 0xf5, 0x2f, 0x84, 0x16, 0x7d, 0x69, - 0x3d, 0xbb, 0x9b, 0x53, 0x5d, 0xa3, 0x1d, 0x43, 0x38, 0xe7, 0xdb, 0xce, 0x1f, 0x2a, 0x67, 0x94, - 0xd6, 0xd3, 0x3b, 0x29, 0x95, 0x76, 0xe7, 0xf0, 0x72, 0x62, 0x80, 0xab, 0x89, 0x01, 0x7e, 0x4c, - 0x0c, 0x70, 0x31, 0x35, 0x6a, 0x57, 0x53, 0xa3, 0xf6, 0x7d, 0x6a, 0xd4, 0x8e, 0x5f, 0xce, 0x19, - 0x55, 0xca, 0xed, 0x0e, 0x88, 0x27, 0xaa, 0x0d, 0x1e, 0xbe, 0xc2, 0xe7, 0x0b, 0x5f, 0x90, 0xdc, - 0x3b, 0x6f, 0x59, 0x0d, 0xdc, 0x8b, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x77, 0xba, 0xf8, - 0x64, 0x04, 0x00, 0x00, + // 595 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6e, 0xd3, 0x30, + 0x1c, 0xae, 0x69, 0xf7, 0xcf, 0xdd, 0xd0, 0x88, 0x06, 0x64, 0x05, 0x25, 0x5d, 0x0e, 0x28, 0x20, + 0xcd, 0xde, 0x86, 0xc4, 0x81, 0x1b, 0x9d, 0x10, 0xda, 0xa1, 0xa2, 0x44, 0x95, 0x90, 0x26, 0xa1, + 0xc8, 0x49, 0x4c, 0x66, 0xad, 0x89, 0xa3, 0xd8, 0xe9, 0xd6, 0xb7, 0x98, 0xc4, 0x5b, 0xf0, 0x06, + 0xdc, 0x38, 0xee, 0xb8, 0x23, 0xa7, 0x0e, 0xb5, 0x6f, 0xb0, 0x27, 0x40, 0x71, 0x92, 0xb5, 0x15, + 0x7f, 0x76, 0xe1, 0xe4, 0xda, 0xdf, 0xf7, 0xfb, 0xfc, 0xf3, 0xf7, 0xfd, 0x1a, 0xf8, 0x84, 0x8b, + 0x88, 0x0b, 0x26, 0x30, 0x8b, 0x7d, 0x1a, 0x4b, 0x36, 0xa4, 0x02, 0xcb, 0x73, 0x94, 0xa4, 0x5c, + 0x72, 0x4d, 0x2b, 0x41, 0x34, 0x03, 0x5b, 0x5b, 0x21, 0x0f, 0xb9, 0x82, 0x71, 0xfe, 0xab, 0x60, + 0xb6, 0xcc, 0x90, 0xf3, 0x70, 0x40, 0xb1, 0xda, 0x79, 0xd9, 0x67, 0x2c, 0x59, 0x44, 0x85, 0x24, + 0x51, 0x52, 0x12, 0x0c, 0x5f, 0x69, 0x61, 0x8f, 0x08, 0x8a, 0x87, 0xfb, 0x1e, 0x95, 0x64, 0x1f, + 0xfb, 0x9c, 0xc5, 0x15, 0xfe, 0x87, 0x3e, 0x42, 0x92, 0x85, 0xb4, 0xc4, 0xb7, 0x2b, 0x7c, 0xc0, + 0xfd, 0xd3, 0x2c, 0x51, 0x4b, 0x01, 0x59, 0x5f, 0xea, 0xf0, 0x7e, 0x57, 0x84, 0x87, 0x29, 0x25, + 0x92, 0xbe, 0xcb, 0x6b, 0xb4, 0x1d, 0xb8, 0xce, 0x84, 0x9b, 0xd0, 0x34, 0xa1, 0x32, 0x23, 0x03, + 0x1d, 0xb4, 0x81, 0xbd, 0xea, 0x34, 0x99, 0xe8, 0x55, 0x47, 0xda, 0x33, 0xb8, 0xc4, 0xcf, 0x62, + 0x9a, 0xea, 0xf7, 0xda, 0xc0, 0x5e, 0xeb, 0x6c, 0xde, 0x8c, 0xcd, 0xf5, 0x11, 0x89, 0x06, 0xaf, + 0x2d, 0x75, 0x6c, 0x39, 0x05, 0xac, 0x1d, 0xc1, 0x8d, 0x80, 0x09, 0x99, 0x32, 0x2f, 0x93, 0xd4, + 0x95, 0x5c, 0xaf, 0xb7, 0x81, 0xdd, 0x3c, 0x30, 0x50, 0xe5, 0x4d, 0xd1, 0x10, 0xfa, 0x90, 0xd1, + 0x74, 0x74, 0xc8, 0xe3, 0x80, 0x49, 0xc6, 0xe3, 0x4e, 0xe3, 0x72, 0x6c, 0xd6, 0x9c, 0xf5, 0x59, + 0x69, 0x9f, 0x6b, 0x04, 0x2e, 0xe5, 0x2f, 0x16, 0x7a, 0xa3, 0x5d, 0xb7, 0x9b, 0x07, 0xdb, 0xa8, + 0xf0, 0x04, 0xe5, 0x9e, 0xa0, 0xd2, 0x13, 0x74, 0xc8, 0x59, 0xdc, 0xd9, 0xcb, 0xab, 0xbf, 0x5e, + 0x9b, 0x76, 0xc8, 0xe4, 0x49, 0xe6, 0x21, 0x9f, 0x47, 0xb8, 0x34, 0xb0, 0x58, 0x76, 0x45, 0x70, + 0x8a, 0xe5, 0x28, 0xa1, 0x42, 0x15, 0x08, 0xa7, 0x50, 0xd6, 0x3e, 0x42, 0x28, 0x24, 0x49, 0xa5, + 0x9b, 0xfb, 0xaf, 0x2f, 0xa9, 0x56, 0x5b, 0xa8, 0x08, 0x07, 0x55, 0xe1, 0xa0, 0x7e, 0x15, 0x4e, + 0xe7, 0x69, 0x7e, 0xd1, 0xcd, 0xd8, 0xdc, 0x2c, 0x9e, 0x7e, 0x9b, 0x9a, 0x75, 0x71, 0x6d, 0x02, + 0x67, 0x4d, 0x69, 0xe5, 0x6c, 0x0d, 0xc3, 0xad, 0x38, 0x8b, 0x5c, 0x9a, 0x70, 0xff, 0x44, 0xb8, + 0x09, 0x61, 0x81, 0xcb, 0x87, 0x34, 0xd5, 0x97, 0xdb, 0xc0, 0x6e, 0x38, 0x0f, 0xe2, 0x2c, 0x7a, + 0xab, 0xa0, 0x1e, 0x61, 0xc1, 0xfb, 0x21, 0x4d, 0x2d, 0x1d, 0x3e, 0x5a, 0x0c, 0xc5, 0xa1, 0x22, + 0xe1, 0xb1, 0xa0, 0xd6, 0x37, 0x00, 0x37, 0xba, 0x22, 0x7c, 0x13, 0x04, 0x7d, 0x5e, 0xc4, 0x75, + 0x9b, 0x05, 0xf8, 0x77, 0x16, 0xdb, 0x70, 0x55, 0xcd, 0x84, 0xcb, 0x02, 0x15, 0x5b, 0xc3, 0x59, + 0x51, 0xfb, 0xa3, 0x40, 0xa3, 0x70, 0x25, 0xa5, 0x67, 0x24, 0x0d, 0x84, 0x5e, 0xff, 0xff, 0xee, + 0x56, 0xda, 0xd6, 0x63, 0xf8, 0x70, 0xa1, 0xf5, 0xea, 0x51, 0x07, 0xdf, 0x01, 0xac, 0x77, 0x45, + 0xa8, 0x7d, 0x82, 0xcd, 0xf9, 0x41, 0xb4, 0xd0, 0xef, 0x7f, 0x21, 0xb4, 0xe8, 0x4b, 0xeb, 0xc5, + 0xdd, 0x9c, 0xea, 0x1a, 0xed, 0x18, 0xc2, 0x39, 0xdf, 0x76, 0xfe, 0x52, 0x39, 0xa3, 0xb4, 0x9e, + 0xdf, 0x49, 0xa9, 0xb4, 0x3b, 0xbd, 0xcb, 0x89, 0x01, 0xae, 0x26, 0x06, 0xf8, 0x39, 0x31, 0xc0, + 0xc5, 0xd4, 0xa8, 0x5d, 0x4d, 0x8d, 0xda, 0x8f, 0xa9, 0x51, 0x3b, 0x7e, 0x35, 0x67, 0x54, 0x29, + 0xb7, 0x3b, 0x20, 0x9e, 0xa8, 0x36, 0x78, 0xb8, 0xbf, 0x87, 0xcf, 0x17, 0x3e, 0x21, 0xb9, 0x79, + 0xde, 0xb2, 0x9a, 0xb8, 0x97, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x05, 0x85, 0x94, 0x65, + 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lockup/abci.go b/x/lockup/abci.go index 3c530bd0fb2..d70b6d0e6ed 100644 --- a/x/lockup/abci.go +++ b/x/lockup/abci.go @@ -3,7 +3,7 @@ package lockup import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/client/cli/cli_test.go b/x/lockup/client/cli/cli_test.go index cfea64c0362..06ef8156ece 100644 --- a/x/lockup/client/cli/cli_test.go +++ b/x/lockup/client/cli/cli_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" - lockuptestutil "github.com/osmosis-labs/osmosis/v7/x/lockup/client/testutil" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" + lockuptestutil "github.com/osmosis-labs/osmosis/v10/x/lockup/client/testutil" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go index 81fea436d16..6fb84f38554 100644 --- a/x/lockup/client/cli/query.go +++ b/x/lockup/client/cli/query.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/lockup/client/cli/tx.go b/x/lockup/client/cli/tx.go index b6ff1ea510a..7f95e309842 100644 --- a/x/lockup/client/cli/tx.go +++ b/x/lockup/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/lockup/client/rest/query.go b/x/lockup/client/rest/query.go index 10f7acecd0c..d67352e8f05 100644 --- a/x/lockup/client/rest/query.go +++ b/x/lockup/client/rest/query.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/client/rest/tx.go b/x/lockup/client/rest/tx.go index 6111bc7b430..d2b4327a8ef 100644 --- a/x/lockup/client/rest/tx.go +++ b/x/lockup/client/rest/tx.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/x/lockup/client/testutil/test_helpers.go b/x/lockup/client/testutil/test_helpers.go index 48e03eecaa2..80f573316f6 100644 --- a/x/lockup/client/testutil/test_helpers.go +++ b/x/lockup/client/testutil/test_helpers.go @@ -3,7 +3,7 @@ package testutil import ( "fmt" - lockupcli "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" + lockupcli "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/lockup/keeper/admin_keeper.go b/x/lockup/keeper/admin_keeper.go index 0fc3a77bd37..4aa956ec4b8 100644 --- a/x/lockup/keeper/admin_keeper.go +++ b/x/lockup/keeper/admin_keeper.go @@ -2,7 +2,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/admin_keeper_test.go b/x/lockup/keeper/admin_keeper_test.go index 9d4d6a083bf..84a4af63362 100644 --- a/x/lockup/keeper/admin_keeper_test.go +++ b/x/lockup/keeper/admin_keeper_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/bench_test.go b/x/lockup/keeper/bench_test.go index 6eb99b14b54..99a1008282d 100644 --- a/x/lockup/keeper/bench_test.go +++ b/x/lockup/keeper/bench_test.go @@ -9,8 +9,8 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/app" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/export_test.go b/x/lockup/keeper/export_test.go index 9b31939f4f4..816e925fbec 100644 --- a/x/lockup/keeper/export_test.go +++ b/x/lockup/keeper/export_test.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/genesis.go b/x/lockup/keeper/genesis.go index 43367c17223..b37f220e3e4 100644 --- a/x/lockup/keeper/genesis.go +++ b/x/lockup/keeper/genesis.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/genesis_test.go b/x/lockup/keeper/genesis_test.go index 6048046befb..7a5d4adc0e8 100644 --- a/x/lockup/keeper/genesis_test.go +++ b/x/lockup/keeper/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/lockup" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/grpc_query.go b/x/lockup/keeper/grpc_query.go index 607d9e325cd..8d516dfa10b 100644 --- a/x/lockup/keeper/grpc_query.go +++ b/x/lockup/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) var _ types.QueryServer = Querier{} diff --git a/x/lockup/keeper/grpc_query_test.go b/x/lockup/keeper/grpc_query_test.go index 31d1658d1f8..a0aeb1ecf04 100644 --- a/x/lockup/keeper/grpc_query_test.go +++ b/x/lockup/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) func (suite *KeeperTestSuite) LockTokens(addr sdk.AccAddress, coins sdk.Coins, duration time.Duration) { diff --git a/x/lockup/keeper/invariants.go b/x/lockup/keeper/invariants.go index e8d1a94f23f..2aea79b4798 100644 --- a/x/lockup/keeper/invariants.go +++ b/x/lockup/keeper/invariants.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // RegisterInvariants registers all governance invariants. diff --git a/x/lockup/keeper/iterator.go b/x/lockup/keeper/iterator.go index e1196d71d81..750e117e4ed 100644 --- a/x/lockup/keeper/iterator.go +++ b/x/lockup/keeper/iterator.go @@ -5,7 +5,7 @@ import ( db "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/keeper.go b/x/lockup/keeper/keeper.go index 931280c0190..57785528c80 100644 --- a/x/lockup/keeper/keeper.go +++ b/x/lockup/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/keeper_test.go b/x/lockup/keeper/keeper_test.go index 84a93c922d4..1775e98d712 100644 --- a/x/lockup/keeper/keeper_test.go +++ b/x/lockup/keeper/keeper_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" ) type KeeperTestSuite struct { diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go index fc4305b031d..457ff1dc1c1 100644 --- a/x/lockup/keeper/lock.go +++ b/x/lockup/keeper/lock.go @@ -10,8 +10,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/store" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/store" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // WithdrawAllMaturedLocks withdraws every lock thats in the process of unlocking, and has finished unlocking by diff --git a/x/lockup/keeper/lock_refs.go b/x/lockup/keeper/lock_refs.go index 68af9947b66..9526332585a 100644 --- a/x/lockup/keeper/lock_refs.go +++ b/x/lockup/keeper/lock_refs.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/lock_test.go b/x/lockup/keeper/lock_test.go index 109031a7c10..00f935cfbe0 100644 --- a/x/lockup/keeper/lock_test.go +++ b/x/lockup/keeper/lock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/migration.go b/x/lockup/keeper/migration.go index b79f00f0516..c07276475d8 100644 --- a/x/lockup/keeper/migration.go +++ b/x/lockup/keeper/migration.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/migration_test.go b/x/lockup/keeper/migration_test.go index c79e40e9833..af329e9ae62 100644 --- a/x/lockup/keeper/migration_test.go +++ b/x/lockup/keeper/migration_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/msg_server.go b/x/lockup/keeper/msg_server.go index ce123cff367..7263a2ae917 100644 --- a/x/lockup/keeper/msg_server.go +++ b/x/lockup/keeper/msg_server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/osmosis-labs/osmosis/v7/x/gamm/utils" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/lockup/keeper/msg_server_test.go b/x/lockup/keeper/msg_server_test.go index 0f389d3478a..7536a7b49b0 100644 --- a/x/lockup/keeper/msg_server_test.go +++ b/x/lockup/keeper/msg_server_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/store.go b/x/lockup/keeper/store.go index 31285c841bb..dcbb8e24793 100644 --- a/x/lockup/keeper/store.go +++ b/x/lockup/keeper/store.go @@ -6,7 +6,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go index a97b6bc830a..12571061884 100644 --- a/x/lockup/keeper/synthetic_lock.go +++ b/x/lockup/keeper/synthetic_lock.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // A synthetic lock object is a lock obejct used for the superfluid module. diff --git a/x/lockup/keeper/synthetic_lock_test.go b/x/lockup/keeper/synthetic_lock_test.go index 09a296a7a98..4e59d095590 100644 --- a/x/lockup/keeper/synthetic_lock_test.go +++ b/x/lockup/keeper/synthetic_lock_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/utils.go b/x/lockup/keeper/utils.go index e3ec5037d77..b103ba57c40 100644 --- a/x/lockup/keeper/utils.go +++ b/x/lockup/keeper/utils.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/utils_test.go b/x/lockup/keeper/utils_test.go index ba95bc4ccab..3d1f7da42eb 100644 --- a/x/lockup/keeper/utils_test.go +++ b/x/lockup/keeper/utils_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/module.go b/x/lockup/module.go index f5665e27540..5d52e901c96 100644 --- a/x/lockup/module.go +++ b/x/lockup/module.go @@ -17,13 +17,13 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/lockup/client/rest" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" - locksimulation "github.com/osmosis-labs/osmosis/v7/x/lockup/simulation" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + locksimulation "github.com/osmosis-labs/osmosis/v10/x/lockup/simulation" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) var ( diff --git a/x/lockup/simulation/operations.go b/x/lockup/simulation/operations.go index 7056a595a96..edc74968b3e 100644 --- a/x/lockup/simulation/operations.go +++ b/x/lockup/simulation/operations.go @@ -6,10 +6,10 @@ import ( legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" - "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/types/genesis.pb.go b/x/lockup/types/genesis.pb.go index c108a1cdcd0..87d169348ae 100644 --- a/x/lockup/types/genesis.pb.go +++ b/x/lockup/types/genesis.pb.go @@ -91,7 +91,7 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/genesis.proto", fileDescriptor_648db7c6ebb608b0) } var fileDescriptor_648db7c6ebb608b0 = []byte{ - // 261 bytes of a gzipped FileDescriptorProto + // 262 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xc9, 0x4f, 0xce, 0x2e, 0x2d, 0xd0, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x83, 0xca, 0xea, 0x41, 0x64, 0xa5, @@ -103,12 +103,12 @@ var fileDescriptor_648db7c6ebb608b0 = []byte{ 0x06, 0xbd, 0x80, 0xd4, 0xa2, 0xcc, 0xfc, 0x14, 0x90, 0x62, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x20, 0xca, 0x85, 0x7c, 0xb8, 0xf8, 0x8b, 0x2b, 0xf3, 0x4a, 0x32, 0x52, 0x4b, 0x32, 0x93, 0xe3, 0x21, 0x26, 0x30, 0x83, 0x4d, 0x90, 0x45, 0x37, 0x21, 0x18, 0xa6, 0x0c, 0xc9, 0x10, 0xbe, - 0x62, 0x64, 0xc1, 0x62, 0x27, 0xef, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, + 0x62, 0x64, 0xc1, 0x62, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, - 0x32, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xac, 0x9b, - 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x99, 0xeb, 0x57, 0xc0, 0x82, 0xa2, 0xa4, 0xb2, 0x20, - 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x18, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x7b, 0x29, - 0xfd, 0x6d, 0x01, 0x00, 0x00, + 0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xac, 0x9b, + 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x1a, 0xe8, 0x57, 0xc0, 0xc2, 0xa2, 0xa4, 0xb2, + 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x1a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0xc1, + 0x2b, 0xff, 0x6e, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/lockup/types/lock.pb.go b/x/lockup/types/lock.pb.go index baa790d8b96..e07414cbe8a 100644 --- a/x/lockup/types/lock.pb.go +++ b/x/lockup/types/lock.pb.go @@ -319,42 +319,42 @@ func init() { proto.RegisterFile("osmosis/lockup/lock.proto", fileDescriptor_7e9 var fileDescriptor_7e9d7527a237b489 = []byte{ // 595 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xb6, 0x9d, 0xa4, 0xb4, 0x57, 0x92, 0x46, 0xa7, 0x0e, 0x69, 0x00, 0x3b, 0xf2, 0x80, 0x22, - 0xd4, 0xda, 0xa4, 0x0c, 0x48, 0x8c, 0x6e, 0x18, 0x22, 0x18, 0xc0, 0x54, 0x0c, 0x2c, 0x91, 0x7f, - 0x1c, 0xce, 0x29, 0xb6, 0xcf, 0xf8, 0x47, 0xc1, 0xff, 0x01, 0x63, 0x47, 0x90, 0xd8, 0xd8, 0xf8, - 0x4b, 0x3a, 0x76, 0x64, 0x4a, 0x51, 0x22, 0x16, 0xc6, 0xfe, 0x05, 0xe8, 0xee, 0x7c, 0x49, 0x5a, - 0x84, 0xd4, 0x01, 0xa6, 0xf3, 0xbb, 0xef, 0xbd, 0xef, 0xbd, 0xfb, 0xde, 0x27, 0x83, 0x3d, 0x92, - 0x45, 0x24, 0xc3, 0x99, 0x19, 0x12, 0x6f, 0x5a, 0x24, 0xec, 0x30, 0x92, 0x94, 0xe4, 0x04, 0xb6, - 0x2a, 0xc8, 0xe0, 0x50, 0x77, 0x37, 0x20, 0x01, 0x61, 0x90, 0x49, 0xbf, 0x78, 0x56, 0x57, 0x0d, - 0x08, 0x09, 0x42, 0x64, 0xb2, 0xc8, 0x2d, 0xde, 0x9a, 0x7e, 0x91, 0x3a, 0x39, 0x26, 0x71, 0x85, - 0x6b, 0xd7, 0xf1, 0x1c, 0x47, 0x28, 0xcb, 0x9d, 0x28, 0x11, 0x04, 0x1e, 0xeb, 0x63, 0xba, 0x4e, - 0x86, 0xcc, 0x93, 0x81, 0x8b, 0x72, 0x67, 0x60, 0x7a, 0x04, 0x57, 0x04, 0xfa, 0x4f, 0x05, 0x80, - 0x17, 0x28, 0xc5, 0xc4, 0x7f, 0x4e, 0xbc, 0x29, 0x6c, 0x01, 0x65, 0x34, 0xec, 0xc8, 0x3d, 0xb9, - 0x5f, 0xb7, 0x95, 0xd1, 0x10, 0xde, 0x07, 0x0d, 0xf2, 0x3e, 0x46, 0x69, 0x47, 0xe9, 0xc9, 0xfd, - 0x2d, 0xab, 0x7d, 0x39, 0xd3, 0x6e, 0x97, 0x4e, 0x14, 0x3e, 0xd1, 0xd9, 0xb5, 0x6e, 0x73, 0x18, - 0x4e, 0xc0, 0xa6, 0x98, 0xac, 0x53, 0xeb, 0xc9, 0xfd, 0xed, 0xc3, 0x3d, 0x83, 0x8f, 0x66, 0x88, - 0xd1, 0x8c, 0x61, 0x95, 0x60, 0x0d, 0xce, 0x66, 0x9a, 0xf4, 0x6b, 0xa6, 0x41, 0x51, 0xb2, 0x4f, - 0x22, 0x9c, 0xa3, 0x28, 0xc9, 0xcb, 0xcb, 0x99, 0xb6, 0xc3, 0xf9, 0x05, 0xa6, 0x7f, 0xba, 0xd0, - 0x64, 0x7b, 0xc9, 0x0e, 0x6d, 0xb0, 0x89, 0x62, 0x7f, 0x4c, 0xdf, 0xd9, 0xa9, 0xb3, 0x4e, 0xdd, - 0x3f, 0x3a, 0x1d, 0x0b, 0x11, 0xac, 0x3b, 0xb4, 0xd5, 0x8a, 0x54, 0x54, 0xea, 0xa7, 0x94, 0xf4, - 0x16, 0x8a, 0x7d, 0x9a, 0x0a, 0x1d, 0xd0, 0xa0, 0x92, 0x64, 0x9d, 0x46, 0xaf, 0xc6, 0x46, 0xe7, - 0xa2, 0x19, 0x54, 0x34, 0xa3, 0x12, 0xcd, 0x38, 0x22, 0x38, 0xb6, 0x1e, 0x52, 0xbe, 0x6f, 0x17, - 0x5a, 0x3f, 0xc0, 0xf9, 0xa4, 0x70, 0x0d, 0x8f, 0x44, 0x66, 0xa5, 0x30, 0x3f, 0x0e, 0x32, 0x7f, - 0x6a, 0xe6, 0x65, 0x82, 0x32, 0x56, 0x90, 0xd9, 0x9c, 0x59, 0xff, 0xac, 0x80, 0xd6, 0xcb, 0x02, - 0xa5, 0xe5, 0x11, 0x89, 0x7d, 0xcc, 0x5e, 0xf2, 0x14, 0xec, 0xd0, 0xdd, 0x8f, 0xdf, 0xd1, 0xeb, - 0x31, 0xad, 0x61, 0xc2, 0xb7, 0x0e, 0xef, 0x19, 0x57, 0xbd, 0x61, 0xd0, 0xd5, 0xb0, 0xe2, 0xe3, - 0x32, 0x41, 0x76, 0x33, 0x5c, 0x0f, 0xe1, 0x2e, 0x68, 0xf8, 0x28, 0x26, 0x11, 0x5f, 0x91, 0xcd, - 0x03, 0x2a, 0xd3, 0xcd, 0x17, 0x72, 0x4d, 0xa5, 0xbf, 0x49, 0xff, 0x1a, 0x6c, 0x2d, 0xed, 0x75, - 0x03, 0xed, 0xef, 0x56, 0xac, 0x6d, 0xce, 0xba, 0x2c, 0xe5, 0xe2, 0xaf, 0xa8, 0xf4, 0x2f, 0x0a, - 0x68, 0xbe, 0x2a, 0xe3, 0x7c, 0x82, 0x72, 0xec, 0x31, 0x1b, 0xee, 0x03, 0x58, 0xc4, 0x3e, 0x4a, - 0xc3, 0x12, 0xc7, 0xc1, 0x98, 0xa9, 0x84, 0xfd, 0xca, 0x96, 0xed, 0x15, 0x42, 0x73, 0x47, 0x3e, - 0xd4, 0xc0, 0x76, 0x46, 0xcb, 0xc7, 0xeb, 0x3a, 0x00, 0x76, 0x35, 0x14, 0x62, 0x2c, 0x3d, 0x53, - 0xfb, 0x47, 0x9e, 0x59, 0x77, 0x7c, 0xfd, 0x7f, 0x3a, 0xfe, 0xc1, 0x00, 0x34, 0xaf, 0x18, 0x00, - 0xb6, 0x00, 0xb0, 0x4a, 0xc1, 0xdd, 0x96, 0x20, 0x00, 0x1b, 0x56, 0x49, 0x87, 0x6a, 0xcb, 0xdd, - 0xfa, 0xc7, 0xaf, 0xaa, 0x64, 0x3d, 0x3b, 0x9b, 0xab, 0xf2, 0xf9, 0x5c, 0x95, 0x7f, 0xcc, 0x55, - 0xf9, 0x74, 0xa1, 0x4a, 0xe7, 0x0b, 0x55, 0xfa, 0xbe, 0x50, 0xa5, 0x37, 0x83, 0x35, 0xe3, 0x56, - 0x2e, 0x3b, 0x08, 0x1d, 0x37, 0x13, 0x81, 0x79, 0xf2, 0xd8, 0xfc, 0x20, 0x7e, 0x57, 0xcc, 0xc7, - 0xee, 0x06, 0x7b, 0xcf, 0xa3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x72, 0x71, 0xec, 0xb5, 0xcd, + 0x14, 0xb6, 0xdd, 0xa4, 0xb4, 0x57, 0x92, 0x46, 0xa7, 0x0e, 0x69, 0x00, 0x3b, 0xf2, 0x80, 0x22, + 0xd4, 0xda, 0x4d, 0xd8, 0x18, 0xdd, 0x30, 0x44, 0xea, 0x00, 0xa6, 0x62, 0x60, 0x89, 0xfc, 0xe3, + 0x70, 0x4e, 0xb1, 0x7d, 0xc6, 0x3f, 0x0a, 0xfe, 0x0f, 0x18, 0x3b, 0x82, 0xc4, 0xc6, 0xc6, 0x5f, + 0xd2, 0xb1, 0x23, 0x53, 0x8a, 0x12, 0xb1, 0x30, 0xf6, 0x2f, 0x40, 0x77, 0xe7, 0x4b, 0xd2, 0x22, + 0xa4, 0x0e, 0x30, 0x9d, 0xdf, 0x7d, 0xef, 0x7d, 0xef, 0xdd, 0xf7, 0x3e, 0x19, 0xec, 0x93, 0x2c, + 0x22, 0x19, 0xce, 0xcc, 0x90, 0x78, 0xd3, 0x22, 0x61, 0x87, 0x91, 0xa4, 0x24, 0x27, 0xb0, 0x59, + 0x41, 0x06, 0x87, 0x3a, 0x7b, 0x01, 0x09, 0x08, 0x83, 0x4c, 0xfa, 0xc5, 0xb3, 0x3a, 0x6a, 0x40, + 0x48, 0x10, 0x22, 0x93, 0x45, 0x6e, 0xf1, 0xd6, 0xf4, 0x8b, 0xd4, 0xc9, 0x31, 0x89, 0x2b, 0x5c, + 0xbb, 0x8d, 0xe7, 0x38, 0x42, 0x59, 0xee, 0x44, 0x89, 0x20, 0xf0, 0x58, 0x1f, 0xd3, 0x75, 0x32, + 0x64, 0x9e, 0xf5, 0x5d, 0x94, 0x3b, 0x7d, 0xd3, 0x23, 0xb8, 0x22, 0xd0, 0x7f, 0x2a, 0x00, 0xbc, + 0x40, 0x29, 0x26, 0xfe, 0x09, 0xf1, 0xa6, 0xb0, 0x09, 0x94, 0xd1, 0xb0, 0x2d, 0x77, 0xe5, 0x5e, + 0xcd, 0x56, 0x46, 0x43, 0xf8, 0x18, 0xd4, 0xc9, 0xfb, 0x18, 0xa5, 0x6d, 0xa5, 0x2b, 0xf7, 0xb6, + 0xad, 0xd6, 0xf5, 0x4c, 0xbb, 0x5f, 0x3a, 0x51, 0xf8, 0x4c, 0x67, 0xd7, 0xba, 0xcd, 0x61, 0x38, + 0x01, 0x5b, 0x62, 0xb2, 0xf6, 0x46, 0x57, 0xee, 0xed, 0x0c, 0xf6, 0x0d, 0x3e, 0x9a, 0x21, 0x46, + 0x33, 0x86, 0x55, 0x82, 0xd5, 0xbf, 0x98, 0x69, 0xd2, 0xaf, 0x99, 0x06, 0x45, 0xc9, 0x01, 0x89, + 0x70, 0x8e, 0xa2, 0x24, 0x2f, 0xaf, 0x67, 0xda, 0x2e, 0xe7, 0x17, 0x98, 0xfe, 0xe9, 0x4a, 0x93, + 0xed, 0x25, 0x3b, 0xb4, 0xc1, 0x16, 0x8a, 0xfd, 0x31, 0x7d, 0x67, 0xbb, 0xc6, 0x3a, 0x75, 0xfe, + 0xe8, 0x74, 0x2a, 0x44, 0xb0, 0x1e, 0xd0, 0x56, 0x2b, 0x52, 0x51, 0xa9, 0x9f, 0x53, 0xd2, 0x7b, + 0x28, 0xf6, 0x69, 0x2a, 0x74, 0x40, 0x9d, 0x4a, 0x92, 0xb5, 0xeb, 0xdd, 0x0d, 0x36, 0x3a, 0x17, + 0xcd, 0xa0, 0xa2, 0x19, 0x95, 0x68, 0xc6, 0x31, 0xc1, 0xb1, 0x75, 0x44, 0xf9, 0xbe, 0x5d, 0x69, + 0xbd, 0x00, 0xe7, 0x93, 0xc2, 0x35, 0x3c, 0x12, 0x99, 0x95, 0xc2, 0xfc, 0x38, 0xcc, 0xfc, 0xa9, + 0x99, 0x97, 0x09, 0xca, 0x58, 0x41, 0x66, 0x73, 0x66, 0xfd, 0xb3, 0x02, 0x9a, 0x2f, 0x0b, 0x94, + 0x96, 0xc7, 0x24, 0xf6, 0x31, 0x7b, 0xc9, 0x73, 0xb0, 0x4b, 0x77, 0x3f, 0x7e, 0x47, 0xaf, 0xc7, + 0xb4, 0x86, 0x09, 0xdf, 0x1c, 0x3c, 0x32, 0x6e, 0x7a, 0xc3, 0xa0, 0xab, 0x61, 0xc5, 0xa7, 0x65, + 0x82, 0xec, 0x46, 0xb8, 0x1e, 0xc2, 0x3d, 0x50, 0xf7, 0x51, 0x4c, 0x22, 0xbe, 0x22, 0x9b, 0x07, + 0x54, 0xa6, 0xbb, 0x2f, 0xe4, 0x96, 0x4a, 0x7f, 0x93, 0xfe, 0x35, 0xd8, 0x5e, 0xda, 0xeb, 0x0e, + 0xda, 0x3f, 0xac, 0x58, 0x5b, 0x9c, 0x75, 0x59, 0xca, 0xc5, 0x5f, 0x51, 0xe9, 0x5f, 0x14, 0xd0, + 0x78, 0x55, 0xc6, 0xf9, 0x04, 0xe5, 0xd8, 0x63, 0x36, 0x3c, 0x00, 0xb0, 0x88, 0x7d, 0x94, 0x86, + 0x25, 0x8e, 0x83, 0x31, 0x53, 0x09, 0xfb, 0x95, 0x2d, 0x5b, 0x2b, 0x84, 0xe6, 0x8e, 0x7c, 0xa8, + 0x81, 0x9d, 0x8c, 0x96, 0x8f, 0xd7, 0x75, 0x00, 0xec, 0x6a, 0x28, 0xc4, 0x58, 0x7a, 0x66, 0xe3, + 0x1f, 0x79, 0x66, 0xdd, 0xf1, 0xb5, 0xff, 0xe9, 0xf8, 0x27, 0x7d, 0xd0, 0xb8, 0x61, 0x00, 0xd8, + 0x04, 0xc0, 0x2a, 0x05, 0x77, 0x4b, 0x82, 0x00, 0x6c, 0x5a, 0x25, 0x1d, 0xaa, 0x25, 0x77, 0x6a, + 0x1f, 0xbf, 0xaa, 0x92, 0x75, 0x72, 0x31, 0x57, 0xe5, 0xcb, 0xb9, 0x2a, 0xff, 0x98, 0xab, 0xf2, + 0xf9, 0x42, 0x95, 0x2e, 0x17, 0xaa, 0xf4, 0x7d, 0xa1, 0x4a, 0x6f, 0x06, 0x6b, 0xc6, 0xad, 0x5c, + 0x76, 0x18, 0x3a, 0x6e, 0x26, 0x02, 0xf3, 0xac, 0x7f, 0x64, 0x7e, 0x10, 0xff, 0x2b, 0x66, 0x64, + 0x77, 0x93, 0x3d, 0xe8, 0xe9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xd6, 0xd2, 0x8b, 0xce, 0x04, 0x00, 0x00, } diff --git a/x/lockup/types/query.pb.go b/x/lockup/types/query.pb.go index 13802e3665b..aa1af9d8989 100644 --- a/x/lockup/types/query.pb.go +++ b/x/lockup/types/query.pb.go @@ -1566,97 +1566,97 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/query.proto", fileDescriptor_e906fda01cffd91a) } var fileDescriptor_e906fda01cffd91a = []byte{ - // 1427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0xc5, - 0x1b, 0xce, 0xb4, 0x4d, 0x7f, 0xbf, 0xbe, 0xa5, 0x1f, 0x1a, 0xda, 0x92, 0x6c, 0x5b, 0x3b, 0xdd, - 0xb6, 0xc1, 0x40, 0xbc, 0xdb, 0x24, 0x55, 0x52, 0xaa, 0xb4, 0x49, 0x1d, 0x13, 0x14, 0x30, 0xd0, - 0xba, 0x85, 0x8a, 0x2f, 0x59, 0x6b, 0x7b, 0xeb, 0xae, 0x62, 0xef, 0xb8, 0xde, 0x75, 0xc1, 0x54, - 0xa5, 0xa2, 0xe5, 0xc8, 0xa1, 0x88, 0x0b, 0xe2, 0x80, 0x80, 0x1b, 0x1c, 0x10, 0x17, 0x0e, 0x15, - 0x77, 0x54, 0x81, 0x84, 0x2a, 0x71, 0x41, 0x1c, 0x52, 0x94, 0xf0, 0x17, 0xe4, 0xc4, 0x11, 0xed, - 0xcc, 0xec, 0xc6, 0xbb, 0xde, 0x5d, 0xef, 0xda, 0x24, 0xca, 0xc9, 0x1f, 0xf3, 0xce, 0xfb, 0x3e, - 0xcf, 0x33, 0xef, 0xce, 0xcc, 0xb3, 0x20, 0x10, 0xa3, 0x46, 0x0c, 0xcd, 0x90, 0xab, 0xa4, 0xb4, - 0xd4, 0xac, 0xcb, 0x37, 0x9a, 0x6a, 0xa3, 0x25, 0xd5, 0x1b, 0xc4, 0x24, 0x78, 0x2f, 0x1f, 0x93, - 0xd8, 0x98, 0x70, 0xa0, 0x42, 0x2a, 0x84, 0x0e, 0xc9, 0xd6, 0x37, 0x16, 0x25, 0x24, 0x4a, 0x34, - 0x4c, 0x2e, 0x2a, 0x86, 0x2a, 0xdf, 0x1c, 0x2f, 0xaa, 0xa6, 0x32, 0x2e, 0x97, 0x88, 0xa6, 0xf3, - 0xf1, 0x23, 0x15, 0x42, 0x2a, 0x55, 0x55, 0x56, 0xea, 0x9a, 0xac, 0xe8, 0x3a, 0x31, 0x15, 0x53, - 0x23, 0xba, 0xc1, 0x47, 0x93, 0x7c, 0x94, 0xfe, 0x2a, 0x36, 0xaf, 0xc9, 0xa6, 0x56, 0x53, 0x0d, - 0x53, 0xa9, 0xd5, 0xed, 0xf4, 0xde, 0x80, 0x72, 0xb3, 0x41, 0x33, 0xf0, 0xf1, 0x61, 0x0f, 0x01, - 0xeb, 0x83, 0x0d, 0x89, 0x87, 0xe0, 0xc0, 0x2b, 0xa4, 0xdc, 0xac, 0xaa, 0x19, 0xa5, 0xaa, 0xe8, - 0x25, 0x35, 0xaf, 0xde, 0x68, 0xaa, 0x86, 0x29, 0x7e, 0x00, 0x07, 0x3d, 0xff, 0x1b, 0x75, 0xa2, - 0x1b, 0x2a, 0x56, 0x60, 0xd0, 0x02, 0x6e, 0x0c, 0xa1, 0x91, 0xed, 0xa9, 0xdd, 0x13, 0xc3, 0x12, - 0xa3, 0x26, 0x59, 0xd4, 0x24, 0x4e, 0x4d, 0x9a, 0x27, 0x9a, 0x9e, 0x39, 0xf5, 0x70, 0x39, 0x39, - 0xf0, 0xdd, 0xe3, 0x64, 0xaa, 0xa2, 0x99, 0xd7, 0x9b, 0x45, 0xa9, 0x44, 0x6a, 0x32, 0xd7, 0x81, - 0x7d, 0xa4, 0x8d, 0xf2, 0x92, 0x6c, 0xb6, 0xea, 0xaa, 0x41, 0x27, 0x18, 0x79, 0x96, 0x59, 0x3c, - 0x0c, 0xc3, 0xac, 0x76, 0x8e, 0x94, 0x96, 0xd4, 0xf2, 0x85, 0x1a, 0x69, 0xea, 0xa6, 0x0d, 0xec, - 0x0e, 0x08, 0x7e, 0x83, 0x9b, 0x87, 0xee, 0x45, 0x38, 0x7a, 0xa1, 0x54, 0xb2, 0xaa, 0xbe, 0xae, - 0x5b, 0x42, 0x2a, 0xc5, 0xaa, 0xca, 0x02, 0x18, 0x42, 0x3c, 0x0a, 0x83, 0xe4, 0x3d, 0x5d, 0x6d, - 0x0c, 0xa1, 0x11, 0x94, 0xda, 0x95, 0xd9, 0xbf, 0xb6, 0x9c, 0x7c, 0xa2, 0xa5, 0xd4, 0xaa, 0x67, - 0x45, 0xfa, 0xb7, 0x98, 0x67, 0xc3, 0xe2, 0x3d, 0x04, 0x89, 0xa0, 0x4c, 0x9b, 0x47, 0x67, 0x01, - 0x8e, 0xb8, 0x40, 0x68, 0x7a, 0xa5, 0x27, 0x36, 0x77, 0x91, 0x47, 0x97, 0xf5, 0x44, 0x9b, 0x47, - 0x66, 0x1e, 0x86, 0x39, 0x06, 0xd6, 0x1d, 0x3d, 0x31, 0xb9, 0x03, 0x82, 0x5f, 0x92, 0xcd, 0x63, - 0xf1, 0x25, 0x72, 0xd6, 0x84, 0x21, 0xb8, 0xa8, 0x18, 0xe6, 0x15, 0xad, 0xa6, 0xc6, 0x64, 0x82, - 0xdf, 0x80, 0x5d, 0xce, 0x56, 0x31, 0xb4, 0x6d, 0x04, 0xa5, 0x76, 0x4f, 0x08, 0x12, 0xdb, 0x2b, - 0x24, 0x7b, 0xaf, 0x90, 0xae, 0xd8, 0x11, 0x99, 0x23, 0x16, 0xe0, 0xb5, 0xe5, 0xe4, 0x7e, 0x96, - 0xcb, 0x99, 0x2a, 0xde, 0x7f, 0x9c, 0x44, 0xf9, 0xf5, 0x54, 0xe2, 0x55, 0x67, 0xa9, 0xbd, 0xf8, - 0xb8, 0x48, 0x53, 0x30, 0x68, 0xb5, 0x80, 0x2d, 0x92, 0x20, 0xb9, 0x77, 0x49, 0xe9, 0xa2, 0xda, - 0xd0, 0x48, 0xd9, 0x9a, 0x9c, 0xd9, 0x61, 0x15, 0xcd, 0xb3, 0x70, 0xf1, 0x7b, 0x04, 0x63, 0xbe, - 0x99, 0x5f, 0x25, 0xeb, 0x5d, 0xf5, 0x9a, 0x5e, 0x6d, 0x6d, 0x15, 0x25, 0x2a, 0x90, 0x8e, 0x88, - 0xb7, 0x4f, 0x65, 0xbe, 0x41, 0x30, 0xe2, 0x7a, 0xbc, 0xd4, 0x72, 0x46, 0xbd, 0x46, 0x1a, 0xea, - 0x56, 0xea, 0x8b, 0xb7, 0xe1, 0x58, 0x08, 0xc6, 0x3e, 0x15, 0x78, 0x80, 0x9c, 0xec, 0x6e, 0xad, - 0xb3, 0xaa, 0x4e, 0x6a, 0x5b, 0x44, 0x02, 0x7c, 0x00, 0x06, 0xcb, 0x16, 0x9e, 0xa1, 0xed, 0x56, - 0xfd, 0x3c, 0xfb, 0x21, 0xbe, 0x03, 0x62, 0x18, 0xf4, 0x3e, 0x95, 0xf9, 0x10, 0x30, 0x4b, 0xeb, - 0x52, 0xc2, 0x41, 0x82, 0xda, 0x90, 0xe0, 0x3c, 0xfc, 0xdf, 0xbe, 0x1c, 0x70, 0xda, 0xc3, 0x1d, - 0xb4, 0xb3, 0x3c, 0x20, 0x73, 0x98, 0xb3, 0xde, 0xc7, 0x58, 0xdb, 0x13, 0xc5, 0xcf, 0x2d, 0xd2, - 0x4e, 0x1e, 0x51, 0x87, 0x27, 0x5d, 0xf5, 0x39, 0x9d, 0xab, 0xb0, 0x53, 0xa1, 0xa7, 0x33, 0x5f, - 0x8b, 0x59, 0x2b, 0xdb, 0x9f, 0xcb, 0xc9, 0xd1, 0x08, 0xfb, 0xe1, 0xa2, 0x6e, 0xae, 0x2d, 0x27, - 0xf7, 0xb0, 0xba, 0x2c, 0x8b, 0x98, 0xe7, 0xe9, 0xc4, 0x14, 0xec, 0x61, 0xf5, 0x6c, 0xaa, 0x4f, - 0xc1, 0xff, 0x2c, 0x25, 0x0a, 0x5a, 0x99, 0x96, 0xda, 0x91, 0xdf, 0x69, 0xfd, 0x5c, 0x2c, 0x8b, - 0x73, 0xb0, 0xd7, 0x8e, 0xe4, 0xa0, 0x24, 0xd8, 0x61, 0x8d, 0xd1, 0xb8, 0x50, 0x89, 0xf3, 0x34, - 0x4e, 0x9c, 0x81, 0x63, 0x97, 0x5b, 0xba, 0x79, 0x5d, 0x35, 0xb5, 0x52, 0x8e, 0xc6, 0x18, 0x99, - 0x16, 0xfb, 0xb2, 0x98, 0xed, 0x5a, 0xbf, 0x01, 0x62, 0xd8, 0x6c, 0x8e, 0x29, 0x07, 0xfb, 0x0c, - 0x3b, 0xaa, 0xd0, 0xde, 0x01, 0x47, 0xbd, 0xf0, 0x5c, 0xc9, 0x78, 0x13, 0xec, 0x35, 0xda, 0xff, - 0x34, 0xc4, 0xaf, 0x90, 0xa7, 0xd9, 0x72, 0x44, 0xaf, 0xa8, 0x0d, 0x7b, 0x51, 0xe3, 0x3e, 0x28, - 0x1b, 0xd1, 0x30, 0xef, 0xc2, 0xf1, 0x50, 0x84, 0x7d, 0x3e, 0x0f, 0x5f, 0x78, 0xcf, 0xcf, 0xad, - 0xc4, 0xdd, 0x7b, 0x76, 0xfe, 0x67, 0xac, 0x7f, 0x40, 0x30, 0x11, 0xa2, 0x6a, 0xbf, 0x27, 0xe8, - 0x46, 0x68, 0x51, 0x83, 0xc9, 0x58, 0x88, 0xfb, 0x54, 0xe8, 0x27, 0x04, 0x4f, 0x87, 0xd4, 0xeb, - 0xe9, 0x1c, 0xd9, 0x00, 0x59, 0x02, 0xce, 0x90, 0x22, 0xa4, 0xba, 0x83, 0xef, 0x4f, 0xa1, 0x89, - 0x8f, 0x86, 0x60, 0xf0, 0x92, 0xe5, 0x6e, 0xf1, 0x27, 0x08, 0xf6, 0xb8, 0x0c, 0x20, 0x3e, 0xe1, - 0x4d, 0xe2, 0xe7, 0x1b, 0x85, 0x93, 0x5d, 0xa2, 0x18, 0x40, 0x51, 0xba, 0xfb, 0xfb, 0xdf, 0x9f, - 0x6d, 0x4b, 0xe1, 0x51, 0xd9, 0x63, 0x4d, 0x6d, 0x73, 0x5c, 0xa3, 0xd3, 0x0a, 0x45, 0x5e, 0xfc, - 0x6b, 0x04, 0xb8, 0xd3, 0xf6, 0xe1, 0x67, 0xfc, 0xab, 0xf9, 0xf8, 0x46, 0xe1, 0xd9, 0x28, 0xa1, - 0x1c, 0xdd, 0x69, 0x8a, 0x4e, 0xc2, 0x63, 0x5d, 0xd0, 0xb1, 0x3b, 0x4e, 0x81, 0x1d, 0x4b, 0xf8, - 0x01, 0x82, 0x43, 0xfe, 0x7e, 0x0e, 0xa7, 0xbd, 0xc5, 0x43, 0x1d, 0xa4, 0x20, 0x45, 0x0d, 0xe7, - 0x78, 0xe7, 0x28, 0xde, 0xb3, 0xf8, 0x4c, 0x10, 0x5e, 0x85, 0xcd, 0x2f, 0x34, 0x9d, 0x04, 0x05, - 0x6a, 0x35, 0xe4, 0x5b, 0xb4, 0x8b, 0x6f, 0xe3, 0x1f, 0x11, 0x1c, 0xf4, 0x75, 0x6f, 0x78, 0x2c, - 0x14, 0x8b, 0xc7, 0x2d, 0x0a, 0xe9, 0x88, 0xd1, 0x1c, 0xf8, 0x2c, 0x05, 0xfe, 0x3c, 0x9e, 0x8e, - 0x06, 0x5c, 0xd3, 0x2b, 0x1e, 0xdc, 0xdf, 0x22, 0xc0, 0x9d, 0x66, 0xad, 0xb3, 0x2f, 0x02, 0x5d, - 0x61, 0x67, 0x5f, 0x04, 0x7b, 0x3f, 0x71, 0x86, 0xc2, 0x9d, 0xc2, 0xa7, 0xbb, 0xc1, 0xe5, 0x8d, - 0x11, 0xa8, 0xb1, 0xfb, 0x16, 0x18, 0xa8, 0xb1, 0xaf, 0xfb, 0x0b, 0xd4, 0xd8, 0xdf, 0x8b, 0x45, - 0xd7, 0x98, 0x83, 0xae, 0x2b, 0x86, 0x69, 0xdd, 0x67, 0x1d, 0xdc, 0xff, 0x20, 0x38, 0x19, 0xc9, - 0xe4, 0xe0, 0x99, 0x48, 0xc8, 0x02, 0x4e, 0x22, 0xe1, 0x5c, 0x8f, 0xb3, 0x39, 0xcf, 0x3c, 0xe5, - 0x99, 0xc3, 0x2f, 0xc5, 0xe4, 0x59, 0xd0, 0x49, 0x7b, 0x7f, 0x11, 0xbd, 0xda, 0x72, 0xa8, 0xff, - 0x8c, 0x9c, 0x17, 0x0a, 0x9d, 0x8e, 0x06, 0x9f, 0x0a, 0x6d, 0x76, 0x1f, 0x83, 0x26, 0x8c, 0xc7, - 0x98, 0xc1, 0x69, 0x65, 0x29, 0xad, 0xf3, 0x78, 0x26, 0xda, 0x23, 0xa2, 0x96, 0x0b, 0x45, 0x9a, - 0xa4, 0xe0, 0x5a, 0xc3, 0x5f, 0x90, 0xe7, 0xa5, 0x86, 0xcb, 0x81, 0xe0, 0xf1, 0x48, 0xd2, 0xb7, - 0x1f, 0x90, 0xc2, 0x44, 0x9c, 0x29, 0x9c, 0xcb, 0x0b, 0x94, 0xcb, 0x2c, 0x3e, 0x17, 0x77, 0x89, - 0xe8, 0x09, 0xe8, 0x90, 0xf9, 0x18, 0xc1, 0xee, 0x36, 0xc3, 0x81, 0x45, 0x2f, 0x94, 0x4e, 0x37, - 0x24, 0x1c, 0x0f, 0x8d, 0xe1, 0xf8, 0xc6, 0x28, 0xbe, 0x51, 0x7c, 0x22, 0x08, 0x1f, 0xc7, 0xc5, - 0xac, 0xd4, 0x3d, 0x04, 0xc0, 0xb2, 0x64, 0x5a, 0x8b, 0x59, 0x7c, 0xd4, 0xbf, 0x82, 0x0d, 0x20, - 0x11, 0x34, 0xcc, 0x6b, 0x4f, 0xd1, 0xda, 0xa7, 0xb0, 0xd4, 0xa5, 0x76, 0xb1, 0x55, 0xd0, 0xca, - 0xf2, 0x2d, 0xee, 0x37, 0x6e, 0xe3, 0x5f, 0x11, 0x08, 0xc1, 0x1e, 0xa3, 0x73, 0x65, 0xbb, 0xba, - 0x99, 0xce, 0x95, 0xed, 0x6e, 0x61, 0xc4, 0x05, 0x8a, 0x7e, 0x0e, 0x9f, 0x0f, 0x42, 0xef, 0x36, - 0x38, 0xcd, 0xba, 0x61, 0x11, 0xe1, 0x24, 0xda, 0xd8, 0xfc, 0x86, 0xe0, 0x70, 0xc8, 0x2d, 0x07, - 0x87, 0x77, 0x9d, 0xaf, 0xd3, 0x11, 0x26, 0x63, 0xcd, 0x89, 0x4a, 0xc8, 0xd3, 0xaa, 0x55, 0x9a, - 0xa6, 0x60, 0xdf, 0xe1, 0x82, 0x37, 0x7d, 0x87, 0x4a, 0xf8, 0xa6, 0xef, 0x25, 0x91, 0x8e, 0x18, - 0xdd, 0xe3, 0xa6, 0xdf, 0x81, 0xfb, 0xd3, 0x6d, 0xf0, 0x5c, 0x8c, 0xbb, 0x39, 0xce, 0xc4, 0x10, - 0x39, 0xe8, 0x00, 0x98, 0xef, 0x2b, 0x07, 0x67, 0xfe, 0x26, 0x65, 0x7e, 0x19, 0x5f, 0xea, 0x6d, - 0xe1, 0xc2, 0x4e, 0x83, 0xd5, 0xf5, 0x77, 0x70, 0x81, 0x57, 0x70, 0x3c, 0x1d, 0x83, 0x84, 0x6b, - 0x87, 0x3a, 0x13, 0x7f, 0x22, 0xa7, 0x9c, 0xa3, 0x94, 0x17, 0x70, 0xb6, 0x47, 0xca, 0xae, 0xdd, - 0x35, 0xf3, 0xf2, 0xc3, 0x95, 0x04, 0x7a, 0xb4, 0x92, 0x40, 0x7f, 0xad, 0x24, 0xd0, 0xfd, 0xd5, - 0xc4, 0xc0, 0xa3, 0xd5, 0xc4, 0xc0, 0x1f, 0xab, 0x89, 0x81, 0xb7, 0xc6, 0xdb, 0x5e, 0xdc, 0xf0, - 0x4a, 0xe9, 0xaa, 0x52, 0x34, 0x9c, 0xb2, 0x37, 0xa7, 0xe5, 0xf7, 0xed, 0xda, 0xf4, 0x3d, 0x4e, - 0x71, 0x27, 0x35, 0x41, 0x93, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x62, 0xa3, 0x5a, 0xf4, 0x43, - 0x1b, 0x00, 0x00, + // 1426 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xce, 0xb4, 0x4d, 0xa1, 0xaf, 0xf4, 0x87, 0x86, 0xb6, 0x24, 0xdb, 0xd6, 0x4e, 0xb7, 0x6d, + 0x30, 0x10, 0xef, 0x26, 0x6e, 0xd5, 0x96, 0x2a, 0x6d, 0x52, 0xc7, 0x04, 0x05, 0x19, 0x68, 0xdd, + 0x42, 0xc5, 0x2f, 0x59, 0x6b, 0x7b, 0xeb, 0xae, 0x62, 0xef, 0xb8, 0xde, 0x75, 0xc1, 0x54, 0xa5, + 0xa2, 0xe5, 0xc8, 0xa1, 0x88, 0x0b, 0xe2, 0x80, 0x80, 0x1b, 0x1c, 0x10, 0x17, 0x0e, 0x15, 0x77, + 0x54, 0x81, 0x84, 0x2a, 0x71, 0x41, 0x1c, 0x52, 0x94, 0xf0, 0x17, 0xe4, 0xc4, 0x11, 0xed, 0xcc, + 0xec, 0xc6, 0xbb, 0xde, 0x5d, 0xef, 0xda, 0x24, 0xca, 0xc9, 0x3f, 0xe6, 0xcd, 0x7b, 0xdf, 0xf7, + 0xcd, 0xdb, 0x99, 0xf9, 0x16, 0x04, 0x62, 0xd4, 0x89, 0xa1, 0x19, 0x72, 0x8d, 0x94, 0x17, 0x5b, + 0x0d, 0xf9, 0x46, 0x4b, 0x6d, 0xb6, 0xa5, 0x46, 0x93, 0x98, 0x04, 0xef, 0xe6, 0x63, 0x12, 0x1b, + 0x13, 0xf6, 0x55, 0x49, 0x95, 0xd0, 0x21, 0xd9, 0xfa, 0xc6, 0xa2, 0x84, 0x44, 0x99, 0x86, 0xc9, + 0x25, 0xc5, 0x50, 0xe5, 0x9b, 0x53, 0x25, 0xd5, 0x54, 0xa6, 0xe4, 0x32, 0xd1, 0x74, 0x3e, 0x7e, + 0xa8, 0x4a, 0x48, 0xb5, 0xa6, 0xca, 0x4a, 0x43, 0x93, 0x15, 0x5d, 0x27, 0xa6, 0x62, 0x6a, 0x44, + 0x37, 0xf8, 0x68, 0x92, 0x8f, 0xd2, 0x5f, 0xa5, 0xd6, 0x35, 0xd9, 0xd4, 0xea, 0xaa, 0x61, 0x2a, + 0xf5, 0x86, 0x9d, 0xde, 0x1b, 0x50, 0x69, 0x35, 0x69, 0x06, 0x3e, 0x3e, 0xea, 0x21, 0x60, 0x7d, + 0xb0, 0x21, 0xf1, 0x00, 0xec, 0x7b, 0x95, 0x54, 0x5a, 0x35, 0x35, 0xab, 0xd4, 0x14, 0xbd, 0xac, + 0x16, 0xd4, 0x1b, 0x2d, 0xd5, 0x30, 0xc5, 0x0f, 0x61, 0xbf, 0xe7, 0x7f, 0xa3, 0x41, 0x74, 0x43, + 0xc5, 0x0a, 0x0c, 0x5b, 0xc0, 0x8d, 0x11, 0x34, 0xb6, 0x35, 0xb5, 0x33, 0x33, 0x2a, 0x31, 0x6a, + 0x92, 0x45, 0x4d, 0xe2, 0xd4, 0xa4, 0x39, 0xa2, 0xe9, 0xd9, 0xc9, 0x87, 0x4b, 0xc9, 0xa1, 0xef, + 0x1f, 0x27, 0x53, 0x55, 0xcd, 0xbc, 0xde, 0x2a, 0x49, 0x65, 0x52, 0x97, 0xb9, 0x0e, 0xec, 0x23, + 0x6d, 0x54, 0x16, 0x65, 0xb3, 0xdd, 0x50, 0x0d, 0x3a, 0xc1, 0x28, 0xb0, 0xcc, 0xe2, 0x41, 0x18, + 0x65, 0xb5, 0xf3, 0xa4, 0xbc, 0xa8, 0x56, 0x2e, 0xd4, 0x49, 0x4b, 0x37, 0x6d, 0x60, 0x77, 0x40, + 0xf0, 0x1b, 0xdc, 0x38, 0x74, 0x2f, 0xc3, 0xe1, 0x0b, 0xe5, 0xb2, 0x55, 0xf5, 0x0d, 0xdd, 0x12, + 0x52, 0x29, 0xd5, 0x54, 0x16, 0xc0, 0x10, 0xe2, 0x71, 0x18, 0x26, 0xef, 0xeb, 0x6a, 0x73, 0x04, + 0x8d, 0xa1, 0xd4, 0x8e, 0xec, 0xde, 0xd5, 0xa5, 0xe4, 0x53, 0x6d, 0xa5, 0x5e, 0x3b, 0x2b, 0xd2, + 0xbf, 0xc5, 0x02, 0x1b, 0x16, 0xef, 0x21, 0x48, 0x04, 0x65, 0xda, 0x38, 0x3a, 0xf3, 0x70, 0xc8, + 0x05, 0x42, 0xd3, 0xab, 0x7d, 0xb1, 0xb9, 0x8b, 0x3c, 0xba, 0xac, 0x25, 0xda, 0x38, 0x32, 0x73, + 0x30, 0xca, 0x31, 0xb0, 0xee, 0xe8, 0x8b, 0xc9, 0x1d, 0x10, 0xfc, 0x92, 0x6c, 0x1c, 0x8b, 0xaf, + 0x90, 0xb3, 0x26, 0x0c, 0xc1, 0x45, 0xc5, 0x30, 0xaf, 0x68, 0x75, 0x35, 0x26, 0x13, 0xfc, 0x26, + 0xec, 0x70, 0xb6, 0x8a, 0x91, 0x2d, 0x63, 0x28, 0xb5, 0x33, 0x23, 0x48, 0x6c, 0xaf, 0x90, 0xec, + 0xbd, 0x42, 0xba, 0x62, 0x47, 0x64, 0x0f, 0x59, 0x80, 0x57, 0x97, 0x92, 0x7b, 0x59, 0x2e, 0x67, + 0xaa, 0x78, 0xff, 0x71, 0x12, 0x15, 0xd6, 0x52, 0x89, 0x57, 0x9d, 0xa5, 0xf6, 0xe2, 0xe3, 0x22, + 0x9d, 0x82, 0x61, 0xab, 0x05, 0x6c, 0x91, 0x04, 0xc9, 0xbd, 0x4b, 0x4a, 0x17, 0xd5, 0xa6, 0x46, + 0x2a, 0xd6, 0xe4, 0xec, 0x36, 0xab, 0x68, 0x81, 0x85, 0x8b, 0x3f, 0x20, 0x98, 0xf0, 0xcd, 0xfc, + 0x1a, 0x59, 0xeb, 0xaa, 0xd7, 0xf5, 0x5a, 0x7b, 0xb3, 0x28, 0x51, 0x85, 0x74, 0x44, 0xbc, 0x03, + 0x2a, 0xf3, 0x2d, 0x82, 0x31, 0xd7, 0xe3, 0xa5, 0x56, 0xb2, 0xea, 0x35, 0xd2, 0x54, 0x37, 0x53, + 0x5f, 0xbc, 0x03, 0x47, 0x42, 0x30, 0x0e, 0xa8, 0xc0, 0x03, 0xe4, 0x64, 0x77, 0x6b, 0x9d, 0x53, + 0x75, 0x52, 0xdf, 0x24, 0x12, 0xe0, 0x7d, 0x30, 0x5c, 0xb1, 0xf0, 0x8c, 0x6c, 0xb5, 0xea, 0x17, + 0xd8, 0x0f, 0xf1, 0x5d, 0x10, 0xc3, 0xa0, 0x0f, 0xa8, 0xcc, 0x47, 0x80, 0x59, 0x5a, 0x97, 0x12, + 0x0e, 0x12, 0xd4, 0x81, 0x04, 0x17, 0xe0, 0x49, 0xfb, 0x72, 0xc0, 0x69, 0x8f, 0x76, 0xd1, 0xce, + 0xf1, 0x80, 0xec, 0x41, 0xce, 0x7a, 0x0f, 0x63, 0x6d, 0x4f, 0x14, 0xbf, 0xb0, 0x48, 0x3b, 0x79, + 0x44, 0x1d, 0x9e, 0x76, 0xd5, 0xe7, 0x74, 0xae, 0xc2, 0x76, 0x85, 0x9e, 0xce, 0x7c, 0x2d, 0x66, + 0xac, 0x6c, 0x7f, 0x2d, 0x25, 0xc7, 0x23, 0xec, 0x87, 0x0b, 0xba, 0xb9, 0xba, 0x94, 0xdc, 0xc5, + 0xea, 0xb2, 0x2c, 0x62, 0x81, 0xa7, 0x13, 0x53, 0xb0, 0x8b, 0xd5, 0xb3, 0xa9, 0x3e, 0x03, 0x4f, + 0x58, 0x4a, 0x14, 0xb5, 0x0a, 0x2d, 0xb5, 0xad, 0xb0, 0xdd, 0xfa, 0xb9, 0x50, 0x11, 0x67, 0x61, + 0xb7, 0x1d, 0xc9, 0x41, 0x49, 0xb0, 0xcd, 0x1a, 0xa3, 0x71, 0xa1, 0x12, 0x17, 0x68, 0x9c, 0x38, + 0x0d, 0x47, 0x2e, 0xb7, 0x75, 0xf3, 0xba, 0x6a, 0x6a, 0xe5, 0x3c, 0x8d, 0x31, 0xb2, 0x6d, 0xf6, + 0x65, 0x21, 0xd7, 0xb3, 0x7e, 0x13, 0xc4, 0xb0, 0xd9, 0x1c, 0x53, 0x1e, 0xf6, 0x18, 0x76, 0x54, + 0xb1, 0xb3, 0x03, 0x0e, 0x7b, 0xe1, 0xb9, 0x92, 0xf1, 0x26, 0xd8, 0x6d, 0x74, 0xfe, 0x69, 0x88, + 0x5f, 0x23, 0x4f, 0xb3, 0xe5, 0x89, 0x5e, 0x55, 0x9b, 0xf6, 0xa2, 0xc6, 0x7d, 0x50, 0xd6, 0xa3, + 0x61, 0xde, 0x83, 0xa3, 0xa1, 0x08, 0x07, 0x7c, 0x1e, 0xbe, 0xf4, 0x9e, 0x9f, 0x9b, 0x89, 0xbb, + 0xf7, 0xec, 0xfc, 0xdf, 0x58, 0xff, 0x88, 0x20, 0x13, 0xa2, 0xea, 0xa0, 0x27, 0xe8, 0x7a, 0x68, + 0x51, 0x87, 0x13, 0xb1, 0x10, 0x0f, 0xa8, 0xd0, 0xcf, 0x08, 0x9e, 0x0d, 0xa9, 0xd7, 0xd7, 0x39, + 0xb2, 0x0e, 0xb2, 0x04, 0x9c, 0x21, 0x25, 0x48, 0xf5, 0x06, 0x3f, 0x98, 0x42, 0x99, 0x8f, 0x47, + 0x60, 0xf8, 0x92, 0xe5, 0x6e, 0xf1, 0xa7, 0x08, 0x76, 0xb9, 0x0c, 0x20, 0x3e, 0xe6, 0x4d, 0xe2, + 0xe7, 0x1b, 0x85, 0xe3, 0x3d, 0xa2, 0x18, 0x40, 0x51, 0xba, 0xfb, 0xc7, 0x3f, 0x9f, 0x6f, 0x49, + 0xe1, 0x71, 0xd9, 0x63, 0x4d, 0x6d, 0x73, 0x5c, 0xa7, 0xd3, 0x8a, 0x25, 0x5e, 0xfc, 0x1b, 0x04, + 0xb8, 0xdb, 0xf6, 0xe1, 0xe7, 0xfc, 0xab, 0xf9, 0xf8, 0x46, 0xe1, 0xf9, 0x28, 0xa1, 0x1c, 0xdd, + 0x49, 0x8a, 0x4e, 0xc2, 0x13, 0x3d, 0xd0, 0xb1, 0x3b, 0x4e, 0x91, 0x1d, 0x4b, 0xf8, 0x01, 0x82, + 0x03, 0xfe, 0x7e, 0x0e, 0xa7, 0xbd, 0xc5, 0x43, 0x1d, 0xa4, 0x20, 0x45, 0x0d, 0xe7, 0x78, 0x67, + 0x29, 0xde, 0xb3, 0xf8, 0x4c, 0x10, 0x5e, 0x85, 0xcd, 0x2f, 0xb6, 0x9c, 0x04, 0x45, 0x6a, 0x35, + 0xe4, 0x5b, 0xb4, 0x8b, 0x6f, 0xe3, 0x9f, 0x10, 0xec, 0xf7, 0x75, 0x6f, 0x78, 0x22, 0x14, 0x8b, + 0xc7, 0x2d, 0x0a, 0xe9, 0x88, 0xd1, 0x1c, 0xf8, 0x0c, 0x05, 0xfe, 0x22, 0x3e, 0x1d, 0x0d, 0xb8, + 0xa6, 0x57, 0x3d, 0xb8, 0xbf, 0x43, 0x80, 0xbb, 0xcd, 0x5a, 0x77, 0x5f, 0x04, 0xba, 0xc2, 0xee, + 0xbe, 0x08, 0xf6, 0x7e, 0xe2, 0x34, 0x85, 0x7b, 0x0a, 0x9f, 0xec, 0x05, 0x97, 0x37, 0x46, 0xa0, + 0xc6, 0xee, 0x5b, 0x60, 0xa0, 0xc6, 0xbe, 0xee, 0x2f, 0x50, 0x63, 0x7f, 0x2f, 0x16, 0x5d, 0x63, + 0x0e, 0xba, 0xa1, 0x18, 0xa6, 0x75, 0x9f, 0x75, 0x70, 0xff, 0x8b, 0xe0, 0x78, 0x24, 0x93, 0x83, + 0xa7, 0x23, 0x21, 0x0b, 0x38, 0x89, 0x84, 0x73, 0x7d, 0xce, 0xe6, 0x3c, 0x0b, 0x94, 0x67, 0x1e, + 0xbf, 0x12, 0x93, 0x67, 0x51, 0x27, 0x9d, 0xfd, 0x45, 0xf4, 0x5a, 0xdb, 0xa1, 0xfe, 0x0b, 0x72, + 0x5e, 0x28, 0x74, 0x3b, 0x1a, 0x3c, 0x19, 0xda, 0xec, 0x3e, 0x06, 0x4d, 0x98, 0x8a, 0x31, 0x83, + 0xd3, 0xca, 0x51, 0x5a, 0xe7, 0xf1, 0x74, 0xb4, 0x47, 0x44, 0xad, 0x14, 0x4b, 0x34, 0x49, 0xd1, + 0xb5, 0x86, 0xbf, 0x22, 0xcf, 0x4b, 0x0d, 0x97, 0x03, 0xc1, 0x53, 0x91, 0xa4, 0xef, 0x3c, 0x20, + 0x85, 0x4c, 0x9c, 0x29, 0x9c, 0xcb, 0x4b, 0x94, 0xcb, 0x0c, 0x3e, 0x17, 0x77, 0x89, 0xe8, 0x09, + 0xe8, 0x90, 0xf9, 0x04, 0xc1, 0xce, 0x0e, 0xc3, 0x81, 0x45, 0x2f, 0x94, 0x6e, 0x37, 0x24, 0x1c, + 0x0d, 0x8d, 0xe1, 0xf8, 0x26, 0x28, 0xbe, 0x71, 0x7c, 0x2c, 0x08, 0x1f, 0xc7, 0xc5, 0xac, 0xd4, + 0x3d, 0x04, 0xc0, 0xb2, 0x64, 0xdb, 0x0b, 0x39, 0x7c, 0xd8, 0xbf, 0x82, 0x0d, 0x20, 0x11, 0x34, + 0xcc, 0x6b, 0x9f, 0xa2, 0xb5, 0x27, 0xb1, 0xd4, 0xa3, 0x76, 0xa9, 0x5d, 0xd4, 0x2a, 0xf2, 0x2d, + 0xee, 0x37, 0x6e, 0xe3, 0xdf, 0x10, 0x08, 0xc1, 0x1e, 0xa3, 0x7b, 0x65, 0x7b, 0xba, 0x99, 0xee, + 0x95, 0xed, 0x6d, 0x61, 0xc4, 0x79, 0x8a, 0x7e, 0x16, 0x9f, 0x0f, 0x42, 0xef, 0x36, 0x38, 0xad, + 0x86, 0x61, 0x11, 0xe1, 0x24, 0x3a, 0xd8, 0xfc, 0x8e, 0xe0, 0x60, 0xc8, 0x2d, 0x07, 0x87, 0x77, + 0x9d, 0xaf, 0xd3, 0x11, 0x4e, 0xc4, 0x9a, 0x13, 0x95, 0x90, 0xa7, 0x55, 0x6b, 0x34, 0x4d, 0xd1, + 0xbe, 0xc3, 0x05, 0x6f, 0xfa, 0x0e, 0x95, 0xf0, 0x4d, 0xdf, 0x4b, 0x22, 0x1d, 0x31, 0xba, 0xcf, + 0x4d, 0xbf, 0x0b, 0xf7, 0x67, 0x5b, 0xe0, 0x85, 0x18, 0x77, 0x73, 0x9c, 0x8d, 0x21, 0x72, 0xd0, + 0x01, 0x30, 0x37, 0x50, 0x0e, 0xce, 0xfc, 0x2d, 0xca, 0xfc, 0x32, 0xbe, 0xd4, 0xdf, 0xc2, 0x85, + 0x9d, 0x06, 0x2b, 0x6b, 0xef, 0xe0, 0x02, 0xaf, 0xe0, 0xf8, 0x74, 0x0c, 0x12, 0xae, 0x1d, 0xea, + 0x4c, 0xfc, 0x89, 0x9c, 0x72, 0x9e, 0x52, 0x9e, 0xc7, 0xb9, 0x3e, 0x29, 0xbb, 0x76, 0xd7, 0x6c, + 0xfe, 0xe1, 0x72, 0x02, 0x3d, 0x5a, 0x4e, 0xa0, 0xbf, 0x97, 0x13, 0xe8, 0xfe, 0x4a, 0x62, 0xe8, + 0xd1, 0x4a, 0x62, 0xe8, 0xcf, 0x95, 0xc4, 0xd0, 0xdb, 0x99, 0x8e, 0x17, 0x37, 0xbc, 0x52, 0xba, + 0xa6, 0x94, 0x0c, 0xa7, 0xec, 0xcd, 0xa9, 0x49, 0xf9, 0x03, 0xbb, 0x38, 0x7d, 0x91, 0x53, 0xda, + 0x4e, 0x5d, 0xd0, 0x89, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x70, 0x24, 0x96, 0x44, 0x1b, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lockup/types/tx.pb.go b/x/lockup/types/tx.pb.go index 68e7bc70548..774447792f5 100644 --- a/x/lockup/types/tx.pb.go +++ b/x/lockup/types/tx.pb.go @@ -453,44 +453,44 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/tx.proto", fileDescriptor_bcdad5af0d24735f) } var fileDescriptor_bcdad5af0d24735f = []byte{ - // 590 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x9d, 0xaf, 0x5f, 0xcb, 0xa5, 0xa4, 0xd4, 0x2a, 0x6a, 0x62, 0x81, 0x1d, 0x2c, 0xa0, - 0x41, 0x6a, 0x3d, 0xa4, 0x05, 0x21, 0xb1, 0x40, 0x22, 0x84, 0x45, 0x05, 0x91, 0x90, 0x55, 0x24, - 0xc4, 0x02, 0xc9, 0x76, 0x86, 0xa9, 0x15, 0xc7, 0x63, 0x65, 0xec, 0x92, 0xec, 0x79, 0x00, 0x96, - 0x3c, 0x03, 0x0b, 0x36, 0xbc, 0x44, 0x97, 0x5d, 0xb2, 0x4a, 0x51, 0xb2, 0x63, 0xd9, 0x35, 0x0b, - 0xe4, 0x71, 0xc6, 0xca, 0x9f, 0x48, 0x84, 0x04, 0xab, 0xc9, 0xcc, 0xb9, 0xf7, 0xdc, 0x7b, 0x4e, - 0x4e, 0x02, 0xdb, 0x94, 0xb5, 0x29, 0xf3, 0x18, 0xf2, 0xa9, 0xdb, 0x8a, 0x43, 0x14, 0x75, 0xcd, - 0xb0, 0x43, 0x23, 0xaa, 0x14, 0x46, 0x80, 0x99, 0x02, 0xea, 0x16, 0xa1, 0x84, 0x72, 0x08, 0x25, - 0x9f, 0xd2, 0x2a, 0x55, 0x23, 0x94, 0x12, 0x1f, 0x23, 0x7e, 0x73, 0xe2, 0x77, 0xa8, 0x19, 0x77, - 0xec, 0xc8, 0xa3, 0x81, 0xc0, 0x5d, 0x4e, 0x83, 0x1c, 0x9b, 0x61, 0x74, 0x52, 0x75, 0x70, 0x64, - 0x57, 0x91, 0x4b, 0x3d, 0x81, 0x97, 0xa6, 0xc6, 0x27, 0x47, 0x0a, 0x19, 0x1f, 0x64, 0xb8, 0xd2, - 0x60, 0xe4, 0x05, 0x75, 0x5b, 0x47, 0xb4, 0x85, 0x03, 0xa6, 0xdc, 0x81, 0x15, 0xfa, 0x3e, 0xc0, - 0x9d, 0xa2, 0x54, 0x96, 0x2a, 0x97, 0x6a, 0x57, 0x2f, 0xfa, 0xfa, 0x7a, 0xcf, 0x6e, 0xfb, 0x8f, - 0x0c, 0xfe, 0x6c, 0x58, 0x29, 0xac, 0x1c, 0xc3, 0x9a, 0x58, 0xa3, 0x28, 0x97, 0xa5, 0xca, 0xe5, - 0xfd, 0x92, 0x99, 0xee, 0x69, 0x8a, 0x3d, 0xcd, 0xfa, 0xa8, 0xa0, 0x56, 0x3d, 0xed, 0xeb, 0xb9, - 0x1f, 0x7d, 0x5d, 0x11, 0x2d, 0xbb, 0xb4, 0xed, 0x45, 0xb8, 0x1d, 0x46, 0xbd, 0x8b, 0xbe, 0xbe, - 0x91, 0xf2, 0x0b, 0xcc, 0xf8, 0x74, 0xae, 0x4b, 0x56, 0xc6, 0xae, 0xd8, 0xb0, 0x92, 0x88, 0x61, - 0xc5, 0x7c, 0x39, 0xcf, 0xc7, 0xa4, 0x72, 0xcd, 0x44, 0xae, 0x39, 0x92, 0x6b, 0x3e, 0xa5, 0x5e, - 0x50, 0xbb, 0x97, 0x8c, 0xf9, 0x7c, 0xae, 0x57, 0x88, 0x17, 0x1d, 0xc7, 0x8e, 0xe9, 0xd2, 0x36, - 0x1a, 0x79, 0x93, 0x1e, 0x7b, 0xac, 0xd9, 0x42, 0x51, 0x2f, 0xc4, 0x8c, 0x37, 0x30, 0x2b, 0x65, - 0x36, 0x76, 0xe0, 0xda, 0x84, 0x0b, 0x16, 0x66, 0x21, 0x0d, 0x18, 0x56, 0x0a, 0x20, 0x1f, 0xd6, - 0xb9, 0x15, 0xff, 0x59, 0xf2, 0x61, 0xdd, 0x78, 0x0c, 0x5b, 0x0d, 0x46, 0x6a, 0x98, 0x78, 0xc1, - 0xab, 0x20, 0xf1, 0xd1, 0x0b, 0xc8, 0x13, 0xdf, 0x5f, 0xd6, 0x35, 0xe3, 0x08, 0xae, 0xcf, 0xeb, - 0xcf, 0xe6, 0xdd, 0x87, 0xd5, 0x98, 0xbf, 0xb3, 0xa2, 0xc4, 0xd5, 0xaa, 0xe6, 0x64, 0x44, 0xcc, - 0x97, 0xb8, 0xe3, 0xd1, 0x66, 0xb2, 0xaa, 0x25, 0x4a, 0x8d, 0x2f, 0x12, 0x6c, 0xce, 0xd0, 0x2e, - 0xfd, 0x4d, 0xa6, 0x1a, 0x65, 0xa1, 0xf1, 0x5f, 0xf8, 0xfd, 0x00, 0x4a, 0x33, 0xfb, 0x66, 0x1e, - 0x14, 0x61, 0x95, 0xc5, 0xae, 0x8b, 0x19, 0xe3, 0x9b, 0xaf, 0x59, 0xe2, 0x6a, 0x7c, 0x95, 0x60, - 0xa3, 0xc1, 0xc8, 0xb3, 0x6e, 0x84, 0x03, 0x6e, 0x41, 0x1c, 0xfe, 0xb1, 0xca, 0xf1, 0xfc, 0xe6, - 0xff, 0x66, 0x7e, 0x8d, 0x03, 0xd8, 0x9e, 0x5a, 0x7a, 0xb1, 0xd4, 0xfd, 0x9f, 0x32, 0xe4, 0x1b, - 0x8c, 0x28, 0x16, 0xc0, 0xd8, 0x8f, 0xf3, 0xc6, 0x74, 0x1a, 0x26, 0x52, 0xab, 0xde, 0xfe, 0x2d, - 0x9c, 0x4d, 0x25, 0xb0, 0x39, 0x9b, 0xe0, 0x5b, 0x73, 0x7a, 0x67, 0xaa, 0xd4, 0xdd, 0x65, 0xaa, - 0xb2, 0x41, 0x6f, 0xa1, 0x30, 0x95, 0xc9, 0x9b, 0x0b, 0xfb, 0xd5, 0xbb, 0x0b, 0x4b, 0x32, 0xfe, - 0xd7, 0xb0, 0x3e, 0x91, 0x05, 0x7d, 0x4e, 0xeb, 0x78, 0x81, 0xba, 0xb3, 0xa0, 0x40, 0x30, 0xd7, - 0x9e, 0x9f, 0x0e, 0x34, 0xe9, 0x6c, 0xa0, 0x49, 0xdf, 0x07, 0x9a, 0xf4, 0x71, 0xa8, 0xe5, 0xce, - 0x86, 0x5a, 0xee, 0xdb, 0x50, 0xcb, 0xbd, 0xa9, 0x8e, 0x65, 0x7d, 0x44, 0xb6, 0xe7, 0xdb, 0x0e, - 0x13, 0x17, 0x74, 0xf2, 0x10, 0x75, 0xb3, 0x3f, 0xfa, 0x24, 0xfa, 0xce, 0xff, 0x3c, 0x50, 0x07, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xba, 0x65, 0x88, 0x8d, 0x07, 0x06, 0x00, 0x00, + // 589 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xbf, 0x6f, 0xd3, 0x40, + 0x18, 0x8d, 0x1d, 0x4a, 0xcb, 0x51, 0x52, 0x6a, 0x15, 0x35, 0xb1, 0xc0, 0x0e, 0x16, 0xd0, 0x20, + 0xb5, 0x77, 0x4d, 0x0a, 0x0b, 0x03, 0x12, 0x21, 0x0c, 0x95, 0x1a, 0x09, 0x59, 0x45, 0x42, 0x0c, + 0x48, 0xb6, 0x73, 0x5c, 0xad, 0x38, 0x3e, 0x2b, 0x67, 0x97, 0x64, 0xe7, 0x0f, 0x60, 0xe4, 0x6f, + 0x60, 0x60, 0xe1, 0x9f, 0xe8, 0xd8, 0x91, 0x29, 0x45, 0xc9, 0xc6, 0xd8, 0x99, 0x01, 0xf9, 0xec, + 0xb3, 0xf2, 0x4b, 0x24, 0x42, 0xa2, 0xd3, 0xe5, 0xee, 0x7d, 0xdf, 0xfb, 0xbe, 0xf7, 0xf2, 0x12, + 0xb0, 0x4d, 0x59, 0x87, 0x32, 0x97, 0x21, 0x8f, 0x3a, 0xed, 0x28, 0x40, 0x61, 0x0f, 0x06, 0x5d, + 0x1a, 0x52, 0xa5, 0x90, 0x02, 0x30, 0x01, 0xd4, 0x2d, 0x42, 0x09, 0xe5, 0x10, 0x8a, 0x3f, 0x25, + 0x55, 0xaa, 0x46, 0x28, 0x25, 0x1e, 0x46, 0xfc, 0x66, 0x47, 0x1f, 0x50, 0x2b, 0xea, 0x5a, 0xa1, + 0x4b, 0x7d, 0x81, 0x3b, 0x9c, 0x06, 0xd9, 0x16, 0xc3, 0xe8, 0xb4, 0x6a, 0xe3, 0xd0, 0xaa, 0x22, + 0x87, 0xba, 0x02, 0x2f, 0x4d, 0x8d, 0x8f, 0x8f, 0x04, 0x32, 0x3e, 0xc9, 0xe0, 0x56, 0x93, 0x91, + 0x23, 0xea, 0xb4, 0x8f, 0x69, 0x1b, 0xfb, 0x4c, 0x79, 0x04, 0x56, 0xe8, 0x47, 0x1f, 0x77, 0x8b, + 0x52, 0x59, 0xaa, 0xdc, 0xa8, 0xdf, 0xbe, 0x1c, 0xe8, 0xeb, 0x7d, 0xab, 0xe3, 0x3d, 0x33, 0xf8, + 0xb3, 0x61, 0x26, 0xb0, 0x72, 0x02, 0xd6, 0xc4, 0x1a, 0x45, 0xb9, 0x2c, 0x55, 0x6e, 0xd6, 0x4a, + 0x30, 0xd9, 0x13, 0x8a, 0x3d, 0x61, 0x23, 0x2d, 0xa8, 0x57, 0xcf, 0x06, 0x7a, 0xee, 0xd7, 0x40, + 0x57, 0x44, 0xcb, 0x2e, 0xed, 0xb8, 0x21, 0xee, 0x04, 0x61, 0xff, 0x72, 0xa0, 0x6f, 0x24, 0xfc, + 0x02, 0x33, 0xbe, 0x5c, 0xe8, 0x92, 0x99, 0xb1, 0x2b, 0x16, 0x58, 0x89, 0xc5, 0xb0, 0x62, 0xbe, + 0x9c, 0xe7, 0x63, 0x12, 0xb9, 0x30, 0x96, 0x0b, 0x53, 0xb9, 0xf0, 0x25, 0x75, 0xfd, 0xfa, 0x7e, + 0x3c, 0xe6, 0xeb, 0x85, 0x5e, 0x21, 0x6e, 0x78, 0x12, 0xd9, 0xd0, 0xa1, 0x1d, 0x94, 0x7a, 0x93, + 0x1c, 0x7b, 0xac, 0xd5, 0x46, 0x61, 0x3f, 0xc0, 0x8c, 0x37, 0x30, 0x33, 0x61, 0x36, 0x76, 0xc0, + 0x9d, 0x09, 0x17, 0x4c, 0xcc, 0x02, 0xea, 0x33, 0xac, 0x14, 0x80, 0x7c, 0xd8, 0xe0, 0x56, 0x5c, + 0x33, 0xe5, 0xc3, 0x86, 0xf1, 0x1c, 0x6c, 0x35, 0x19, 0xa9, 0x63, 0xe2, 0xfa, 0x6f, 0xfc, 0xd8, + 0x47, 0xd7, 0x27, 0x2f, 0x3c, 0x6f, 0x59, 0xd7, 0x8c, 0x63, 0x70, 0x77, 0x5e, 0x7f, 0x36, 0xef, + 0x09, 0x58, 0x8d, 0xf8, 0x3b, 0x2b, 0x4a, 0x5c, 0xad, 0x0a, 0x27, 0x23, 0x02, 0x5f, 0xe3, 0xae, + 0x4b, 0x5b, 0xf1, 0xaa, 0xa6, 0x28, 0x35, 0xbe, 0x49, 0x60, 0x73, 0x86, 0x76, 0xe9, 0x6f, 0x32, + 0xd1, 0x28, 0x0b, 0x8d, 0x57, 0xe1, 0xf7, 0x53, 0x50, 0x9a, 0xd9, 0x37, 0xf3, 0xa0, 0x08, 0x56, + 0x59, 0xe4, 0x38, 0x98, 0x31, 0xbe, 0xf9, 0x9a, 0x29, 0xae, 0xc6, 0x77, 0x09, 0x6c, 0x34, 0x19, + 0x79, 0xd5, 0x0b, 0xb1, 0xcf, 0x2d, 0x88, 0x82, 0x7f, 0x56, 0x39, 0x9e, 0xdf, 0xfc, 0xff, 0xcc, + 0xaf, 0x71, 0x00, 0xb6, 0xa7, 0x96, 0x5e, 0x2c, 0xb5, 0xf6, 0x5b, 0x06, 0xf9, 0x26, 0x23, 0x8a, + 0x09, 0xc0, 0xd8, 0x8f, 0xf3, 0xde, 0x74, 0x1a, 0x26, 0x52, 0xab, 0x3e, 0xfc, 0x2b, 0x9c, 0x4d, + 0x25, 0x60, 0x73, 0x36, 0xc1, 0x0f, 0xe6, 0xf4, 0xce, 0x54, 0xa9, 0xbb, 0xcb, 0x54, 0x65, 0x83, + 0xde, 0x83, 0xc2, 0x54, 0x26, 0xef, 0x2f, 0xec, 0x57, 0x1f, 0x2f, 0x2c, 0xc9, 0xf8, 0xdf, 0x82, + 0xf5, 0x89, 0x2c, 0xe8, 0x73, 0x5a, 0xc7, 0x0b, 0xd4, 0x9d, 0x05, 0x05, 0x82, 0xb9, 0x7e, 0x74, + 0x36, 0xd4, 0xa4, 0xf3, 0xa1, 0x26, 0xfd, 0x1c, 0x6a, 0xd2, 0xe7, 0x91, 0x96, 0x3b, 0x1f, 0x69, + 0xb9, 0x1f, 0x23, 0x2d, 0xf7, 0xae, 0x36, 0x96, 0xf5, 0x94, 0x6c, 0xcf, 0xb3, 0x6c, 0x26, 0x2e, + 0xe8, 0xb4, 0xba, 0x8f, 0x7a, 0xd9, 0x3f, 0x7d, 0x9c, 0x7d, 0xfb, 0x3a, 0x4f, 0xd4, 0xc1, 0x9f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0xf8, 0x55, 0x1e, 0x08, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go index f4e926ddd81..d9703eb8933 100644 --- a/x/mint/client/cli/cli_test.go +++ b/x/mint/client/cli/cli_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 26c94d6f9ac..368faff7cc4 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index b7aa537000a..9f8470cafe7 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -13,8 +13,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/app" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/testutil/network" ) diff --git a/x/mint/client/rest/query.go b/x/mint/client/rest/query.go index cab71e70587..6d52375f8a4 100644 --- a/x/mint/client/rest/query.go +++ b/x/mint/client/rest/query.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" diff --git a/x/mint/keeper/export_test.go b/x/mint/keeper/export_test.go index 67dd378ed54..888411f125f 100644 --- a/x/mint/keeper/export_test.go +++ b/x/mint/keeper/export_test.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) type ( diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go index 5633e9fcadf..875ad788626 100644 --- a/x/mint/keeper/genesis.go +++ b/x/mint/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) const developerVestingAmount = 225_000_000_000_000 diff --git a/x/mint/keeper/genesis_test.go b/x/mint/keeper/genesis_test.go index 72a29ba8b9c..dce0c939a66 100644 --- a/x/mint/keeper/genesis_test.go +++ b/x/mint/keeper/genesis_test.go @@ -7,9 +7,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) var customGenesis = types.NewGenesisState( diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 45b965152b3..00991239fa0 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) var _ types.QueryServer = Querier{} diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index 9f0d8d080ca..a53e74b8c0c 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) func TestMintGRPCQueryTestSuite(t *testing.T) { diff --git a/x/mint/keeper/hooks.go b/x/mint/keeper/hooks.go index 9c3e520e7fd..6fb37f37692 100644 --- a/x/mint/keeper/hooks.go +++ b/x/mint/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/hooks_test.go b/x/mint/keeper/hooks_test.go index 071e0124eb8..283e2cc6a6f 100644 --- a/x/mint/keeper/hooks_test.go +++ b/x/mint/keeper/hooks_test.go @@ -8,10 +8,10 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v7/app" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index f010155c8e7..93dab130363 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -6,8 +6,8 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go index 73baaa8c384..12eb528e3b1 100644 --- a/x/mint/keeper/keeper_test.go +++ b/x/mint/keeper/keeper_test.go @@ -16,12 +16,12 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/mint/module.go b/x/mint/module.go index 89eeb0ecb1e..e371d3a17d1 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -18,11 +18,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) var ( diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 33a752a5dc9..81a136f4ccd 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 23e5adfde66..e10979f35ba 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - simapp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index b750d55821c..3656ad635b7 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -5,7 +5,7 @@ package simulation import ( "math/rand" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 130760e45c8..41c9bf358a8 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index 29f1c7d3a78..4db66e45456 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -1,7 +1,7 @@ package types // noalias import ( - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index f93c2d59a1d..260ff0b4280 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -97,7 +97,7 @@ func init() { } var fileDescriptor_12e6a5511ad3feeb = []byte{ - // 282 bytes of a gzipped FileDescriptorProto + // 283 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xca, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, @@ -110,12 +110,12 @@ var fileDescriptor_12e6a5511ad3feeb = []byte{ 0xc5, 0x25, 0x5e, 0x94, 0x9a, 0x52, 0x9a, 0x5c, 0x92, 0x99, 0x9f, 0x17, 0x5f, 0x5c, 0x92, 0x58, 0x54, 0x92, 0x9a, 0x12, 0x9f, 0x5a, 0x90, 0x9f, 0x9c, 0x21, 0xc1, 0xac, 0xc0, 0xa8, 0xc1, 0xec, 0xa4, 0xf4, 0xe9, 0x9e, 0xbc, 0x5c, 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x0e, 0x85, 0x4a, 0x41, - 0xa2, 0x70, 0x99, 0x60, 0x88, 0x84, 0x2b, 0x48, 0xdc, 0xc9, 0xf3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, + 0xa2, 0x70, 0x99, 0x60, 0x88, 0x84, 0x2b, 0x48, 0xdc, 0xc9, 0xeb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, - 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, - 0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0xcc, 0xf5, 0x2b, 0x20, - 0x81, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x36, 0x63, 0x40, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xa2, 0xcc, 0xdf, 0xaf, 0xa9, 0x01, 0x00, 0x00, + 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x0c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, + 0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0x0d, 0xf4, 0x2b, + 0x20, 0xa1, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x37, 0x63, 0x40, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x4c, 0xe3, 0x63, 0xd9, 0xaa, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go index 954fdc0fc56..a2a03bfdc93 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -278,53 +278,53 @@ func init() { proto.RegisterFile("osmosis/mint/v1beta1/mint.proto", fileDescript var fileDescriptor_ccb38f8335e0f45b = []byte{ // 768 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xf3, 0x44, - 0x14, 0x8d, 0x49, 0x49, 0xe9, 0x54, 0x6d, 0x8a, 0x55, 0x1a, 0x53, 0x44, 0xdc, 0x5a, 0x2d, 0x0a, - 0x12, 0x8d, 0xd5, 0x76, 0x81, 0xd4, 0x0d, 0x10, 0x85, 0x42, 0x90, 0x90, 0xc2, 0xb0, 0xa8, 0xd4, - 0x8d, 0xe5, 0xd8, 0x53, 0x77, 0xd4, 0x78, 0xc6, 0xcc, 0x4c, 0x12, 0xb2, 0xe1, 0x05, 0xd8, 0xb0, - 0xec, 0x12, 0xde, 0xa6, 0xcb, 0xb2, 0x43, 0x2c, 0x22, 0xd4, 0xbe, 0x41, 0x5e, 0x80, 0x4f, 0xf3, - 0xe3, 0xa4, 0x75, 0x1b, 0xe9, 0x8b, 0xbe, 0x55, 0x3c, 0xe7, 0x9e, 0x9c, 0x73, 0x7d, 0xe7, 0xde, - 0x6b, 0xe0, 0x52, 0x9e, 0x52, 0x8e, 0xb9, 0x9f, 0x62, 0x22, 0xfc, 0xe1, 0x71, 0x0f, 0x89, 0xf0, - 0x58, 0x1d, 0x9a, 0x19, 0xa3, 0x82, 0xda, 0xdb, 0x86, 0xd0, 0x54, 0x98, 0x21, 0xec, 0x6e, 0x27, - 0x34, 0xa1, 0x8a, 0xe0, 0xcb, 0x27, 0xcd, 0xdd, 0x75, 0x13, 0x4a, 0x93, 0x3e, 0xf2, 0xd5, 0xa9, - 0x37, 0xb8, 0xf2, 0x05, 0x4e, 0x11, 0x17, 0x61, 0x9a, 0x19, 0xc2, 0xc7, 0x45, 0x42, 0x48, 0xc6, - 0x26, 0x54, 0x2f, 0x86, 0xe2, 0x01, 0x0b, 0x05, 0xa6, 0x44, 0xc7, 0xbd, 0xdf, 0x40, 0xe5, 0x47, - 0x4c, 0x04, 0x62, 0xb6, 0x00, 0x5b, 0x28, 0xa3, 0xd1, 0x75, 0x90, 0x31, 0x3a, 0xc4, 0x1c, 0x53, - 0xc2, 0x1d, 0x6b, 0xcf, 0x6a, 0xac, 0xb5, 0x3a, 0x77, 0x13, 0xb7, 0xf4, 0xef, 0xc4, 0xfd, 0x2c, - 0xc1, 0xe2, 0x7a, 0xd0, 0x6b, 0x46, 0x34, 0xf5, 0x23, 0x95, 0xbf, 0xf9, 0x39, 0xe2, 0xf1, 0x8d, - 0x2f, 0xc6, 0x19, 0xe2, 0xcd, 0x36, 0x8a, 0xa6, 0x13, 0xb7, 0x36, 0x0e, 0xd3, 0xfe, 0x99, 0x57, - 0xd4, 0xf3, 0x60, 0x55, 0x41, 0xdd, 0x39, 0x72, 0x6b, 0x81, 0xea, 0x05, 0xc2, 0xc9, 0xb5, 0x40, - 0xf1, 0x37, 0x71, 0xcc, 0x10, 0xe7, 0xf6, 0x17, 0x60, 0x35, 0xd4, 0x8f, 0x26, 0x01, 0x7b, 0x3a, - 0x71, 0x37, 0xb5, 0xa4, 0x09, 0x78, 0x30, 0xa7, 0xd8, 0x17, 0xa0, 0x32, 0x52, 0x02, 0xce, 0x7b, - 0x8a, 0xfc, 0xd5, 0xd2, 0xd9, 0x6e, 0x68, 0x69, 0xad, 0xe2, 0x41, 0x23, 0xe7, 0xfd, 0x5d, 0x06, - 0xb5, 0x36, 0xe6, 0x82, 0xe1, 0xde, 0x40, 0x56, 0xac, 0xcb, 0x68, 0x46, 0x99, 0x7c, 0xe2, 0xf6, - 0x25, 0x58, 0xe5, 0x22, 0xbc, 0xc1, 0x24, 0x31, 0x29, 0x7e, 0xbd, 0xb4, 0xab, 0x79, 0x21, 0x23, - 0xe3, 0xc1, 0x5c, 0xd0, 0xfe, 0x05, 0x54, 0x33, 0x4a, 0xfb, 0x01, 0x26, 0x11, 0x22, 0x02, 0x0f, - 0x11, 0x37, 0x6f, 0xf6, 0xfd, 0xd2, 0x1e, 0x3b, 0xda, 0xa3, 0x20, 0xe7, 0xc1, 0x4d, 0x89, 0x74, - 0x66, 0x80, 0x3d, 0x02, 0x1f, 0xc6, 0x68, 0x88, 0xfa, 0x34, 0x43, 0x2c, 0x60, 0x68, 0x14, 0xb2, - 0x98, 0x3b, 0x65, 0x65, 0xfa, 0xc3, 0xd2, 0xa6, 0x8e, 0x36, 0x7d, 0x21, 0xe8, 0xc1, 0xad, 0x19, - 0x06, 0x35, 0x64, 0x13, 0xb0, 0x19, 0xd1, 0x34, 0x1d, 0x10, 0x2c, 0xc6, 0x81, 0x4c, 0xca, 0x59, - 0x51, 0xae, 0xdf, 0x2d, 0xed, 0xfa, 0x91, 0x76, 0x7d, 0xae, 0xe6, 0xc1, 0x8d, 0x19, 0xd0, 0x95, - 0xe7, 0xff, 0x2b, 0xa0, 0xd2, 0x0d, 0x59, 0x98, 0x72, 0xfb, 0x53, 0x00, 0xe4, 0xec, 0x05, 0x31, - 0x22, 0x34, 0xd5, 0xb7, 0x08, 0xd7, 0x24, 0xd2, 0x96, 0x80, 0xfd, 0xbb, 0x05, 0x9c, 0x04, 0x11, - 0xc4, 0x31, 0x0f, 0x5e, 0xcc, 0x85, 0xbe, 0x8f, 0x9f, 0x96, 0x4e, 0xd2, 0xd5, 0x49, 0x2e, 0xd2, - 0xf5, 0xe0, 0x8e, 0x09, 0x7d, 0xfb, 0x7c, 0x4c, 0xec, 0xf3, 0x7c, 0x38, 0x71, 0x2c, 0xef, 0xec, - 0x0a, 0x23, 0x66, 0xee, 0xe7, 0x93, 0xe2, 0xb8, 0xcd, 0x19, 0xf9, 0xb8, 0x75, 0x66, 0x88, 0xdd, - 0x03, 0xbb, 0x0c, 0xc5, 0x83, 0x48, 0x76, 0x71, 0x90, 0x21, 0x86, 0x69, 0x1c, 0x60, 0xa2, 0x13, - 0xe1, 0xaa, 0xf6, 0xe5, 0xd6, 0xe1, 0x74, 0xe2, 0xee, 0x6b, 0xc5, 0xc5, 0x5c, 0x0f, 0xd6, 0x66, - 0xc1, 0xae, 0x8a, 0x75, 0x88, 0x4a, 0x9a, 0xcb, 0x45, 0x32, 0xff, 0xdf, 0x55, 0x18, 0x09, 0xca, - 0x9c, 0xf7, 0xdf, 0x6d, 0x91, 0x14, 0xf5, 0x3c, 0x58, 0x9d, 0x41, 0xe7, 0x0a, 0xb1, 0x09, 0x70, - 0xe2, 0x27, 0xc3, 0x2a, 0xab, 0x9a, 0x4f, 0xab, 0x53, 0xd9, 0xb3, 0x1a, 0xeb, 0x27, 0x47, 0xcd, - 0xd7, 0x76, 0x6e, 0x73, 0xc1, 0x88, 0xb7, 0x56, 0x64, 0xb2, 0xb0, 0x16, 0x2f, 0xd8, 0x00, 0x7f, - 0x59, 0xe0, 0x60, 0x64, 0x16, 0x57, 0xf0, 0xa2, 0xd7, 0x03, 0x86, 0x22, 0x84, 0x87, 0x88, 0x71, - 0x67, 0x75, 0xaf, 0xdc, 0x58, 0x3f, 0x39, 0x7c, 0xdd, 0xbc, 0xb0, 0xfa, 0x5a, 0x9f, 0x4b, 0xd3, - 0x79, 0xfd, 0x17, 0xeb, 0x7a, 0x70, 0x3f, 0x77, 0x6f, 0x17, 0x86, 0x0a, 0xe6, 0xd6, 0xb2, 0x87, - 0x1b, 0xd2, 0x0e, 0x93, 0x64, 0x26, 0xf0, 0xac, 0x48, 0x5c, 0x84, 0x4c, 0xe8, 0x1b, 0x75, 0x3e, - 0x50, 0x97, 0x7f, 0x3a, 0x9d, 0xb8, 0xbe, 0x36, 0x7f, 0xdb, 0x7f, 0x7a, 0xf0, 0xc0, 0x50, 0x4d, - 0x02, 0x4f, 0x2b, 0xfa, 0xb3, 0xe4, 0xa9, 0xc6, 0x38, 0x5b, 0xb9, 0xfd, 0xd3, 0x2d, 0xb5, 0x3a, - 0x77, 0x0f, 0x75, 0xeb, 0xfe, 0xa1, 0x6e, 0xfd, 0xf7, 0x50, 0xb7, 0xfe, 0x78, 0xac, 0x97, 0xee, - 0x1f, 0xeb, 0xa5, 0x7f, 0x1e, 0xeb, 0xa5, 0x4b, 0xff, 0x49, 0x57, 0x98, 0x62, 0x1d, 0xf5, 0xc3, - 0x1e, 0xcf, 0x0f, 0xfe, 0xf0, 0x4b, 0xff, 0x57, 0xfd, 0x41, 0x55, 0x2d, 0xd2, 0xab, 0xa8, 0x4f, - 0xd8, 0xe9, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x68, 0x80, 0x8b, 0x7e, 0x6d, 0x07, 0x00, 0x00, + 0x14, 0x8d, 0x49, 0x49, 0xf9, 0xe6, 0x53, 0x9b, 0x62, 0x95, 0xc6, 0x14, 0x11, 0xb7, 0x56, 0x8b, + 0x82, 0x44, 0xe3, 0xfe, 0xec, 0xba, 0x01, 0xa2, 0x50, 0x48, 0x25, 0xa4, 0x30, 0x2c, 0x2a, 0x75, + 0x63, 0x39, 0xf6, 0xd4, 0x1d, 0x35, 0x9e, 0x31, 0x33, 0x93, 0x84, 0x6c, 0x78, 0x01, 0x36, 0x2c, + 0xbb, 0x84, 0xb7, 0xe9, 0xb2, 0xec, 0x10, 0x8b, 0x08, 0xb5, 0x6f, 0x90, 0x17, 0x00, 0xcd, 0x8f, + 0x93, 0xd6, 0x6d, 0x24, 0xa2, 0x6f, 0x15, 0xcf, 0xb9, 0x27, 0xe7, 0x5c, 0xdf, 0xb9, 0xf7, 0x1a, + 0xb8, 0x94, 0xa7, 0x94, 0x63, 0xee, 0xa7, 0x98, 0x08, 0x7f, 0x78, 0xd4, 0x43, 0x22, 0x3c, 0x52, + 0x87, 0x66, 0xc6, 0xa8, 0xa0, 0xf6, 0xa6, 0x21, 0x34, 0x15, 0x66, 0x08, 0xdb, 0x9b, 0x09, 0x4d, + 0xa8, 0x22, 0xf8, 0xf2, 0x49, 0x73, 0xb7, 0xdd, 0x84, 0xd2, 0xa4, 0x8f, 0x7c, 0x75, 0xea, 0x0d, + 0xae, 0x7c, 0x81, 0x53, 0xc4, 0x45, 0x98, 0x66, 0x86, 0xf0, 0x71, 0x91, 0x10, 0x92, 0xb1, 0x09, + 0xd5, 0x8b, 0xa1, 0x78, 0xc0, 0x42, 0x81, 0x29, 0xd1, 0x71, 0xef, 0x17, 0x50, 0xf9, 0x1e, 0x13, + 0x81, 0x98, 0x2d, 0xc0, 0x06, 0xca, 0x68, 0x74, 0x1d, 0x64, 0x8c, 0x0e, 0x31, 0xc7, 0x94, 0x70, + 0xc7, 0xda, 0xb1, 0x1a, 0x6f, 0x5a, 0x9d, 0xbb, 0x89, 0x5b, 0xfa, 0x7b, 0xe2, 0x7e, 0x96, 0x60, + 0x71, 0x3d, 0xe8, 0x35, 0x23, 0x9a, 0xfa, 0x91, 0xca, 0xdf, 0xfc, 0x1c, 0xf0, 0xf8, 0xc6, 0x17, + 0xe3, 0x0c, 0xf1, 0x66, 0x1b, 0x45, 0xd3, 0x89, 0x5b, 0x1b, 0x87, 0x69, 0xff, 0xd4, 0x2b, 0xea, + 0x79, 0xb0, 0xaa, 0xa0, 0xee, 0x1c, 0xb9, 0xb5, 0x40, 0xf5, 0x02, 0xe1, 0xe4, 0x5a, 0xa0, 0xf8, + 0xeb, 0x38, 0x66, 0x88, 0x73, 0xfb, 0x0b, 0xb0, 0x1a, 0xea, 0x47, 0x93, 0x80, 0x3d, 0x9d, 0xb8, + 0xeb, 0x5a, 0xd2, 0x04, 0x3c, 0x98, 0x53, 0xec, 0x0b, 0x50, 0x19, 0x29, 0x01, 0xe7, 0x3d, 0x45, + 0xfe, 0x72, 0xe9, 0x6c, 0xd7, 0xb4, 0xb4, 0x56, 0xf1, 0xa0, 0x91, 0xf3, 0xfe, 0x2c, 0x83, 0x5a, + 0x1b, 0x73, 0xc1, 0x70, 0x6f, 0x20, 0x2b, 0xd6, 0x65, 0x34, 0xa3, 0x4c, 0x3e, 0x71, 0xfb, 0x12, + 0xac, 0x72, 0x11, 0xde, 0x60, 0x92, 0x98, 0x14, 0xbf, 0x5a, 0xda, 0xd5, 0xbc, 0x90, 0x91, 0xf1, + 0x60, 0x2e, 0x68, 0xff, 0x04, 0xaa, 0x19, 0xa5, 0xfd, 0x00, 0x93, 0x08, 0x11, 0x81, 0x87, 0x88, + 0x9b, 0x37, 0xfb, 0x6e, 0x69, 0x8f, 0x2d, 0xed, 0x51, 0x90, 0xf3, 0xe0, 0xba, 0x44, 0x3a, 0x33, + 0xc0, 0x1e, 0x81, 0x0f, 0x63, 0x34, 0x44, 0x7d, 0x9a, 0x21, 0x16, 0x30, 0x34, 0x0a, 0x59, 0xcc, + 0x9d, 0xb2, 0x32, 0x3d, 0x5f, 0xda, 0xd4, 0xd1, 0xa6, 0x2f, 0x04, 0x3d, 0xb8, 0x31, 0xc3, 0xa0, + 0x86, 0x6c, 0x02, 0xd6, 0x23, 0x9a, 0xa6, 0x03, 0x82, 0xc5, 0x38, 0x90, 0x49, 0x39, 0x2b, 0xca, + 0xf5, 0xdb, 0xa5, 0x5d, 0x3f, 0xd2, 0xae, 0xcf, 0xd5, 0x3c, 0xb8, 0x36, 0x03, 0xba, 0xf2, 0xfc, + 0x6f, 0x05, 0x54, 0xba, 0x21, 0x0b, 0x53, 0x6e, 0x7f, 0x0a, 0x80, 0x9c, 0xbd, 0x20, 0x46, 0x84, + 0xa6, 0xfa, 0x16, 0xe1, 0x1b, 0x89, 0xb4, 0x25, 0x60, 0xff, 0x6a, 0x01, 0x27, 0x41, 0x04, 0x71, + 0xcc, 0x83, 0x17, 0x73, 0xa1, 0xef, 0xe3, 0x87, 0xa5, 0x93, 0x74, 0x75, 0x92, 0x8b, 0x74, 0x3d, + 0xb8, 0x65, 0x42, 0xdf, 0x3c, 0x1f, 0x13, 0xfb, 0x2c, 0x1f, 0x4e, 0x1c, 0xcb, 0x3b, 0xbb, 0xc2, + 0x88, 0x99, 0xfb, 0xf9, 0xa4, 0x38, 0x6e, 0x73, 0x46, 0x3e, 0x6e, 0x9d, 0x19, 0x62, 0xf7, 0xc0, + 0x36, 0x43, 0xf1, 0x20, 0x92, 0x5d, 0x1c, 0x64, 0x88, 0x61, 0x1a, 0x07, 0x98, 0xe8, 0x44, 0xb8, + 0xaa, 0x7d, 0xb9, 0xb5, 0x3f, 0x9d, 0xb8, 0xbb, 0x5a, 0x71, 0x31, 0xd7, 0x83, 0xb5, 0x59, 0xb0, + 0xab, 0x62, 0x1d, 0xa2, 0x92, 0xe6, 0x72, 0x91, 0xcc, 0xff, 0x77, 0x15, 0x46, 0x82, 0x32, 0xe7, + 0xfd, 0x77, 0x5b, 0x24, 0x45, 0x3d, 0x0f, 0x56, 0x67, 0xd0, 0x99, 0x42, 0x6c, 0x02, 0x9c, 0xf8, + 0xc9, 0xb0, 0xca, 0xaa, 0xe6, 0xd3, 0xea, 0x54, 0x76, 0xac, 0xc6, 0xdb, 0xe3, 0x83, 0xe6, 0x6b, + 0x3b, 0xb7, 0xb9, 0x60, 0xc4, 0x5b, 0x2b, 0x32, 0x59, 0x58, 0x8b, 0x17, 0x6c, 0x80, 0x3f, 0x2c, + 0xb0, 0x37, 0x32, 0x8b, 0x2b, 0x78, 0xd1, 0xeb, 0x01, 0x43, 0x11, 0xc2, 0x43, 0xc4, 0xb8, 0xb3, + 0xba, 0x53, 0x6e, 0xbc, 0x3d, 0xde, 0x7f, 0xdd, 0xbc, 0xb0, 0xfa, 0x5a, 0x9f, 0x4b, 0xd3, 0x79, + 0xfd, 0x17, 0xeb, 0x7a, 0x70, 0x37, 0x77, 0x6f, 0x17, 0x86, 0x0a, 0xe6, 0xd6, 0xb2, 0x87, 0x1b, + 0xd2, 0x0e, 0x93, 0x64, 0x26, 0xf0, 0xac, 0x48, 0x5c, 0x84, 0x4c, 0xe8, 0x1b, 0x75, 0x3e, 0x50, + 0x97, 0x7f, 0x32, 0x9d, 0xb8, 0xbe, 0x36, 0xff, 0xbf, 0xff, 0xf4, 0xe0, 0x9e, 0xa1, 0x9a, 0x04, + 0x9e, 0x56, 0xf4, 0x47, 0xc9, 0x53, 0x8d, 0x71, 0xba, 0x72, 0xfb, 0xbb, 0x5b, 0x6a, 0x9d, 0xdf, + 0x3d, 0xd4, 0xad, 0xfb, 0x87, 0xba, 0xf5, 0xcf, 0x43, 0xdd, 0xfa, 0xed, 0xb1, 0x5e, 0xba, 0x7f, + 0xac, 0x97, 0xfe, 0x7a, 0xac, 0x97, 0x2e, 0x0f, 0x9f, 0x74, 0x85, 0x29, 0xd6, 0x41, 0x3f, 0xec, + 0xf1, 0xfc, 0xe0, 0x0f, 0x8f, 0x0e, 0xfd, 0x9f, 0xf5, 0x17, 0x55, 0xf5, 0x48, 0xaf, 0xa2, 0xbe, + 0x61, 0x27, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xae, 0x9c, 0x03, 0xa2, 0x6e, 0x07, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/minter_test.go b/x/mint/types/minter_test.go index 4df3dc8e31e..b83829d29bf 100644 --- a/x/mint/types/minter_test.go +++ b/x/mint/types/minter_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/mint/types/params.go b/x/mint/types/params.go index 19dc168260b..6631b9927eb 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -7,7 +7,7 @@ import ( yaml "gopkg.in/yaml.v2" - epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index d394f9f53d7..ad109b6d370 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -202,31 +202,31 @@ func init() { proto.RegisterFile("osmosis/mint/v1beta1/query.proto", fileDescrip var fileDescriptor_cd2f42111e753fbb = []byte{ // 394 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x2f, 0xce, 0xcd, - 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, - 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xaa, - 0xd0, 0x03, 0xa9, 0xd0, 0x83, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, - 0xb1, 0x20, 0x6a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, - 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0xa1, 0xb2, 0xf2, 0x58, 0xed, - 0x02, 0x1b, 0x0b, 0x56, 0xa0, 0x24, 0xc2, 0x25, 0x14, 0x08, 0xb2, 0x39, 0x20, 0xb1, 0x28, 0x31, - 0xb7, 0x38, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x29, 0x90, 0x4b, 0x18, 0x45, 0xb4, 0xb8, - 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, 0x8a, 0x8b, 0xad, 0x00, 0x2c, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, - 0xc1, 0x6d, 0x24, 0xa3, 0x87, 0xcd, 0xa1, 0x7a, 0x10, 0x5d, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, - 0x04, 0x41, 0x75, 0x28, 0xc9, 0x72, 0x49, 0x83, 0x8d, 0x74, 0x2d, 0xc8, 0x4f, 0xce, 0x08, 0x28, - 0xca, 0x2f, 0xcb, 0x2c, 0x06, 0xb9, 0x13, 0x66, 0x63, 0x25, 0x97, 0x0c, 0x76, 0x69, 0xa8, 0xd5, - 0x91, 0x5c, 0x02, 0xa9, 0x20, 0xa9, 0xf8, 0x02, 0xb8, 0x1c, 0xd8, 0x11, 0x3c, 0x4e, 0x7a, 0x20, - 0x6b, 0x6e, 0xdd, 0x93, 0x57, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, - 0x4f, 0x06, 0xbb, 0x0b, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, - 0xb9, 0xa4, 0x26, 0x07, 0xf1, 0xa7, 0xa2, 0x5a, 0x61, 0xb4, 0x83, 0x89, 0x8b, 0x15, 0x6c, 0xb7, - 0x50, 0x33, 0x23, 0x17, 0x1b, 0xc4, 0xf1, 0x42, 0x1a, 0xd8, 0xbd, 0x86, 0x19, 0x56, 0x52, 0x9a, - 0x44, 0xa8, 0x84, 0x78, 0x42, 0x49, 0xa5, 0xe9, 0xf2, 0x93, 0xc9, 0x4c, 0x72, 0x42, 0x32, 0xfa, - 0x58, 0xa3, 0x05, 0x12, 0x52, 0x42, 0x2b, 0x18, 0xb9, 0xf8, 0xd1, 0x82, 0x41, 0xc8, 0x10, 0x8f, - 0x25, 0xd8, 0x43, 0x54, 0xca, 0x88, 0x14, 0x2d, 0x50, 0x07, 0xea, 0x81, 0x1d, 0xa8, 0x21, 0xa4, - 0x86, 0xdd, 0x81, 0xe8, 0x31, 0xe0, 0xe4, 0x79, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, - 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, - 0x0c, 0x51, 0xfa, 0x48, 0xb1, 0x01, 0x35, 0x4b, 0x37, 0x27, 0x31, 0xa9, 0x18, 0x6e, 0x70, 0x99, - 0xb9, 0x7e, 0x05, 0xc4, 0x74, 0x70, 0xd4, 0x24, 0xb1, 0x81, 0xd3, 0xa3, 0x31, 0x20, 0x00, 0x00, - 0xff, 0xff, 0x6d, 0x21, 0x17, 0x68, 0x1e, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4e, 0xea, 0x40, + 0x14, 0x86, 0x5b, 0x72, 0x2f, 0x8b, 0xb9, 0x37, 0xc1, 0x8c, 0x2c, 0x4c, 0xad, 0x85, 0x34, 0x86, + 0xe0, 0x82, 0x19, 0x8a, 0x3b, 0x97, 0x44, 0x37, 0xae, 0x80, 0x9d, 0x6e, 0x4c, 0x5b, 0x27, 0xa5, + 0x91, 0x76, 0x4a, 0x67, 0x20, 0xb2, 0xd5, 0x17, 0x30, 0xf1, 0x25, 0x7c, 0x04, 0x1f, 0x81, 0x25, + 0x89, 0x1b, 0xe3, 0x82, 0x18, 0xf0, 0x41, 0x4c, 0xa7, 0x23, 0x11, 0x9c, 0x18, 0x5d, 0xb5, 0x99, + 0xf3, 0x9f, 0xff, 0xff, 0xe6, 0x9c, 0x01, 0x55, 0xca, 0x22, 0xca, 0x42, 0x86, 0xa3, 0x30, 0xe6, + 0x78, 0xec, 0x78, 0x84, 0xbb, 0x0e, 0x1e, 0x8e, 0x48, 0x3a, 0x41, 0x49, 0x4a, 0x39, 0x85, 0x65, + 0xa9, 0x40, 0x99, 0x02, 0x49, 0x85, 0x51, 0x0e, 0x68, 0x40, 0x85, 0x00, 0x67, 0x7f, 0xb9, 0xd6, + 0x30, 0x03, 0x4a, 0x83, 0x01, 0xc1, 0x6e, 0x12, 0x62, 0x37, 0x8e, 0x29, 0x77, 0x79, 0x48, 0x63, + 0x26, 0xab, 0x15, 0x65, 0x96, 0xb0, 0x15, 0x02, 0xbb, 0x0c, 0x60, 0x37, 0x4b, 0xee, 0xb8, 0xa9, + 0x1b, 0xb1, 0x1e, 0x19, 0x8e, 0x08, 0xe3, 0x76, 0x17, 0x6c, 0xaf, 0x9d, 0xb2, 0x84, 0xc6, 0x8c, + 0xc0, 0x23, 0x50, 0x4c, 0xc4, 0xc9, 0x8e, 0x5e, 0xd5, 0xeb, 0xff, 0x5a, 0x26, 0x52, 0x81, 0xa2, + 0xbc, 0xab, 0xfd, 0x67, 0x3a, 0xaf, 0x68, 0x3d, 0xd9, 0x61, 0xef, 0x81, 0x5d, 0x61, 0x79, 0x92, + 0x50, 0xbf, 0xdf, 0x49, 0xe9, 0x38, 0x64, 0x19, 0xe7, 0x47, 0xe2, 0x04, 0x98, 0xea, 0xb2, 0x8c, + 0x3e, 0x03, 0x5b, 0x24, 0x2b, 0x5d, 0x24, 0xab, 0x9a, 0x80, 0xf8, 0xdf, 0x46, 0x59, 0xcc, 0xcb, + 0xbc, 0x52, 0x0b, 0x42, 0xde, 0x1f, 0x79, 0xc8, 0xa7, 0x11, 0xf6, 0x05, 0x97, 0xfc, 0x34, 0xd8, + 0xe5, 0x15, 0xe6, 0x93, 0x84, 0x30, 0x74, 0x4c, 0xfc, 0x5e, 0x89, 0xac, 0x47, 0xb4, 0x1e, 0x0b, + 0xe0, 0xaf, 0xc8, 0x86, 0xb7, 0x3a, 0x28, 0xe6, 0xf0, 0xb0, 0xae, 0xbe, 0xda, 0xd7, 0x59, 0x19, + 0x07, 0x3f, 0x50, 0xe6, 0x97, 0xb0, 0xf7, 0x6f, 0x9e, 0xde, 0xee, 0x0b, 0x16, 0x34, 0xb1, 0x72, + 0x2d, 0xf9, 0xa4, 0xe0, 0x83, 0x0e, 0x4a, 0x1b, 0x63, 0x80, 0xce, 0x37, 0x21, 0xea, 0x89, 0x1a, + 0xad, 0xdf, 0xb4, 0x48, 0x40, 0x24, 0x00, 0xeb, 0xb0, 0xa6, 0x06, 0xdc, 0xdc, 0x40, 0xfb, 0x74, + 0xba, 0xb0, 0xf4, 0xd9, 0xc2, 0xd2, 0x5f, 0x17, 0x96, 0x7e, 0xb7, 0xb4, 0xb4, 0xd9, 0xd2, 0xd2, + 0x9e, 0x97, 0x96, 0x76, 0xde, 0xfc, 0xb4, 0x0d, 0xe9, 0xd5, 0x18, 0xb8, 0x1e, 0x5b, 0x19, 0x8f, + 0x9d, 0x26, 0xbe, 0xce, 0xed, 0xc5, 0x6e, 0xbc, 0xa2, 0x78, 0x90, 0x87, 0xef, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x80, 0xf4, 0x7f, 0xd2, 0x1f, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pool-incentives/client/cli/cli_test.go b/x/pool-incentives/client/cli/cli_test.go index a2f38150a08..4de704adcf2 100644 --- a/x/pool-incentives/client/cli/cli_test.go +++ b/x/pool-incentives/client/cli/cli_test.go @@ -4,9 +4,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/pool-incentives/client/cli/query.go b/x/pool-incentives/client/cli/query.go index f4c9bb56ea0..e4418f13e89 100644 --- a/x/pool-incentives/client/cli/query.go +++ b/x/pool-incentives/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/pool-incentives/client/cli/tx.go b/x/pool-incentives/client/cli/tx.go index 06a231cad26..f3ea1a7f3d2 100644 --- a/x/pool-incentives/client/cli/tx.go +++ b/x/pool-incentives/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/pool-incentives/client/proposal_handler.go b/x/pool-incentives/client/proposal_handler.go index f70f5d1071d..6f90c30e2d9 100644 --- a/x/pool-incentives/client/proposal_handler.go +++ b/x/pool-incentives/client/proposal_handler.go @@ -1,8 +1,8 @@ package client import ( - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/rest" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/pool-incentives/client/rest/tx.go b/x/pool-incentives/client/rest/tx.go index 2b12eebdc23..8dc1b95d3d4 100644 --- a/x/pool-incentives/client/rest/tx.go +++ b/x/pool-incentives/client/rest/tx.go @@ -10,7 +10,7 @@ import ( govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type UpdatePoolIncentivesRequest struct { diff --git a/x/pool-incentives/handler.go b/x/pool-incentives/handler.go index 3177660db70..9b12bf7efcd 100644 --- a/x/pool-incentives/handler.go +++ b/x/pool-incentives/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func NewPoolIncentivesProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/pool-incentives/keeper/distr.go b/x/pool-incentives/keeper/distr.go index 828fcd9388a..0e5e9f96372 100644 --- a/x/pool-incentives/keeper/distr.go +++ b/x/pool-incentives/keeper/distr.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/pool-incentives/keeper/distr_test.go b/x/pool-incentives/keeper/distr_test.go index 9596a9123d8..f3f3b56cf8f 100644 --- a/x/pool-incentives/keeper/distr_test.go +++ b/x/pool-incentives/keeper/distr_test.go @@ -3,8 +3,8 @@ package keeper_test import ( abci "github.com/tendermint/tendermint/abci/types" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/pool-incentives/keeper/geneis_test.go b/x/pool-incentives/keeper/geneis_test.go index 3577ea9af03..5468664f50b 100644 --- a/x/pool-incentives/keeper/geneis_test.go +++ b/x/pool-incentives/keeper/geneis_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - pool_incentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" + pool_incentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" - simapp "github.com/osmosis-labs/osmosis/v7/app" + simapp "github.com/osmosis-labs/osmosis/v10/app" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/keeper/genesis.go b/x/pool-incentives/keeper/genesis.go index d2e4d0fa77b..cb2249f87c9 100644 --- a/x/pool-incentives/keeper/genesis.go +++ b/x/pool-incentives/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { diff --git a/x/pool-incentives/keeper/gov.go b/x/pool-incentives/keeper/gov.go index 8d3aa985c7b..a3bdb911212 100644 --- a/x/pool-incentives/keeper/gov.go +++ b/x/pool-incentives/keeper/gov.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func (k Keeper) HandleReplacePoolIncentivesProposal(ctx sdk.Context, p *types.ReplacePoolIncentivesProposal) error { diff --git a/x/pool-incentives/keeper/grpc_query.go b/x/pool-incentives/keeper/grpc_query.go index 164324277dc..d756067c749 100644 --- a/x/pool-incentives/keeper/grpc_query.go +++ b/x/pool-incentives/keeper/grpc_query.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - incentivetypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + incentivetypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var _ types.QueryServer = Querier{} diff --git a/x/pool-incentives/keeper/grpc_query_test.go b/x/pool-incentives/keeper/grpc_query_test.go index 502f935f890..991e6878689 100644 --- a/x/pool-incentives/keeper/grpc_query_test.go +++ b/x/pool-incentives/keeper/grpc_query_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go index 60fd8e97254..c2b49cdf488 100644 --- a/x/pool-incentives/keeper/hooks.go +++ b/x/pool-incentives/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) type Hooks struct { diff --git a/x/pool-incentives/keeper/keeper.go b/x/pool-incentives/keeper/keeper.go index b3b259df095..9643e820750 100644 --- a/x/pool-incentives/keeper/keeper.go +++ b/x/pool-incentives/keeper/keeper.go @@ -6,10 +6,10 @@ import ( "github.com/tendermint/tendermint/libs/log" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go index f0bad5d41d0..6804e6dc5e3 100644 --- a/x/pool-incentives/keeper/keeper_test.go +++ b/x/pool-incentives/keeper/keeper_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/pool-incentives/keeper/params.go b/x/pool-incentives/keeper/params.go index 1ff9ef0bf2c..6cab081375f 100644 --- a/x/pool-incentives/keeper/params.go +++ b/x/pool-incentives/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { diff --git a/x/pool-incentives/module.go b/x/pool-incentives/module.go index c1b849a964f..29f6ddac163 100644 --- a/x/pool-incentives/module.go +++ b/x/pool-incentives/module.go @@ -19,9 +19,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/gov/simulation" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/types/expected_keepers.go b/x/pool-incentives/types/expected_keepers.go index ffdf807a0bc..df25e7215d1 100644 --- a/x/pool-incentives/types/expected_keepers.go +++ b/x/pool-incentives/types/expected_keepers.go @@ -7,9 +7,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) type AccountKeeper interface { diff --git a/x/pool-incentives/types/genesis.pb.go b/x/pool-incentives/types/genesis.pb.go index 8eac2a3e833..41190f66231 100644 --- a/x/pool-incentives/types/genesis.pb.go +++ b/x/pool-incentives/types/genesis.pb.go @@ -101,26 +101,26 @@ var fileDescriptor_cc1f078212600632 = []byte{ // 351 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0x4e, 0xfa, 0x40, 0x10, 0xc7, 0xbb, 0xf0, 0x0b, 0xc9, 0xaf, 0x78, 0xa1, 0xf1, 0x00, 0x1c, 0xb6, 0xa4, 0x89, 0x06, - 0x0f, 0xec, 0x0a, 0x1e, 0x4c, 0x38, 0x12, 0x12, 0xe3, 0xcd, 0xa0, 0x27, 0x2f, 0x64, 0x5b, 0x96, - 0xba, 0xb1, 0xed, 0x34, 0xdd, 0x85, 0xc8, 0x5b, 0x78, 0xf4, 0x19, 0x7c, 0x12, 0x8e, 0x1c, 0x3d, - 0x55, 0x43, 0xdf, 0x80, 0x27, 0x30, 0xfd, 0x27, 0x26, 0x24, 0x72, 0xeb, 0x64, 0x3e, 0xdf, 0x99, - 0xcf, 0x74, 0xf5, 0x1e, 0x48, 0x1f, 0xa4, 0x90, 0x34, 0x04, 0xf0, 0x7a, 0x22, 0x70, 0x78, 0xa0, - 0xc4, 0x92, 0x4b, 0xba, 0xec, 0xdb, 0x5c, 0xb1, 0x3e, 0x75, 0x79, 0xc0, 0xa5, 0x90, 0x24, 0x8c, - 0x40, 0x81, 0x81, 0x0b, 0x9c, 0xa4, 0xf8, 0x9e, 0x26, 0x05, 0xdd, 0x3e, 0x75, 0xc1, 0x85, 0x0c, - 0xa5, 0xe9, 0x57, 0x9e, 0x6a, 0x63, 0x17, 0xc0, 0xf5, 0x38, 0xcd, 0x2a, 0x7b, 0x31, 0xa7, 0xb3, - 0x45, 0xc4, 0x94, 0x80, 0xa0, 0xe8, 0x5f, 0x1e, 0x93, 0xf8, 0xb5, 0x29, 0x4b, 0x58, 0xef, 0x15, - 0xfd, 0xe4, 0x26, 0x37, 0xbb, 0x57, 0x4c, 0x71, 0x63, 0xac, 0xd7, 0x42, 0x16, 0x31, 0x5f, 0x36, - 0x51, 0x07, 0x75, 0xeb, 0x83, 0x73, 0xf2, 0xb7, 0x29, 0xb9, 0xcb, 0xe8, 0xd1, 0xbf, 0x75, 0x6c, - 0x6a, 0x93, 0x22, 0x6b, 0x80, 0x6e, 0x78, 0xe0, 0x3c, 0x33, 0xdb, 0xe3, 0xd3, 0xd2, 0x51, 0x36, - 0x2b, 0x9d, 0x6a, 0xb7, 0x3e, 0x68, 0x91, 0xfc, 0x0a, 0x52, 0x5e, 0x41, 0xc6, 0x05, 0x31, 0x3a, - 0x4b, 0x87, 0xec, 0x62, 0xb3, 0xb5, 0x62, 0xbe, 0x37, 0xb4, 0x0e, 0x47, 0x58, 0x6f, 0x9f, 0x26, - 0x9a, 0x34, 0xca, 0x46, 0x19, 0x94, 0x86, 0xa3, 0xeb, 0x33, 0x21, 0x55, 0x34, 0x15, 0xc1, 0x1c, - 0x9a, 0xd5, 0x4c, 0xfd, 0xe2, 0x98, 0xfa, 0x38, 0x4d, 0xdc, 0x06, 0x73, 0x18, 0xb5, 0xd6, 0xb1, - 0x89, 0x76, 0xb1, 0xd9, 0xc8, 0x17, 0xef, 0x47, 0x59, 0x93, 0xff, 0xb3, 0x1f, 0xea, 0x61, 0xbd, - 0xc5, 0x68, 0xb3, 0xc5, 0xe8, 0x6b, 0x8b, 0xd1, 0x6b, 0x82, 0xb5, 0x4d, 0x82, 0xb5, 0x8f, 0x04, - 0x6b, 0x8f, 0x43, 0x57, 0xa8, 0xa7, 0x85, 0x4d, 0x1c, 0xf0, 0x69, 0xb1, 0xb4, 0xe7, 0x31, 0x5b, - 0x96, 0x05, 0x5d, 0x5e, 0xd3, 0x97, 0x83, 0x57, 0x51, 0xab, 0x90, 0x4b, 0xbb, 0x96, 0xfd, 0x87, - 0xab, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x32, 0x7b, 0x3c, 0x42, 0x02, 0x00, 0x00, + 0x0f, 0xec, 0x02, 0xde, 0xf4, 0x46, 0x48, 0x8c, 0x37, 0x83, 0xf1, 0xe2, 0x85, 0x6c, 0xcb, 0x52, + 0x37, 0xb6, 0x9d, 0xa6, 0xbb, 0x10, 0x79, 0x0b, 0x8f, 0x3e, 0x83, 0x4f, 0xc2, 0x91, 0xa3, 0xa7, + 0x6a, 0xe8, 0x1b, 0xf0, 0x04, 0xa6, 0xff, 0xc4, 0x84, 0x44, 0x6e, 0x9d, 0xcc, 0xe7, 0x3b, 0xf3, + 0x99, 0xae, 0xde, 0x03, 0xe9, 0x83, 0x14, 0x92, 0x86, 0x00, 0x5e, 0x4f, 0x04, 0x0e, 0x0f, 0x94, + 0x58, 0x72, 0x49, 0x97, 0x03, 0x9b, 0x2b, 0x36, 0xa0, 0x2e, 0x0f, 0xb8, 0x14, 0x92, 0x84, 0x11, + 0x28, 0x30, 0x70, 0x81, 0x93, 0x14, 0xdf, 0xd3, 0xa4, 0xa0, 0xdb, 0xa7, 0x2e, 0xb8, 0x90, 0xa1, + 0x34, 0xfd, 0xca, 0x53, 0x6d, 0xec, 0x02, 0xb8, 0x1e, 0xa7, 0x59, 0x65, 0x2f, 0xe6, 0x74, 0xb6, + 0x88, 0x98, 0x12, 0x10, 0x14, 0xfd, 0xfe, 0x31, 0x89, 0x5f, 0x9b, 0xb2, 0x84, 0xf5, 0x5e, 0xd1, + 0x4f, 0x6e, 0x72, 0xb3, 0x7b, 0xc5, 0x14, 0x37, 0xc6, 0x7a, 0x2d, 0x64, 0x11, 0xf3, 0x65, 0x13, + 0x75, 0x50, 0xb7, 0x3e, 0x3c, 0x27, 0x7f, 0x9b, 0x92, 0xbb, 0x8c, 0x1e, 0xfd, 0x5b, 0xc7, 0xa6, + 0x36, 0x29, 0xb2, 0x06, 0xe8, 0x86, 0x07, 0xce, 0x33, 0xb3, 0x3d, 0x3e, 0x2d, 0x1d, 0x65, 0xb3, + 0xd2, 0xa9, 0x76, 0xeb, 0xc3, 0x16, 0xc9, 0xaf, 0x20, 0xe5, 0x15, 0x64, 0x5c, 0x10, 0xa3, 0xb3, + 0x74, 0xc8, 0x2e, 0x36, 0x5b, 0x2b, 0xe6, 0x7b, 0x57, 0xd6, 0xe1, 0x08, 0xeb, 0xed, 0xd3, 0x44, + 0x93, 0x46, 0xd9, 0x28, 0x83, 0xd2, 0x70, 0x74, 0x7d, 0x26, 0xa4, 0x8a, 0xa6, 0x22, 0x98, 0x43, + 0xb3, 0x9a, 0xa9, 0x5f, 0x1c, 0x53, 0x1f, 0xa7, 0x89, 0xdb, 0x60, 0x0e, 0xa3, 0xd6, 0x3a, 0x36, + 0xd1, 0x2e, 0x36, 0x1b, 0xf9, 0xe2, 0xfd, 0x28, 0x6b, 0xf2, 0x7f, 0xf6, 0x43, 0x3d, 0xac, 0xb7, + 0x18, 0x6d, 0xb6, 0x18, 0x7d, 0x6d, 0x31, 0x7a, 0x4d, 0xb0, 0xb6, 0x49, 0xb0, 0xf6, 0x91, 0x60, + 0xed, 0xf1, 0xda, 0x15, 0xea, 0x69, 0x61, 0x13, 0x07, 0x7c, 0x5a, 0x2c, 0xed, 0x79, 0xcc, 0x96, + 0x65, 0x41, 0x97, 0x83, 0x3e, 0x7d, 0x39, 0x78, 0x16, 0xb5, 0x0a, 0xb9, 0xb4, 0x6b, 0xd9, 0x8f, + 0xb8, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x73, 0x02, 0xfa, 0x34, 0x43, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/pool-incentives/types/genesis_test.go b/x/pool-incentives/types/genesis_test.go index a97248f50fc..e0d53904c8e 100644 --- a/x/pool-incentives/types/genesis_test.go +++ b/x/pool-incentives/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "time" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/pool-incentives/types/gov.pb.go b/x/pool-incentives/types/gov.pb.go index 9674aeeee1e..c68123a16c8 100644 --- a/x/pool-incentives/types/gov.pb.go +++ b/x/pool-incentives/types/gov.pb.go @@ -123,7 +123,7 @@ func init() { } var fileDescriptor_96caede426ba9516 = []byte{ - // 302 bytes of a gzipped FileDescriptorProto + // 303 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcc, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0xcd, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, @@ -137,12 +137,12 @@ var fileDescriptor_96caede426ba9516 = []byte{ 0x2f, 0x4a, 0x29, 0x96, 0x60, 0x56, 0x60, 0xd6, 0xe0, 0x36, 0xd2, 0xd6, 0xc3, 0xef, 0x27, 0x3d, 0x97, 0xcc, 0xe2, 0x92, 0xa2, 0x20, 0xb0, 0x1e, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x60, 0x26, 0x58, 0xf1, 0x74, 0x2c, 0x90, 0x67, 0x98, 0xb1, 0x40, 0x9e, 0xe1, 0xc5, 0x02, 0x79, 0x46, - 0xa5, 0x8d, 0x8c, 0x5c, 0x32, 0xa1, 0x05, 0x29, 0x89, 0x25, 0x43, 0xc7, 0xcd, 0x4e, 0x21, 0x27, + 0xa5, 0x8d, 0x8c, 0x5c, 0x32, 0xa1, 0x05, 0x29, 0x89, 0x25, 0x43, 0xc7, 0xcd, 0x4e, 0xa1, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, - 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x95, 0x9e, 0x59, 0x92, 0x51, 0x9a, + 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xb5, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, - 0x33, 0xd7, 0xaf, 0xc0, 0x88, 0xd1, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x2c, 0x1a, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x51, 0xf7, 0x55, 0x7d, 0x5a, 0x02, 0x00, 0x00, + 0x33, 0x34, 0xd0, 0xaf, 0xc0, 0x88, 0xd2, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x34, + 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x07, 0xb6, 0xec, 0x5b, 0x02, 0x00, 0x00, } func (this *ReplacePoolIncentivesProposal) Equal(that interface{}) bool { diff --git a/x/pool-incentives/types/gov_test.go b/x/pool-incentives/types/gov_test.go index 267c939cf4b..7be521dc659 100644 --- a/x/pool-incentives/types/gov_test.go +++ b/x/pool-incentives/types/gov_test.go @@ -4,7 +4,7 @@ import ( "testing" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/pool-incentives/types/incentives.pb.go b/x/pool-incentives/types/incentives.pb.go index d58272fdcac..10611062f02 100644 --- a/x/pool-incentives/types/incentives.pb.go +++ b/x/pool-incentives/types/incentives.pb.go @@ -221,37 +221,37 @@ func init() { } var fileDescriptor_a8153bad03e553d1 = []byte{ - // 465 bytes of a gzipped FileDescriptorProto + // 466 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x41, 0x6b, 0xd4, 0x40, 0x18, 0xcd, 0xd4, 0x65, 0x6b, 0x67, 0x0b, 0x62, 0xaa, 0xb8, 0xed, 0x21, 0x29, 0x01, 0xa5, 0x20, - 0x3b, 0x63, 0xf5, 0x20, 0xe4, 0x18, 0x56, 0x61, 0xd5, 0x83, 0x04, 0x41, 0xf0, 0xb2, 0x4c, 0x92, - 0x69, 0x76, 0x68, 0x92, 0x6f, 0xc9, 0xcc, 0xae, 0xf6, 0x1f, 0x08, 0x5e, 0x3c, 0xf6, 0xd8, 0xdf, - 0xe2, 0xa9, 0xc7, 0x1e, 0xc5, 0x43, 0x94, 0xdd, 0x8b, 0xe7, 0xfd, 0x05, 0x92, 0xc9, 0x84, 0x06, - 0x0b, 0x82, 0xa7, 0xcc, 0xcb, 0xcb, 0x7b, 0xdf, 0x7b, 0xf3, 0x05, 0x3f, 0x01, 0x99, 0x83, 0x14, - 0x92, 0xce, 0x01, 0xb2, 0x91, 0x28, 0x62, 0x5e, 0x28, 0xb1, 0xe4, 0x92, 0x2e, 0x8f, 0x23, 0xae, - 0xd8, 0x31, 0xbd, 0x7e, 0x45, 0xe6, 0x25, 0x28, 0xb0, 0x1d, 0xa3, 0x20, 0xb5, 0xa2, 0xc3, 0x1a, - 0xc1, 0xc1, 0xbd, 0x14, 0x52, 0xd0, 0x9f, 0xd2, 0xfa, 0xd4, 0xa8, 0x0e, 0x9c, 0x14, 0x20, 0xcd, - 0x38, 0xd5, 0x28, 0x5a, 0x9c, 0xd0, 0x64, 0x51, 0x32, 0x25, 0xa0, 0x68, 0x78, 0xef, 0x15, 0xee, - 0xbf, 0x65, 0x25, 0xcb, 0xa5, 0xed, 0xe3, 0xdd, 0x5c, 0x14, 0x8a, 0x27, 0xd3, 0x84, 0x17, 0x90, - 0x0f, 0xd1, 0x21, 0x3a, 0xda, 0x09, 0x1e, 0x6c, 0x2a, 0x77, 0xef, 0x8c, 0xe5, 0x99, 0xef, 0x75, - 0x59, 0x2f, 0x1c, 0x34, 0x70, 0x5c, 0x23, 0xbf, 0x77, 0x7e, 0xe1, 0x5a, 0xde, 0x67, 0x84, 0xef, - 0xbf, 0x81, 0xf8, 0x94, 0x45, 0x19, 0x1f, 0x9b, 0x31, 0x72, 0x52, 0x9c, 0x80, 0x0d, 0xd8, 0xce, - 0x0c, 0x31, 0x6d, 0x03, 0xc8, 0x21, 0x3a, 0xbc, 0x75, 0x34, 0x78, 0xba, 0x4f, 0x9a, 0x88, 0xa4, - 0x8d, 0x48, 0x5a, 0x6d, 0xf0, 0xf0, 0xb2, 0x72, 0xad, 0x4d, 0xe5, 0xee, 0x37, 0x01, 0x6e, 0x5a, - 0x78, 0xe7, 0x3f, 0x5d, 0x14, 0xde, 0xcd, 0xfe, 0x1e, 0xea, 0x7d, 0x43, 0x78, 0x67, 0x2c, 0xa4, - 0x2a, 0xf5, 0xf8, 0x19, 0xde, 0x55, 0xa0, 0x58, 0x36, 0xfd, 0xc8, 0x45, 0x3a, 0x53, 0xa6, 0xda, - 0x8b, 0xda, 0xfd, 0x47, 0xe5, 0x3e, 0x4a, 0x85, 0x9a, 0x2d, 0x22, 0x12, 0x43, 0x4e, 0x63, 0x7d, - 0xc9, 0xe6, 0x31, 0x92, 0xc9, 0x29, 0x55, 0x67, 0x73, 0x2e, 0xc9, 0xa4, 0x50, 0xd7, 0x17, 0xd1, - 0xf5, 0xf2, 0xc2, 0x81, 0x86, 0xef, 0x35, 0xb2, 0x5f, 0xe3, 0xed, 0x92, 0xc7, 0x50, 0x26, 0x72, - 0xb8, 0xa5, 0xdb, 0x3d, 0x26, 0xff, 0x5e, 0x1b, 0xd1, 0x29, 0x43, 0xad, 0x09, 0x7a, 0x75, 0xa2, - 0xb0, 0x75, 0xf0, 0xbe, 0x20, 0x3c, 0xe8, 0xd0, 0x36, 0xc1, 0xb7, 0x53, 0xb6, 0x48, 0xf9, 0x54, - 0x24, 0xba, 0x42, 0x2f, 0xd8, 0xdb, 0x54, 0xee, 0x9d, 0x26, 0x54, 0xcb, 0x78, 0xe1, 0xb6, 0x3e, - 0x4e, 0x12, 0xfb, 0x25, 0xee, 0x9b, 0xc2, 0x5b, 0xba, 0x30, 0xf9, 0xbf, 0xc2, 0xa1, 0x51, 0xfb, - 0xbd, 0xdf, 0x17, 0x2e, 0x0a, 0xde, 0x5d, 0xae, 0x1c, 0x74, 0xb5, 0x72, 0xd0, 0xaf, 0x95, 0x83, - 0xbe, 0xae, 0x1d, 0xeb, 0x6a, 0xed, 0x58, 0xdf, 0xd7, 0x8e, 0xf5, 0xc1, 0xef, 0xf8, 0x99, 0xb6, - 0xa3, 0x8c, 0x45, 0xb2, 0x05, 0x74, 0xf9, 0x9c, 0x7e, 0xba, 0xf1, 0xa3, 0xeb, 0x39, 0x51, 0x5f, - 0x6f, 0xfd, 0xd9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x92, 0x5d, 0x6d, 0x10, 0x03, 0x00, - 0x00, + 0x3b, 0xd3, 0xd5, 0xdb, 0x7a, 0x0b, 0xab, 0xb0, 0xea, 0x41, 0x02, 0x22, 0x78, 0x59, 0x26, 0xc9, + 0x34, 0x3b, 0x34, 0xc9, 0xb7, 0x64, 0x66, 0x57, 0xfb, 0x0f, 0x04, 0x2f, 0x1e, 0x7b, 0xec, 0x6f, + 0xf1, 0xd4, 0x63, 0x8f, 0xe2, 0x21, 0xca, 0xee, 0xc5, 0xf3, 0xfe, 0x02, 0xc9, 0x64, 0x42, 0x83, + 0x05, 0xa1, 0xa7, 0xcc, 0xcb, 0xcb, 0x7b, 0xdf, 0x7b, 0xf3, 0x05, 0x1f, 0x83, 0xcc, 0x40, 0x0a, + 0x49, 0xe7, 0x00, 0xe9, 0x40, 0xe4, 0x11, 0xcf, 0x95, 0x58, 0x72, 0x49, 0x97, 0xc3, 0x90, 0x2b, + 0x36, 0xa4, 0xd7, 0xaf, 0xc8, 0xbc, 0x00, 0x05, 0xb6, 0x63, 0x14, 0xa4, 0x52, 0xb4, 0x58, 0x23, + 0x38, 0x78, 0x90, 0x40, 0x02, 0xfa, 0x53, 0x5a, 0x9d, 0x6a, 0xd5, 0x81, 0x93, 0x00, 0x24, 0x29, + 0xa7, 0x1a, 0x85, 0x8b, 0x13, 0x1a, 0x2f, 0x0a, 0xa6, 0x04, 0xe4, 0x35, 0xef, 0xbd, 0xc6, 0xdd, + 0x77, 0xac, 0x60, 0x99, 0xb4, 0x47, 0x78, 0x37, 0x13, 0xb9, 0xe2, 0xf1, 0x34, 0xe6, 0x39, 0x64, + 0x7d, 0x74, 0x88, 0x8e, 0x76, 0xfc, 0x47, 0x9b, 0xd2, 0xdd, 0x3b, 0x63, 0x59, 0x3a, 0xf2, 0xda, + 0xac, 0x17, 0xf4, 0x6a, 0x38, 0xae, 0xd0, 0xa8, 0x73, 0x7e, 0xe1, 0x5a, 0xde, 0x17, 0x84, 0x1f, + 0xbe, 0x85, 0xe8, 0x94, 0x85, 0x29, 0x1f, 0x9b, 0x31, 0x72, 0x92, 0x9f, 0x80, 0x0d, 0xd8, 0x4e, + 0x0d, 0x31, 0x6d, 0x02, 0xc8, 0x3e, 0x3a, 0xbc, 0x73, 0xd4, 0x7b, 0xb6, 0x4f, 0xea, 0x88, 0xa4, + 0x89, 0x48, 0x1a, 0xad, 0xff, 0xf8, 0xb2, 0x74, 0xad, 0x4d, 0xe9, 0xee, 0xd7, 0x01, 0x6e, 0x5a, + 0x78, 0xe7, 0xbf, 0x5c, 0x14, 0xdc, 0x4f, 0xff, 0x1d, 0xea, 0x7d, 0x47, 0x78, 0x67, 0x2c, 0xa4, + 0x2a, 0xf4, 0xf8, 0x19, 0xde, 0x55, 0xa0, 0x58, 0x3a, 0xfd, 0xc4, 0x45, 0x32, 0x53, 0xa6, 0xda, + 0xcb, 0xca, 0xfd, 0x67, 0xe9, 0x3e, 0x49, 0x84, 0x9a, 0x2d, 0x42, 0x12, 0x41, 0x46, 0x23, 0x7d, + 0xc9, 0xe6, 0x31, 0x90, 0xf1, 0x29, 0x55, 0x67, 0x73, 0x2e, 0xc9, 0x24, 0x57, 0xd7, 0x17, 0xd1, + 0xf6, 0xf2, 0x82, 0x9e, 0x86, 0x1f, 0x34, 0xb2, 0xdf, 0xe0, 0xed, 0x82, 0x47, 0x50, 0xc4, 0xb2, + 0xbf, 0xa5, 0xdb, 0x3d, 0x25, 0xff, 0x5f, 0x1b, 0xd1, 0x29, 0x03, 0xad, 0xf1, 0x3b, 0x55, 0xa2, + 0xa0, 0x71, 0xf0, 0xbe, 0x22, 0xdc, 0x6b, 0xd1, 0x36, 0xc1, 0x77, 0x13, 0xb6, 0x48, 0xf8, 0x54, + 0xc4, 0xba, 0x42, 0xc7, 0xdf, 0xdb, 0x94, 0xee, 0xbd, 0x3a, 0x54, 0xc3, 0x78, 0xc1, 0xb6, 0x3e, + 0x4e, 0x62, 0xfb, 0x15, 0xee, 0x9a, 0xc2, 0x5b, 0xba, 0x30, 0xb9, 0x5d, 0xe1, 0xc0, 0xa8, 0x47, + 0x9d, 0x3f, 0x17, 0x2e, 0xf2, 0xdf, 0x5f, 0xae, 0x1c, 0x74, 0xb5, 0x72, 0xd0, 0xef, 0x95, 0x83, + 0xbe, 0xad, 0x1d, 0xeb, 0x6a, 0xed, 0x58, 0x3f, 0xd6, 0x8e, 0xf5, 0xf1, 0x45, 0xcb, 0xcf, 0xb4, + 0x1d, 0xa4, 0x2c, 0x94, 0x0d, 0xa0, 0xcb, 0xe1, 0x31, 0xfd, 0x7c, 0xe3, 0x4f, 0xd7, 0x83, 0xc2, + 0xae, 0x5e, 0xfb, 0xf3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x78, 0x74, 0x71, 0x11, 0x03, + 0x00, 0x00, } func (this *DistrRecord) Equal(that interface{}) bool { diff --git a/x/pool-incentives/types/incentives_test.go b/x/pool-incentives/types/incentives_test.go index b5abe93790d..7bf3044d84a 100644 --- a/x/pool-incentives/types/incentives_test.go +++ b/x/pool-incentives/types/incentives_test.go @@ -5,7 +5,7 @@ import ( "time" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/pool-incentives/types/query.pb.go b/x/pool-incentives/types/query.pb.go index b498ea13ce7..b0b5004c46d 100644 --- a/x/pool-incentives/types/query.pb.go +++ b/x/pool-incentives/types/query.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types1 "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + types1 "github.com/osmosis-labs/osmosis/v10/x/incentives/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -671,62 +671,62 @@ var fileDescriptor_302873ecccbc7636 = []byte{ // 923 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x41, 0x6f, 0x1b, 0x45, 0x14, 0xce, 0x34, 0x21, 0x4d, 0x26, 0x12, 0xd4, 0x93, 0x40, 0x9c, 0x15, 0xac, 0xc3, 0xd0, 0x42, - 0xaa, 0x28, 0xbb, 0xad, 0xdd, 0x16, 0x29, 0x04, 0x90, 0xdc, 0x20, 0x14, 0x89, 0x43, 0x58, 0x21, - 0x21, 0xc1, 0xc1, 0x5a, 0x7b, 0x27, 0x9b, 0x11, 0xeb, 0x1d, 0xd7, 0xb3, 0x0e, 0x0d, 0xa8, 0x97, + 0xaa, 0x28, 0xbb, 0x89, 0xdd, 0xf6, 0xd0, 0x06, 0x90, 0xdc, 0x20, 0x14, 0x89, 0x43, 0x58, 0x09, + 0x21, 0xc1, 0xc1, 0x5a, 0x67, 0x27, 0x9b, 0x11, 0xeb, 0x1d, 0xd7, 0xb3, 0x0e, 0x0d, 0xa8, 0x97, 0x4a, 0xdc, 0x41, 0x5c, 0x38, 0x23, 0x7a, 0xe6, 0xc4, 0x3f, 0xe0, 0xd0, 0x1b, 0x95, 0xb8, 0x70, - 0xc1, 0xa0, 0x84, 0x03, 0x67, 0xff, 0x02, 0xb4, 0xb3, 0x6f, 0x36, 0xf6, 0x6e, 0xec, 0xb5, 0xcb, - 0x6d, 0x33, 0xef, 0xbd, 0xef, 0x7d, 0xdf, 0xbc, 0x37, 0x9f, 0x83, 0xb7, 0x85, 0x6c, 0x0b, 0xc9, - 0xa5, 0xdd, 0x11, 0x22, 0xd8, 0xe1, 0x61, 0x8b, 0x85, 0x11, 0x3f, 0x61, 0xd2, 0x3e, 0xb9, 0xdd, - 0x64, 0x91, 0x7b, 0xdb, 0x7e, 0xd0, 0x63, 0xdd, 0x53, 0xab, 0xd3, 0x15, 0x91, 0x20, 0x26, 0x24, - 0x5b, 0x71, 0xf2, 0x45, 0xae, 0x05, 0xb9, 0xc6, 0x9a, 0x2f, 0x7c, 0xa1, 0x52, 0xed, 0xf8, 0x2b, - 0xa9, 0x32, 0x5e, 0xf5, 0x85, 0xf0, 0x03, 0x66, 0xbb, 0x1d, 0x6e, 0xbb, 0x61, 0x28, 0x22, 0x37, - 0xe2, 0x22, 0x94, 0x10, 0x35, 0x21, 0xaa, 0xfe, 0x6a, 0xf6, 0x8e, 0x6c, 0xaf, 0xd7, 0x55, 0x09, - 0x3a, 0xae, 0x09, 0x0e, 0x71, 0xf3, 0xdd, 0x9e, 0xcf, 0x20, 0x7e, 0xab, 0x48, 0xc0, 0x10, 0x4f, - 0x55, 0x41, 0xef, 0xe3, 0xb5, 0x8f, 0x63, 0x51, 0x1f, 0xc6, 0x28, 0x07, 0x9e, 0x74, 0xd8, 0x83, - 0x1e, 0x93, 0x11, 0xd9, 0xc6, 0x57, 0x63, 0x8c, 0x06, 0xf7, 0xca, 0x68, 0x13, 0x6d, 0x2d, 0xd4, - 0xc9, 0xa0, 0x5f, 0x79, 0xf1, 0xd4, 0x6d, 0x07, 0xbb, 0x14, 0x02, 0xd4, 0x59, 0x8c, 0xbf, 0x0e, - 0x3c, 0xfa, 0xcd, 0x3c, 0x7e, 0x39, 0x83, 0x22, 0x3b, 0x22, 0x94, 0x8c, 0xfc, 0x84, 0xf0, 0xba, - 0x22, 0xd8, 0xe0, 0x9e, 0x6c, 0x7c, 0xc9, 0xa3, 0xe3, 0x86, 0x96, 0x54, 0x46, 0x9b, 0xf3, 0x5b, - 0x2b, 0xd5, 0x03, 0x6b, 0xf2, 0x3d, 0x5a, 0x97, 0x02, 0x5b, 0x70, 0xf0, 0x29, 0x8f, 0x8e, 0xf7, - 0x01, 0xb0, 0x4e, 0x07, 0xfd, 0x8a, 0x99, 0x50, 0x1c, 0xd3, 0x93, 0x3a, 0x6b, 0x3e, 0x20, 0x0d, - 0x57, 0x1a, 0xbf, 0x22, 0xbc, 0x7a, 0x09, 0x22, 0xb1, 0xf0, 0x92, 0x46, 0x82, 0x6b, 0x58, 0x1d, - 0xf4, 0x2b, 0x2f, 0x8d, 0xf6, 0xa0, 0xce, 0x55, 0x00, 0x25, 0xef, 0xe3, 0xa5, 0x54, 0xde, 0x95, - 0x4d, 0xb4, 0xb5, 0x52, 0xdd, 0xb0, 0x92, 0x91, 0x5a, 0x7a, 0xa4, 0x56, 0x4a, 0x77, 0xe9, 0x69, - 0xbf, 0x32, 0xf7, 0xc3, 0x5f, 0x15, 0xe4, 0xa4, 0x45, 0x64, 0x0f, 0x1b, 0x00, 0xab, 0x2f, 0xa2, - 0xd1, 0x61, 0xdd, 0xf8, 0xd3, 0xf5, 0x59, 0x79, 0x7e, 0x13, 0x6d, 0x2d, 0x3b, 0xe5, 0xa4, 0x9b, - 0x4e, 0x38, 0x4c, 0xe3, 0x74, 0x1d, 0xc6, 0xb0, 0xcf, 0x65, 0xd4, 0x3d, 0x08, 0x8f, 0x04, 0x4c, - 0x93, 0x3e, 0xc2, 0xaf, 0x64, 0x03, 0x30, 0xa0, 0x16, 0xc6, 0x5e, 0x7c, 0xd8, 0xe0, 0xe1, 0x91, - 0x50, 0x1a, 0x57, 0xaa, 0x37, 0x8b, 0x46, 0x92, 0xc2, 0xd4, 0x37, 0x62, 0x0d, 0x83, 0x7e, 0xa5, - 0x94, 0x5c, 0xc9, 0x05, 0x14, 0x75, 0x96, 0x3d, 0x9d, 0x45, 0xd7, 0x30, 0x51, 0xed, 0x0f, 0xdd, - 0xae, 0xdb, 0xd6, 0x2b, 0x46, 0x3f, 0xc7, 0xab, 0x23, 0xa7, 0xc0, 0x68, 0x1f, 0x2f, 0x76, 0xd4, - 0x09, 0xb0, 0x79, 0xb3, 0x88, 0x4d, 0x52, 0x5f, 0x5f, 0x88, 0xa9, 0x38, 0x50, 0x4b, 0x2b, 0xf8, - 0x35, 0x05, 0xfe, 0x91, 0x68, 0x7d, 0xe1, 0x36, 0x03, 0xa6, 0x6f, 0x3d, 0xed, 0xfe, 0x1d, 0xc2, - 0xe6, 0xb8, 0x0c, 0x60, 0x22, 0x30, 0x09, 0x20, 0x98, 0x6e, 0x90, 0x84, 0xb5, 0x9d, 0x30, 0xd7, - 0x1b, 0x70, 0x27, 0x1b, 0xc9, 0x9d, 0xe4, 0x21, 0xa8, 0x1a, 0x7a, 0x29, 0xc8, 0x36, 0x4e, 0x49, - 0xeb, 0xd9, 0xf2, 0xaf, 0x98, 0x77, 0x28, 0x44, 0x90, 0x92, 0xfe, 0x13, 0xe1, 0x6b, 0xd9, 0xe0, - 0x4c, 0x4f, 0x95, 0x04, 0xb8, 0x94, 0x23, 0x54, 0xbc, 0xaa, 0xd7, 0x41, 0x52, 0x79, 0x8c, 0xa4, - 0x44, 0xd1, 0xb5, 0xac, 0xa2, 0x91, 0xf7, 0x33, 0x5f, 0xfc, 0x7e, 0xe8, 0x13, 0x3d, 0x94, 0x4b, - 0x6e, 0x00, 0x86, 0xf2, 0x18, 0x61, 0xc2, 0x87, 0xa2, 0x8d, 0x58, 0x98, 0x9e, 0xca, 0xad, 0xa2, - 0x5d, 0xc9, 0xe2, 0xd6, 0x5f, 0x1f, 0x1d, 0x56, 0x1e, 0x99, 0x3a, 0x25, 0x9e, 0x25, 0x43, 0x6f, - 0xe0, 0x37, 0x14, 0xcd, 0x0f, 0x1e, 0x46, 0xac, 0x1b, 0xba, 0x41, 0xfa, 0x18, 0x95, 0x89, 0x0c, - 0x6d, 0xf8, 0xf5, 0xc9, 0x69, 0xa0, 0xa9, 0x86, 0x17, 0x3c, 0x37, 0x72, 0xd3, 0xd5, 0xd2, 0x22, - 0x86, 0x04, 0xa8, 0x0a, 0xd8, 0x71, 0x95, 0x5c, 0x7d, 0xb2, 0x8c, 0x5f, 0x50, 0xe8, 0xe4, 0x17, - 0x84, 0x97, 0xb4, 0x41, 0x92, 0x3b, 0x33, 0xfa, 0xa9, 0x62, 0x6a, 0xdc, 0x7d, 0x2e, 0x17, 0xa6, - 0x7b, 0x8f, 0x7f, 0xff, 0xe7, 0xfb, 0x2b, 0xf7, 0xc8, 0x1d, 0xbb, 0xe8, 0x87, 0x47, 0x4d, 0x78, - 0x87, 0x7b, 0xd2, 0xfe, 0x1a, 0x76, 0xf2, 0x11, 0xf9, 0x19, 0xe1, 0xe5, 0xd4, 0x4a, 0xc8, 0x74, - 0x14, 0xb2, 0xd6, 0x66, 0xdc, 0x9b, 0xb5, 0x0c, 0xa8, 0xd7, 0x14, 0xf5, 0x1d, 0xb2, 0x5d, 0x48, - 0xfd, 0xc2, 0xd4, 0xc8, 0x8f, 0x08, 0x2f, 0x26, 0x76, 0x43, 0xaa, 0x53, 0xf5, 0x1d, 0x71, 0x3c, - 0xa3, 0x36, 0x53, 0x0d, 0x10, 0xb5, 0x15, 0xd1, 0x9b, 0xe4, 0xad, 0x42, 0xa2, 0x89, 0xf5, 0x91, - 0xdf, 0x10, 0x2e, 0xe5, 0x4c, 0x8d, 0xbc, 0x3b, 0x55, 0xef, 0x71, 0x76, 0x69, 0xbc, 0xf7, 0xbc, - 0xe5, 0xa0, 0xe2, 0x1d, 0xa5, 0xe2, 0x2e, 0xa9, 0x15, 0xaa, 0xc8, 0xfb, 0xa5, 0x52, 0x94, 0x73, - 0x84, 0x29, 0x15, 0x8d, 0xf3, 0xd2, 0x29, 0x15, 0x8d, 0x35, 0xa2, 0x19, 0x14, 0xe5, 0x4d, 0x85, - 0xfc, 0x8b, 0xf0, 0xfa, 0x18, 0x57, 0x20, 0xf7, 0xa7, 0x22, 0x36, 0xd9, 0x7a, 0x8c, 0xfd, 0xff, - 0x07, 0x02, 0x1a, 0xeb, 0x4a, 0xe3, 0x1e, 0xd9, 0x2d, 0xd4, 0xc8, 0x00, 0x69, 0xe8, 0x1f, 0x17, - 0xf5, 0xe4, 0x65, 0xfd, 0x93, 0xa7, 0x67, 0x26, 0x7a, 0x76, 0x66, 0xa2, 0xbf, 0xcf, 0x4c, 0xf4, - 0xed, 0xb9, 0x39, 0xf7, 0xec, 0xdc, 0x9c, 0xfb, 0xe3, 0xdc, 0x9c, 0xfb, 0x6c, 0xd7, 0xe7, 0xd1, - 0x71, 0xaf, 0x69, 0xb5, 0x44, 0x5b, 0xe3, 0xef, 0x04, 0x6e, 0x53, 0xa6, 0xcd, 0x4e, 0xde, 0xb6, - 0x1f, 0xe6, 0x3a, 0x46, 0xa7, 0x1d, 0x26, 0x9b, 0x8b, 0xea, 0x47, 0xaa, 0xf6, 0x5f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x0a, 0x37, 0x4e, 0x4c, 0xb3, 0x0b, 0x00, 0x00, + 0xc1, 0xa0, 0x84, 0x03, 0x67, 0xff, 0x02, 0xb4, 0xb3, 0x6f, 0x36, 0xf6, 0x6e, 0xec, 0xb5, 0xc3, + 0x6d, 0x33, 0xef, 0xbd, 0xef, 0x7d, 0xdf, 0xbc, 0x37, 0x9f, 0x83, 0x37, 0x85, 0x6c, 0x09, 0xc9, + 0xa5, 0xdd, 0x16, 0x22, 0xd8, 0xe2, 0xe1, 0x21, 0x0b, 0x23, 0x7e, 0xc2, 0xa4, 0x7d, 0xb2, 0xd3, + 0x64, 0x91, 0xbb, 0x63, 0x3f, 0xea, 0xb2, 0xce, 0xa9, 0xd5, 0xee, 0x88, 0x48, 0x10, 0x13, 0x92, + 0xad, 0x38, 0xf9, 0x22, 0xd7, 0x82, 0x5c, 0x63, 0xc5, 0x17, 0xbe, 0x50, 0xa9, 0x76, 0xfc, 0x95, + 0x54, 0x19, 0xaf, 0xfb, 0x42, 0xf8, 0x01, 0xb3, 0xdd, 0x36, 0xb7, 0xdd, 0x30, 0x14, 0x91, 0x1b, + 0x71, 0x11, 0x4a, 0x88, 0x9a, 0x10, 0x55, 0x7f, 0x35, 0xbb, 0x47, 0xb6, 0xd7, 0xed, 0xa8, 0x04, + 0x1d, 0xd7, 0x04, 0x07, 0xb8, 0xf9, 0x6e, 0xd7, 0x67, 0x10, 0xdf, 0x2e, 0x12, 0x30, 0xc0, 0x53, + 0x55, 0xd0, 0x87, 0x78, 0xe5, 0xe3, 0x58, 0xd4, 0x87, 0x31, 0xca, 0xbe, 0x27, 0x1d, 0xf6, 0xa8, + 0xcb, 0x64, 0x44, 0x36, 0xf1, 0xf5, 0x18, 0xa3, 0xc1, 0xbd, 0x32, 0x5a, 0x47, 0x1b, 0x73, 0x75, + 0xd2, 0xef, 0x55, 0x5e, 0x3e, 0x75, 0x5b, 0xc1, 0x7d, 0x0a, 0x01, 0xea, 0xcc, 0xc7, 0x5f, 0xfb, + 0x1e, 0xfd, 0x66, 0x16, 0xbf, 0x9a, 0x41, 0x91, 0x6d, 0x11, 0x4a, 0x46, 0x7e, 0x42, 0x78, 0x55, + 0x11, 0x6c, 0x70, 0x4f, 0x36, 0xbe, 0xe4, 0xd1, 0x71, 0x43, 0x4b, 0x2a, 0xa3, 0xf5, 0xd9, 0x8d, + 0xa5, 0xea, 0xbe, 0x35, 0xfe, 0x1e, 0xad, 0x4b, 0x81, 0x2d, 0x38, 0xf8, 0x94, 0x47, 0xc7, 0x7b, + 0x00, 0x58, 0xa7, 0xfd, 0x5e, 0xc5, 0x4c, 0x28, 0x8e, 0xe8, 0x49, 0x9d, 0x15, 0x1f, 0x90, 0x06, + 0x2b, 0x8d, 0x5f, 0x11, 0x5e, 0xbe, 0x04, 0x91, 0x58, 0x78, 0x41, 0x23, 0xc1, 0x35, 0x2c, 0xf7, + 0x7b, 0x95, 0x57, 0x86, 0x7b, 0x50, 0xe7, 0x3a, 0x80, 0x92, 0xf7, 0xf1, 0x42, 0x2a, 0xef, 0xda, + 0x3a, 0xda, 0x58, 0xaa, 0xae, 0x59, 0xc9, 0x48, 0x2d, 0x3d, 0x52, 0x2b, 0xa5, 0xbb, 0xf0, 0xbc, + 0x57, 0x99, 0xf9, 0xe1, 0xaf, 0x0a, 0x72, 0xd2, 0x22, 0xb2, 0x8b, 0x0d, 0x80, 0xd5, 0x17, 0xd1, + 0x68, 0xb3, 0x4e, 0xfc, 0xe9, 0xfa, 0xac, 0x3c, 0xbb, 0x8e, 0x36, 0x16, 0x9d, 0x72, 0xd2, 0x4d, + 0x27, 0x1c, 0xa4, 0x71, 0xba, 0x0a, 0x63, 0xd8, 0xe3, 0x32, 0xea, 0xec, 0x87, 0x47, 0x02, 0xa6, + 0x49, 0x9f, 0xe0, 0xd7, 0xb2, 0x01, 0x18, 0xd0, 0x21, 0xc6, 0x5e, 0x7c, 0xd8, 0xe0, 0xe1, 0x91, + 0x50, 0x1a, 0x97, 0xaa, 0xb7, 0x8b, 0x46, 0x92, 0xc2, 0xd4, 0xd7, 0x62, 0x0d, 0xfd, 0x5e, 0xa5, + 0x94, 0x5c, 0xc9, 0x05, 0x14, 0x75, 0x16, 0x3d, 0x9d, 0x45, 0x57, 0x30, 0x51, 0xed, 0x0f, 0xdc, + 0x8e, 0xdb, 0xd2, 0x2b, 0x46, 0x3f, 0xc7, 0xcb, 0x43, 0xa7, 0xc0, 0x68, 0x0f, 0xcf, 0xb7, 0xd5, + 0x09, 0xb0, 0x79, 0xbb, 0x88, 0x4d, 0x52, 0x5f, 0x9f, 0x8b, 0xa9, 0x38, 0x50, 0x4b, 0x2b, 0xf8, + 0x0d, 0x05, 0xfe, 0x91, 0x38, 0xfc, 0xc2, 0x6d, 0x06, 0x4c, 0xdf, 0x7a, 0xda, 0xfd, 0x3b, 0x84, + 0xcd, 0x51, 0x19, 0xc0, 0x44, 0x60, 0x12, 0x40, 0x30, 0xdd, 0x20, 0x09, 0x6b, 0x3b, 0x66, 0xae, + 0xb7, 0xe0, 0x4e, 0xd6, 0x92, 0x3b, 0xc9, 0x43, 0x50, 0x35, 0xf4, 0x52, 0x90, 0x6d, 0x9c, 0x92, + 0xd6, 0xb3, 0xe5, 0x5f, 0x31, 0xef, 0x40, 0x88, 0x20, 0x25, 0xfd, 0x27, 0xc2, 0x37, 0xb2, 0xc1, + 0xa9, 0x9e, 0x2a, 0x09, 0x70, 0x29, 0x47, 0xa8, 0x78, 0x55, 0x6f, 0x82, 0xa4, 0xf2, 0x08, 0x49, + 0x89, 0xa2, 0x1b, 0x59, 0x45, 0x43, 0xef, 0x67, 0xb6, 0xf8, 0xfd, 0xd0, 0x67, 0x7a, 0x28, 0x97, + 0xdc, 0x00, 0x0c, 0xe5, 0x29, 0xc2, 0x84, 0x0f, 0x44, 0x1b, 0xb1, 0x30, 0x3d, 0x95, 0xed, 0xa2, + 0x5d, 0xc9, 0xe2, 0xd6, 0xdf, 0x1c, 0x1e, 0x56, 0x1e, 0x99, 0x3a, 0x25, 0x9e, 0x25, 0x43, 0x6f, + 0xe1, 0xb7, 0x14, 0xcd, 0x0f, 0x1e, 0x47, 0xac, 0x13, 0xba, 0x41, 0xfa, 0x18, 0x95, 0x89, 0x0c, + 0x6c, 0xf8, 0xcd, 0xf1, 0x69, 0xa0, 0xa9, 0x86, 0xe7, 0x3c, 0x37, 0x72, 0xd3, 0xd5, 0xd2, 0x22, + 0x06, 0x04, 0xa8, 0x0a, 0xd8, 0x71, 0x95, 0x5c, 0x7d, 0xb6, 0x88, 0x5f, 0x52, 0xe8, 0xe4, 0x17, + 0x84, 0x17, 0xb4, 0x41, 0x92, 0x3b, 0x53, 0xfa, 0xa9, 0x62, 0x6a, 0xdc, 0xbd, 0x92, 0x0b, 0xd3, + 0xdd, 0xa7, 0xbf, 0xff, 0xf3, 0xfd, 0xb5, 0x7b, 0xe4, 0x8e, 0x5d, 0xf4, 0xc3, 0xa3, 0x26, 0xbc, + 0xc5, 0x3d, 0x69, 0x7f, 0x0d, 0x3b, 0xf9, 0x84, 0xfc, 0x8c, 0xf0, 0x62, 0x6a, 0x25, 0x64, 0x32, + 0x0a, 0x59, 0x6b, 0x33, 0xee, 0x4d, 0x5b, 0x06, 0xd4, 0x6b, 0x8a, 0xfa, 0x16, 0xd9, 0x2c, 0xa4, + 0x7e, 0x61, 0x6a, 0xe4, 0x47, 0x84, 0xe7, 0x13, 0xbb, 0x21, 0xd5, 0x89, 0xfa, 0x0e, 0x39, 0x9e, + 0x51, 0x9b, 0xaa, 0x06, 0x88, 0xda, 0x8a, 0xe8, 0x6d, 0xf2, 0x4e, 0x21, 0xd1, 0xc4, 0xfa, 0xc8, + 0x6f, 0x08, 0x97, 0x72, 0xa6, 0x46, 0xde, 0x9d, 0xa8, 0xf7, 0x28, 0xbb, 0x34, 0xde, 0xbb, 0x6a, + 0x39, 0xa8, 0x78, 0xa0, 0x54, 0xdc, 0x25, 0xb5, 0x42, 0x15, 0x79, 0xbf, 0x54, 0x8a, 0x72, 0x8e, + 0x30, 0xa1, 0xa2, 0x51, 0x5e, 0x3a, 0xa1, 0xa2, 0x91, 0x46, 0x34, 0x85, 0xa2, 0xbc, 0xa9, 0x90, + 0x7f, 0x11, 0x5e, 0x1d, 0xe1, 0x0a, 0xe4, 0xe1, 0x44, 0xc4, 0xc6, 0x5b, 0x8f, 0xb1, 0xf7, 0xff, + 0x40, 0x40, 0x63, 0x5d, 0x69, 0xdc, 0x25, 0xf7, 0x0b, 0x35, 0x32, 0x40, 0x1a, 0xf8, 0xc7, 0x45, + 0x3d, 0x79, 0x59, 0xff, 0xe4, 0xf9, 0x99, 0x89, 0x5e, 0x9c, 0x99, 0xe8, 0xef, 0x33, 0x13, 0x7d, + 0x7b, 0x6e, 0xce, 0xbc, 0x38, 0x37, 0x67, 0xfe, 0x38, 0x37, 0x67, 0x3e, 0x7b, 0xe0, 0xf3, 0xe8, + 0xb8, 0xdb, 0xb4, 0x0e, 0x45, 0x4b, 0xe3, 0x6f, 0x05, 0x6e, 0x53, 0xa6, 0xcd, 0x4e, 0x76, 0xb6, + 0xed, 0xc7, 0xb9, 0x96, 0xd1, 0x69, 0x9b, 0xc9, 0xe6, 0xbc, 0xfa, 0x95, 0xaa, 0xfd, 0x17, 0x00, + 0x00, 0xff, 0xff, 0xd0, 0x94, 0x3e, 0x10, 0xb4, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pool-incentives/types/query_test.go b/x/pool-incentives/types/query_test.go index 4de277cf43c..aef8101cc3b 100644 --- a/x/pool-incentives/types/query_test.go +++ b/x/pool-incentives/types/query_test.go @@ -5,7 +5,7 @@ import ( "time" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/pool-incentives/types/record_test.go b/x/pool-incentives/types/record_test.go index a49cb927e1c..bc1af2c5615 100644 --- a/x/pool-incentives/types/record_test.go +++ b/x/pool-incentives/types/record_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func TestDistrRecord(t *testing.T) { diff --git a/x/superfluid/abci.go b/x/superfluid/abci.go index 04e246c7eb8..af8f538df7a 100644 --- a/x/superfluid/abci.go +++ b/x/superfluid/abci.go @@ -1,8 +1,8 @@ package superfluid import ( - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/client/cli/query.go b/x/superfluid/client/cli/query.go index e120cb6bf59..4e21adaca70 100644 --- a/x/superfluid/client/cli/query.go +++ b/x/superfluid/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/superfluid/client/cli/tx.go b/x/superfluid/client/cli/tx.go index 23771849537..0e5017dd3b6 100644 --- a/x/superfluid/client/cli/tx.go +++ b/x/superfluid/client/cli/tx.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/superfluid/client/proposal_handler.go b/x/superfluid/client/proposal_handler.go index e6e306acd74..4100f550391 100644 --- a/x/superfluid/client/proposal_handler.go +++ b/x/superfluid/client/proposal_handler.go @@ -1,8 +1,8 @@ package client import ( - "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/rest" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/superfluid/keeper/distribution_test.go b/x/superfluid/keeper/distribution_test.go index 1e77f51c8ed..3ff4cf71375 100644 --- a/x/superfluid/keeper/distribution_test.go +++ b/x/superfluid/keeper/distribution_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/edge_case_test.go b/x/superfluid/keeper/edge_case_test.go index a03a17883f3..28e897f5540 100644 --- a/x/superfluid/keeper/edge_case_test.go +++ b/x/superfluid/keeper/edge_case_test.go @@ -7,7 +7,7 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) func (suite *KeeperTestSuite) TestSuperfluidDelegatedValidatorJailed() { diff --git a/x/superfluid/keeper/epoch.go b/x/superfluid/keeper/epoch.go index a1146131c63..47e7023c76f 100644 --- a/x/superfluid/keeper/epoch.go +++ b/x/superfluid/keeper/epoch.go @@ -7,11 +7,11 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64) { diff --git a/x/superfluid/keeper/genesis.go b/x/superfluid/keeper/genesis.go index 0bc8427ed8e..1a016b69360 100644 --- a/x/superfluid/keeper/genesis.go +++ b/x/superfluid/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/superfluid/keeper/genesis_test.go b/x/superfluid/keeper/genesis_test.go index dde164a99a8..08f42a054c0 100644 --- a/x/superfluid/keeper/genesis_test.go +++ b/x/superfluid/keeper/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/superfluid" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/superfluid" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/gov/gov.go b/x/superfluid/keeper/gov/gov.go index 9a2f6f12717..1799e6197f2 100644 --- a/x/superfluid/keeper/gov/gov.go +++ b/x/superfluid/keeper/gov/gov.go @@ -3,8 +3,8 @@ package gov import ( "fmt" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/gov/gov_test.go b/x/superfluid/keeper/gov/gov_test.go index 90f88eaf9ce..38022941ea1 100644 --- a/x/superfluid/keeper/gov/gov_test.go +++ b/x/superfluid/keeper/gov/gov_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) createGammPool(denoms []string) uint64 { diff --git a/x/superfluid/keeper/gov/suite_test.go b/x/superfluid/keeper/gov/suite_test.go index f9946e68a42..efd571759f2 100644 --- a/x/superfluid/keeper/gov/suite_test.go +++ b/x/superfluid/keeper/gov/suite_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" ) type KeeperTestSuite struct { diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go index 117b3741441..845878bd6a8 100644 --- a/x/superfluid/keeper/grpc_query.go +++ b/x/superfluid/keeper/grpc_query.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) var _ types.QueryServer = Querier{} diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go index cd9f6aabe5a..75de6d3fe31 100644 --- a/x/superfluid/keeper/grpc_query_test.go +++ b/x/superfluid/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestGRPCParams() { diff --git a/x/superfluid/keeper/hooks.go b/x/superfluid/keeper/hooks.go index 6848da25228..7310854aab0 100644 --- a/x/superfluid/keeper/hooks.go +++ b/x/superfluid/keeper/hooks.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/intermediary_account.go b/x/superfluid/keeper/intermediary_account.go index f859fb6d344..4c7a770063d 100644 --- a/x/superfluid/keeper/intermediary_account.go +++ b/x/superfluid/keeper/intermediary_account.go @@ -2,8 +2,8 @@ package keeper import ( "github.com/gogo/protobuf/proto" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/intermediary_account_test.go b/x/superfluid/keeper/intermediary_account_test.go index 29cbe67a3c0..32c96a87b2c 100644 --- a/x/superfluid/keeper/intermediary_account_test.go +++ b/x/superfluid/keeper/intermediary_account_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestIntermediaryAccountCreation() { diff --git a/x/superfluid/keeper/invariants.go b/x/superfluid/keeper/invariants.go index 52ff07e4162..c4ffa289729 100644 --- a/x/superfluid/keeper/invariants.go +++ b/x/superfluid/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) const totalSuperfluidDelegationInvariantName = "total-superfluid-delegation-invariant-name" diff --git a/x/superfluid/keeper/keeper.go b/x/superfluid/keeper/keeper.go index 0dfc0a84fa8..a54027fd148 100644 --- a/x/superfluid/keeper/keeper.go +++ b/x/superfluid/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go index fa5a73d1fc8..03a8244cada 100644 --- a/x/superfluid/keeper/keeper_test.go +++ b/x/superfluid/keeper/keeper_test.go @@ -10,14 +10,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) type KeeperTestSuite struct { diff --git a/x/superfluid/keeper/msg_server.go b/x/superfluid/keeper/msg_server.go index 63d64c53286..514541539a2 100644 --- a/x/superfluid/keeper/msg_server.go +++ b/x/superfluid/keeper/msg_server.go @@ -9,11 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - v8constants "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8/constants" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + v8constants "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8/constants" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) type msgServer struct { diff --git a/x/superfluid/keeper/msg_server_test.go b/x/superfluid/keeper/msg_server_test.go index 9075204317b..bdfbfa4ba92 100644 --- a/x/superfluid/keeper/msg_server_test.go +++ b/x/superfluid/keeper/msg_server_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestMsgSuperfluidDelegate() { diff --git a/x/superfluid/keeper/params.go b/x/superfluid/keeper/params.go index 4b79f4d1d74..f53ef272d4c 100644 --- a/x/superfluid/keeper/params.go +++ b/x/superfluid/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/slash.go b/x/superfluid/keeper/slash.go index 35a04049e4f..a8490348a0c 100644 --- a/x/superfluid/keeper/slash.go +++ b/x/superfluid/keeper/slash.go @@ -3,8 +3,8 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/slash_test.go b/x/superfluid/keeper/slash_test.go index bbe302047a1..aebf7f7682a 100644 --- a/x/superfluid/keeper/slash_test.go +++ b/x/superfluid/keeper/slash_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/stake.go b/x/superfluid/keeper/stake.go index 1cf129f9d29..ef8cd53b7e9 100644 --- a/x/superfluid/keeper/stake.go +++ b/x/superfluid/keeper/stake.go @@ -3,9 +3,9 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/stake_test.go b/x/superfluid/keeper/stake_test.go index f72ce71624f..ad1b52b6fac 100644 --- a/x/superfluid/keeper/stake_test.go +++ b/x/superfluid/keeper/stake_test.go @@ -5,9 +5,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/superfluid_asset.go b/x/superfluid/keeper/superfluid_asset.go index d0d263b0a85..de2b6afce86 100644 --- a/x/superfluid/keeper/superfluid_asset.go +++ b/x/superfluid/keeper/superfluid_asset.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/osmoutils" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/superfluid_asset_store.go b/x/superfluid/keeper/superfluid_asset_store.go index 41d6cf47546..7fd3a0d9fba 100644 --- a/x/superfluid/keeper/superfluid_asset_store.go +++ b/x/superfluid/keeper/superfluid_asset_store.go @@ -4,7 +4,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/superfluid_asset_test.go b/x/superfluid/keeper/superfluid_asset_test.go index 34410196c31..2abd131f1bc 100644 --- a/x/superfluid/keeper/superfluid_asset_test.go +++ b/x/superfluid/keeper/superfluid_asset_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/synthetic_lock_wrapper.go b/x/superfluid/keeper/synthetic_lock_wrapper.go index 4d99ca38661..b67dce964fd 100644 --- a/x/superfluid/keeper/synthetic_lock_wrapper.go +++ b/x/superfluid/keeper/synthetic_lock_wrapper.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/twap_price.go b/x/superfluid/keeper/twap_price.go index cdeb09b8f08..f16466a7861 100644 --- a/x/superfluid/keeper/twap_price.go +++ b/x/superfluid/keeper/twap_price.go @@ -2,8 +2,8 @@ package keeper import ( "github.com/gogo/protobuf/proto" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/twap_price_test.go b/x/superfluid/keeper/twap_price_test.go index b5c6bf81f7a..2bb60643015 100644 --- a/x/superfluid/keeper/twap_price_test.go +++ b/x/superfluid/keeper/twap_price_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/unpool.go b/x/superfluid/keeper/unpool.go index 412916b58c3..68a5cdb2522 100644 --- a/x/superfluid/keeper/unpool.go +++ b/x/superfluid/keeper/unpool.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) // Returns a list of newly created lockIDs, or an error. diff --git a/x/superfluid/keeper/unpool_test.go b/x/superfluid/keeper/unpool_test.go index a919f5bc52b..f0a8300a023 100644 --- a/x/superfluid/keeper/unpool_test.go +++ b/x/superfluid/keeper/unpool_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) var ( diff --git a/x/superfluid/module.go b/x/superfluid/module.go index 54ae2b9373c..5dceac95650 100644 --- a/x/superfluid/module.go +++ b/x/superfluid/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/simulation" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/simulation" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) var ( diff --git a/x/superfluid/proposal_handler.go b/x/superfluid/proposal_handler.go index 1c383becf0c..1aa75470e3d 100644 --- a/x/superfluid/proposal_handler.go +++ b/x/superfluid/proposal_handler.go @@ -5,9 +5,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func NewSuperfluidProposalHandler(k keeper.Keeper, ek types.EpochKeeper) govtypes.Handler { diff --git a/x/superfluid/simulation/genesis.go b/x/superfluid/simulation/genesis.go index 8dae576a113..c0ae52e0c6c 100644 --- a/x/superfluid/simulation/genesis.go +++ b/x/superfluid/simulation/genesis.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/superfluid/simulation/operations.go b/x/superfluid/simulation/operations.go index 1061a688bb8..b363776dcec 100644 --- a/x/superfluid/simulation/operations.go +++ b/x/superfluid/simulation/operations.go @@ -3,13 +3,13 @@ package simulation import ( "math/rand" - osmo_simulation "github.com/osmosis-labs/osmosis/v7/simulation/types" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/simulation/types" "github.com/cosmos/cosmos-sdk/baseapp" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/superfluid/simulation/proposals.go b/x/superfluid/simulation/proposals.go index eecb67e3cc3..fc11740a3dd 100644 --- a/x/superfluid/simulation/proposals.go +++ b/x/superfluid/simulation/proposals.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) const ( diff --git a/x/superfluid/types/expected_keepers.go b/x/superfluid/types/expected_keepers.go index 4baf773e6df..5f919d5a295 100644 --- a/x/superfluid/types/expected_keepers.go +++ b/x/superfluid/types/expected_keepers.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // LockupKeeper defines the expected interface needed to retrieve locks. diff --git a/x/superfluid/types/genesis.pb.go b/x/superfluid/types/genesis.pb.go index adbf10eed44..40d5532774e 100644 --- a/x/superfluid/types/genesis.pb.go +++ b/x/superfluid/types/genesis.pb.go @@ -113,31 +113,31 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/genesis.proto", fileDescriptor_d5256ebb7c83fff3) } var fileDescriptor_d5256ebb7c83fff3 = []byte{ - // 384 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x4f, 0xe2, 0x50, - 0x10, 0xc7, 0xdb, 0x85, 0xe5, 0x50, 0xf6, 0xb0, 0xdb, 0xb0, 0x49, 0xc5, 0x58, 0x88, 0x5c, 0xb8, - 0xd8, 0x46, 0x8c, 0xc1, 0x2b, 0x18, 0x63, 0x48, 0x34, 0x18, 0x48, 0x3c, 0x78, 0x69, 0x1e, 0xe5, - 0x59, 0x5f, 0x6c, 0x3b, 0xb5, 0xf3, 0x4a, 0xe0, 0x03, 0x78, 0xe7, 0x63, 0x71, 0xe4, 0xe8, 0xc9, - 0x18, 0xf8, 0x22, 0xa6, 0xed, 0xb3, 0xa0, 0x54, 0x6f, 0xd3, 0xce, 0xef, 0x3f, 0xbf, 0x79, 0xc9, - 0x28, 0x75, 0x40, 0x0f, 0x90, 0xa1, 0x89, 0x51, 0x40, 0xc3, 0x7b, 0x37, 0x62, 0x63, 0xd3, 0xa1, - 0x3e, 0x45, 0x86, 0x46, 0x10, 0x02, 0x07, 0x55, 0x15, 0x84, 0xb1, 0x21, 0xaa, 0x15, 0x07, 0x1c, - 0x48, 0xda, 0x66, 0x5c, 0xa5, 0x64, 0xb5, 0x91, 0x33, 0x6b, 0x53, 0x0a, 0xa8, 0x96, 0x03, 0x05, - 0x24, 0x24, 0x9e, 0xf0, 0x1d, 0xce, 0x8b, 0xca, 0x9f, 0xcb, 0x74, 0x83, 0x21, 0x27, 0x9c, 0xaa, - 0x67, 0x4a, 0x29, 0x05, 0x34, 0xb9, 0x2e, 0x37, 0xcb, 0xad, 0xaa, 0xb1, 0xbb, 0x91, 0x71, 0x93, - 0x10, 0xdd, 0xe2, 0xe2, 0xb5, 0x26, 0x0d, 0x04, 0xaf, 0xde, 0x2a, 0xff, 0x36, 0x88, 0x45, 0x10, - 0x29, 0x47, 0xed, 0x57, 0xbd, 0xd0, 0x2c, 0xb7, 0x1a, 0x79, 0x43, 0x86, 0x59, 0xd9, 0x89, 0x59, - 0x31, 0xed, 0x2f, 0x7e, 0xfe, 0x8d, 0xea, 0x54, 0xd9, 0x8f, 0xd3, 0x16, 0x7d, 0x8a, 0xd8, 0x84, - 0xb8, 0xd4, 0xe7, 0x96, 0x17, 0xb9, 0x9c, 0x05, 0x2e, 0xa3, 0x21, 0x6a, 0x85, 0xc4, 0xd0, 0xca, - 0x33, 0xf4, 0xd1, 0x83, 0x8b, 0x2c, 0x75, 0x9d, 0x85, 0x06, 0xd4, 0x86, 0x70, 0x2c, 0x84, 0x7b, - 0xf0, 0x0d, 0x85, 0xaa, 0xab, 0xfc, 0x67, 0x3e, 0xa7, 0xa1, 0x47, 0xc7, 0x8c, 0x84, 0x33, 0x8b, - 0xd8, 0x36, 0x44, 0x3e, 0x47, 0xad, 0x98, 0x38, 0x8f, 0x7f, 0x7e, 0x55, 0x6f, 0x2b, 0xda, 0x49, - 0x93, 0x42, 0x59, 0x61, 0xbb, 0x2d, 0x54, 0x9f, 0x65, 0xa5, 0x16, 0x37, 0xbe, 0xd8, 0x2c, 0x1b, - 0x7c, 0x9f, 0xda, 0x9c, 0x81, 0x8f, 0xda, 0xef, 0x44, 0xdc, 0xce, 0x13, 0x5f, 0x81, 0xfd, 0xd8, - 0xcb, 0x93, 0x9e, 0x67, 0x79, 0xa1, 0x3f, 0xd8, 0xb2, 0xec, 0x30, 0xd8, 0xed, 0x2f, 0x56, 0xba, - 0xbc, 0x5c, 0xe9, 0xf2, 0xdb, 0x4a, 0x97, 0xe7, 0x6b, 0x5d, 0x5a, 0xae, 0x75, 0xe9, 0x65, 0xad, - 0x4b, 0x77, 0xa7, 0x0e, 0xe3, 0x0f, 0xd1, 0xc8, 0xb0, 0xc1, 0x33, 0xc5, 0x06, 0x47, 0x2e, 0x19, - 0xe1, 0xc7, 0x87, 0x39, 0x69, 0x9b, 0xd3, 0xed, 0x53, 0xe3, 0xb3, 0x80, 0xe2, 0xa8, 0x94, 0x9c, - 0xda, 0xc9, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x30, 0xda, 0x43, 0xfe, 0x02, 0x00, 0x00, + // 382 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x4f, 0xc2, 0x40, + 0x14, 0xc7, 0x5b, 0x41, 0x86, 0xe2, 0xa0, 0x0d, 0x26, 0x15, 0x63, 0x21, 0xb2, 0xb0, 0xd8, 0x0a, + 0x26, 0xea, 0x0a, 0xc6, 0x18, 0x12, 0x8d, 0x04, 0x12, 0x07, 0x97, 0xe6, 0x28, 0x67, 0xbd, 0xd8, + 0xf6, 0xea, 0xbd, 0x2b, 0x81, 0x0f, 0xe0, 0xce, 0xc7, 0x62, 0x64, 0x74, 0x32, 0x06, 0xbe, 0x88, + 0x69, 0x7b, 0x16, 0x94, 0xea, 0xf6, 0xda, 0xf7, 0xfb, 0xbf, 0xdf, 0xbb, 0xe4, 0x29, 0x55, 0x0a, + 0x1e, 0x05, 0x02, 0x26, 0x84, 0x01, 0x66, 0x4f, 0x6e, 0x48, 0x86, 0xa6, 0x83, 0x7d, 0x0c, 0x04, + 0x8c, 0x80, 0x51, 0x4e, 0x55, 0x55, 0x10, 0xc6, 0x8a, 0x28, 0x97, 0x1c, 0xea, 0xd0, 0xb8, 0x6d, + 0x46, 0x55, 0x42, 0x96, 0x6b, 0x19, 0xb3, 0x56, 0xa5, 0x80, 0x2a, 0x19, 0x50, 0x80, 0x18, 0xf2, + 0x84, 0xef, 0x78, 0x9a, 0x57, 0x76, 0x6e, 0x92, 0x0d, 0xfa, 0x1c, 0x71, 0xac, 0x5e, 0x2a, 0x85, + 0x04, 0xd0, 0xe4, 0xaa, 0x5c, 0x2f, 0x36, 0xcb, 0xc6, 0xe6, 0x46, 0x46, 0x37, 0x26, 0xda, 0xf9, + 0xd9, 0x47, 0x45, 0xea, 0x09, 0x5e, 0x7d, 0x50, 0xf6, 0x56, 0x88, 0x85, 0x00, 0x30, 0x07, 0x6d, + 0xab, 0x9a, 0xab, 0x17, 0x9b, 0xb5, 0xac, 0x21, 0xfd, 0xb4, 0x6c, 0x45, 0xac, 0x98, 0xb6, 0x0b, + 0x3f, 0x7f, 0x83, 0x3a, 0x56, 0x0e, 0xa3, 0xb4, 0x85, 0x5f, 0x43, 0x32, 0x42, 0x2e, 0xf6, 0xb9, + 0xe5, 0x85, 0x2e, 0x27, 0x81, 0x4b, 0x30, 0x03, 0x2d, 0x17, 0x1b, 0x9a, 0x59, 0x86, 0x7b, 0xf0, + 0xe8, 0x75, 0x9a, 0xba, 0x4b, 0x43, 0x3d, 0x6c, 0x53, 0x36, 0x14, 0xc2, 0x03, 0xfa, 0x07, 0x05, + 0xaa, 0xab, 0xec, 0x13, 0x9f, 0x63, 0xe6, 0xe1, 0x21, 0x41, 0x6c, 0x62, 0x21, 0xdb, 0xa6, 0xa1, + 0xcf, 0x41, 0xcb, 0xc7, 0xce, 0xc6, 0xff, 0xaf, 0xea, 0xac, 0x45, 0x5b, 0x49, 0x52, 0x28, 0x4b, + 0x64, 0xb3, 0x05, 0xea, 0x9b, 0xac, 0x54, 0xa2, 0xc6, 0x2f, 0x9b, 0x65, 0x53, 0xdf, 0xc7, 0x36, + 0x27, 0xd4, 0x07, 0x6d, 0x3b, 0x16, 0x5f, 0x64, 0x89, 0x6f, 0xa9, 0xfd, 0xd2, 0xc9, 0x92, 0x5e, + 0xa5, 0x79, 0xa1, 0x3f, 0x5a, 0xb3, 0x6c, 0x30, 0xd0, 0xee, 0xce, 0x16, 0xba, 0x3c, 0x5f, 0xe8, + 0xf2, 0xe7, 0x42, 0x97, 0xa7, 0x4b, 0x5d, 0x9a, 0x2f, 0x75, 0xe9, 0x7d, 0xa9, 0x4b, 0x8f, 0xe7, + 0x0e, 0xe1, 0xcf, 0xe1, 0xc0, 0xb0, 0xa9, 0x67, 0x8a, 0x0d, 0x4e, 0x5c, 0x34, 0x80, 0xef, 0x0f, + 0x73, 0xd4, 0x38, 0x35, 0xc7, 0xeb, 0xb7, 0xc6, 0x27, 0x01, 0x86, 0x41, 0x21, 0xbe, 0xb5, 0xb3, + 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x7b, 0x37, 0x83, 0xff, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/superfluid/types/gov.go b/x/superfluid/types/gov.go index 8f93b45cade..3f7ae19b68e 100644 --- a/x/superfluid/types/gov.go +++ b/x/superfluid/types/gov.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/superfluid/types/gov.pb.go b/x/superfluid/types/gov.pb.go index d9fda1d2177..f6ec16f0d3f 100644 --- a/x/superfluid/types/gov.pb.go +++ b/x/superfluid/types/gov.pb.go @@ -113,7 +113,7 @@ func init() { } var fileDescriptor_2e37d6a8d0e42294 = []byte{ - // 311 bytes of a gzipped FileDescriptorProto + // 312 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x2e, 0x2d, 0x48, 0x2d, 0x4a, 0xcb, 0x29, 0xcd, 0x4c, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, @@ -128,12 +128,12 @@ var fileDescriptor_2e37d6a8d0e42294 = []byte{ 0x58, 0x20, 0xcf, 0x30, 0x63, 0x81, 0x3c, 0xc3, 0x8b, 0x05, 0xf2, 0x8c, 0x4a, 0xf3, 0x18, 0xb9, 0xe4, 0x82, 0x52, 0x73, 0xf3, 0xcb, 0x52, 0xa9, 0xee, 0x56, 0x33, 0x2e, 0x71, 0x84, 0xa3, 0xe2, 0xc1, 0xb6, 0xc7, 0xa7, 0xa4, 0xe6, 0xe5, 0xe7, 0x42, 0x1c, 0xcf, 0x19, 0x24, 0x5a, 0x8c, 0x6a, - 0xa5, 0x0b, 0x58, 0x12, 0xd5, 0x81, 0x4e, 0xfe, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, + 0xa5, 0x0b, 0x58, 0x12, 0xd5, 0x81, 0x4e, 0x01, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, - 0xc7, 0x10, 0x65, 0x9a, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x0d, - 0x05, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0x5c, 0xbf, 0x02, 0x39, 0x96, 0x4a, - 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x31, 0x64, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd0, - 0x71, 0x2d, 0x41, 0x20, 0x02, 0x00, 0x00, + 0xc7, 0x10, 0x65, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x0d, + 0x05, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x40, 0xbf, 0x02, 0x39, 0x9a, + 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x51, 0x64, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, + 0xab, 0x02, 0x5b, 0xb2, 0x21, 0x02, 0x00, 0x00, } func (this *SetSuperfluidAssetsProposal) Equal(that interface{}) bool { diff --git a/x/superfluid/types/params.pb.go b/x/superfluid/types/params.pb.go index 3ae9297731b..e15df3ae152 100644 --- a/x/superfluid/types/params.pb.go +++ b/x/superfluid/types/params.pb.go @@ -74,7 +74,7 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/params.proto", fileDescriptor_0985261dfaf2a82e) } var fileDescriptor_0985261dfaf2a82e = []byte{ - // 259 bytes of a gzipped FileDescriptorProto + // 260 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x2e, 0x2d, 0x48, 0x2d, 0x4a, 0xcb, 0x29, 0xcd, 0x4c, 0xd1, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, @@ -86,12 +86,12 @@ var fileDescriptor_0985261dfaf2a82e = []byte{ 0x7b, 0xf2, 0x0c, 0xb7, 0xee, 0xc9, 0xab, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0x83, 0x5d, 0x01, 0xa5, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0xf5, 0x5c, 0x52, 0x93, 0x3f, 0xdd, 0x93, 0x97, 0xaa, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0xc2, - 0x62, 0xa4, 0x52, 0x90, 0x20, 0x54, 0x34, 0x28, 0xb3, 0x38, 0xdb, 0x0d, 0x2c, 0xe6, 0xe4, 0x7f, + 0x62, 0xa4, 0x52, 0x90, 0x20, 0x54, 0x34, 0x28, 0xb3, 0x38, 0xdb, 0x0d, 0x2c, 0xe6, 0x14, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, - 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xa6, 0x48, 0x56, 0x42, 0xfd, 0xad, - 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x99, 0xeb, 0x57, 0x20, 0x07, 0x15, 0xd8, 0x15, - 0x49, 0x6c, 0x60, 0x0f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x13, 0x35, 0x9c, 0x41, 0x4d, - 0x01, 0x00, 0x00, + 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0x48, 0x56, 0x42, 0xfd, 0xad, + 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x1a, 0xe8, 0x57, 0x20, 0x87, 0x15, 0xd8, + 0x19, 0x49, 0x6c, 0x60, 0x1f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x20, 0x36, 0xb0, + 0x4e, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go index 197451f98ac..f456fcf1142 100644 --- a/x/superfluid/types/query.pb.go +++ b/x/superfluid/types/query.pb.go @@ -14,7 +14,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" - types1 "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + types1 "github.com/osmosis-labs/osmosis/v10/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1386,111 +1386,111 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/query.proto", fileDescriptor_e3d9448e4ed3943f) } var fileDescriptor_e3d9448e4ed3943f = []byte{ - // 1660 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4b, 0x6c, 0xd4, 0xc6, - 0x1b, 0xcf, 0x24, 0x21, 0x81, 0x0f, 0x09, 0x92, 0x01, 0xfe, 0x09, 0x06, 0x36, 0xe0, 0x84, 0x24, - 0xff, 0x00, 0x76, 0x09, 0x0d, 0xa4, 0x50, 0x10, 0x1b, 0x02, 0x34, 0x52, 0xd2, 0xd0, 0x25, 0x09, - 0x52, 0x1f, 0xb2, 0x9c, 0xf5, 0xb0, 0x58, 0xf1, 0xda, 0x9b, 0x1d, 0x6f, 0xca, 0x0a, 0xa1, 0x4a, - 0x54, 0x95, 0x8a, 0x7a, 0x68, 0x25, 0x4e, 0x3d, 0xb5, 0x57, 0x7a, 0xe8, 0xb5, 0x97, 0x5e, 0xaa, - 0x5e, 0x90, 0xaa, 0x4a, 0x48, 0xbd, 0x54, 0x3d, 0x40, 0x05, 0x3d, 0xb6, 0x97, 0x1e, 0xdb, 0x4b, - 0xe5, 0x99, 0xf1, 0x63, 0xb3, 0x7e, 0x6c, 0x02, 0x85, 0x9e, 0xb2, 0xf6, 0xf7, 0xfc, 0x7d, 0xaf, - 0x99, 0xcf, 0x81, 0x9c, 0x43, 0xcb, 0x0e, 0x35, 0xa9, 0x4a, 0x6b, 0x15, 0x52, 0xbd, 0x6e, 0xd5, - 0x4c, 0x43, 0x5d, 0xad, 0x91, 0x6a, 0x5d, 0xa9, 0x54, 0x1d, 0xd7, 0xc1, 0x58, 0xd0, 0x95, 0x90, - 0x2e, 0xed, 0x2e, 0x39, 0x25, 0x87, 0x91, 0x55, 0xef, 0x17, 0xe7, 0x94, 0x72, 0x45, 0xc6, 0xaa, - 0x2e, 0xeb, 0x94, 0xa8, 0x6b, 0xc7, 0x97, 0x89, 0xab, 0x1f, 0x57, 0x8b, 0x8e, 0x69, 0x0b, 0xfa, - 0xfe, 0x92, 0xe3, 0x94, 0x2c, 0xa2, 0xea, 0x15, 0x53, 0xd5, 0x6d, 0xdb, 0x71, 0x75, 0xd7, 0x74, - 0x6c, 0x2a, 0xa8, 0x03, 0x82, 0xca, 0x9e, 0x96, 0x6b, 0xd7, 0x55, 0xd7, 0x2c, 0x13, 0xea, 0xea, - 0xe5, 0x8a, 0xaf, 0x7e, 0x3d, 0x83, 0x51, 0xab, 0x32, 0x0d, 0x82, 0x3e, 0x18, 0x03, 0x24, 0xfc, - 0xe9, 0x5b, 0x89, 0x61, 0xaa, 0xe8, 0x55, 0xbd, 0xec, 0xbb, 0xb1, 0xd7, 0x67, 0xb0, 0x9c, 0xe2, - 0x4a, 0xad, 0xc2, 0xfe, 0x08, 0xd2, 0x58, 0x14, 0x1f, 0x0b, 0x51, 0x80, 0xb2, 0xa2, 0x97, 0x4c, - 0x3b, 0xea, 0xcc, 0x90, 0xe0, 0xa5, 0xae, 0xbe, 0x62, 0xda, 0xa5, 0x80, 0x51, 0x3c, 0x73, 0x2e, - 0x79, 0x37, 0xe0, 0xb7, 0x3c, 0x3d, 0x57, 0x98, 0x07, 0x05, 0xb2, 0x5a, 0x23, 0xd4, 0x95, 0xe7, - 0x61, 0x57, 0xc3, 0x5b, 0x5a, 0x71, 0x6c, 0x4a, 0xf0, 0x24, 0x74, 0x71, 0x4f, 0xfb, 0xd1, 0x41, - 0x34, 0xba, 0x7d, 0x5c, 0x52, 0x9a, 0x33, 0xa3, 0x70, 0x99, 0xa9, 0xce, 0x07, 0x8f, 0x06, 0xda, - 0x0a, 0x82, 0x5f, 0x1e, 0x85, 0x9e, 0x3c, 0xa5, 0xc4, 0x5d, 0xa8, 0x57, 0x88, 0x30, 0x82, 0x77, - 0xc3, 0x16, 0x83, 0xd8, 0x4e, 0x99, 0x29, 0xdb, 0x56, 0xe0, 0x0f, 0xf2, 0x3b, 0xd0, 0x1b, 0xe1, - 0x14, 0x86, 0x2f, 0x01, 0xe8, 0xde, 0x4b, 0xcd, 0xad, 0x57, 0x08, 0xe3, 0xdf, 0x31, 0x3e, 0x12, - 0x67, 0xfc, 0x6a, 0xf0, 0x33, 0x54, 0xb2, 0x4d, 0xf7, 0x7f, 0xca, 0x18, 0x7a, 0xf2, 0x96, 0xc5, - 0x48, 0x01, 0xd6, 0x25, 0xe8, 0x8d, 0xbc, 0x13, 0x06, 0xf3, 0xd0, 0xc5, 0xa4, 0x3c, 0xa4, 0x1d, - 0xa3, 0xdb, 0xc7, 0x07, 0x5b, 0x30, 0xe6, 0x43, 0xe6, 0x82, 0xb2, 0x02, 0xff, 0x63, 0xaf, 0xe7, - 0x6a, 0x96, 0x6b, 0x56, 0x2c, 0x93, 0x54, 0xd3, 0x81, 0x7f, 0x82, 0xa0, 0xaf, 0x49, 0x40, 0xb8, - 0x53, 0x01, 0xc9, 0xb3, 0xaf, 0x91, 0xd5, 0x9a, 0xb9, 0xa6, 0x5b, 0xc4, 0x76, 0xb5, 0x72, 0xc0, - 0x25, 0x92, 0x31, 0x1e, 0xe7, 0xe2, 0x3c, 0x2d, 0x3b, 0x17, 0x03, 0xa1, 0xa8, 0xe6, 0xa2, 0x53, - 0x35, 0x0a, 0xfd, 0x4e, 0x02, 0x5d, 0xbe, 0x8b, 0xe0, 0x50, 0x88, 0x6f, 0xc6, 0x76, 0x49, 0xb5, - 0x4c, 0x0c, 0x53, 0xaf, 0xd6, 0xf3, 0xc5, 0xa2, 0x53, 0xb3, 0xdd, 0x19, 0xfb, 0xba, 0x13, 0x8f, - 0x04, 0xef, 0x85, 0xad, 0x6b, 0xba, 0xa5, 0xe9, 0x86, 0x51, 0xed, 0x6f, 0x67, 0x84, 0xee, 0x35, - 0xdd, 0xca, 0x1b, 0x46, 0xd5, 0x23, 0x95, 0xf4, 0x5a, 0x89, 0x68, 0xa6, 0xd1, 0xdf, 0x71, 0x10, - 0x8d, 0x76, 0x16, 0xba, 0xd9, 0xf3, 0x8c, 0x81, 0xfb, 0xa1, 0xdb, 0x93, 0x20, 0x94, 0xf6, 0x77, - 0x72, 0x21, 0xf1, 0x28, 0xdf, 0x80, 0x5c, 0xde, 0xb2, 0x62, 0x7c, 0xf0, 0x73, 0xe8, 0xd5, 0x47, - 0x58, 0xff, 0x22, 0x1e, 0xc3, 0x0a, 0x6f, 0x00, 0xc5, 0x6b, 0x16, 0x85, 0xcf, 0x13, 0xd1, 0x03, - 0xca, 0x15, 0xbd, 0xe4, 0x97, 0x61, 0x21, 0x22, 0x29, 0x7f, 0x8f, 0x60, 0x20, 0xd1, 0x94, 0xc8, - 0xc5, 0x35, 0xd8, 0xaa, 0x8b, 0x77, 0xa2, 0x38, 0x26, 0xd2, 0x8b, 0x23, 0x21, 0x78, 0xa2, 0x5c, - 0x02, 0x65, 0xf8, 0x72, 0x03, 0x88, 0x76, 0x06, 0x62, 0x24, 0x13, 0x04, 0xf7, 0xaa, 0x01, 0xc5, - 0x39, 0x18, 0xbc, 0xe0, 0xd8, 0x36, 0x29, 0xba, 0x24, 0xce, 0xb8, 0x1f, 0xb4, 0x3e, 0xe8, 0xf6, - 0x46, 0x8b, 0x97, 0x0a, 0xc4, 0x52, 0xd1, 0xe5, 0x3d, 0xce, 0x18, 0xf2, 0xfb, 0x30, 0x94, 0x2e, - 0x2f, 0x22, 0x31, 0x0f, 0xdd, 0xc2, 0x79, 0x11, 0xf2, 0xcd, 0x05, 0xa2, 0xe0, 0x6b, 0x91, 0x07, - 0xe1, 0xd0, 0x82, 0xe3, 0xea, 0x56, 0x28, 0x32, 0x4d, 0x2c, 0x52, 0xe2, 0x43, 0xda, 0xef, 0xd7, - 0xfb, 0x08, 0xe4, 0x34, 0x2e, 0xe1, 0xdc, 0x1d, 0x04, 0xbd, 0xae, 0xc7, 0xa6, 0x19, 0x21, 0x95, - 0xd7, 0xe9, 0xd4, 0xa2, 0x17, 0xf9, 0x5f, 0x1e, 0x0d, 0x0c, 0x97, 0x4c, 0xf7, 0x46, 0x6d, 0x59, - 0x29, 0x3a, 0x65, 0x55, 0x4c, 0x4b, 0xfe, 0xe7, 0x18, 0x35, 0x56, 0x54, 0x6f, 0xd6, 0x50, 0x65, - 0xc6, 0x76, 0xff, 0x7c, 0x34, 0x30, 0x58, 0xd7, 0xcb, 0xd6, 0x69, 0x99, 0x2b, 0x0c, 0xc1, 0x45, - 0x75, 0xcb, 0x85, 0x1e, 0x46, 0x8e, 0x38, 0x23, 0xdf, 0x6b, 0xe8, 0xa2, 0x90, 0x92, 0x2f, 0x47, - 0x13, 0x71, 0x04, 0x7a, 0x85, 0x1e, 0xa7, 0xaa, 0xf9, 0x3d, 0xc0, 0x3b, 0xaa, 0x27, 0x20, 0xe4, - 0xf9, 0x7b, 0x8f, 0x79, 0x4d, 0xb7, 0x4c, 0xa3, 0x81, 0x99, 0x77, 0x59, 0x4f, 0x40, 0xf0, 0x99, - 0x83, 0xfe, 0xec, 0x88, 0x4e, 0x9a, 0xbb, 0x08, 0xe4, 0x34, 0xaf, 0x44, 0x04, 0x8b, 0xd0, 0xa5, - 0x97, 0x45, 0x76, 0xbd, 0x32, 0xdf, 0xdb, 0x50, 0x8b, 0x7e, 0x15, 0x5e, 0x70, 0x4c, 0x7b, 0xea, - 0x15, 0x2f, 0xa0, 0x5f, 0x3d, 0x1e, 0x18, 0x6d, 0x21, 0xa0, 0x9e, 0x00, 0x2d, 0x08, 0xd5, 0xf2, - 0x12, 0x8c, 0xc4, 0xe6, 0x71, 0xaa, 0x3e, 0xed, 0x23, 0xdf, 0x4c, 0x98, 0xe4, 0x6f, 0x3a, 0x60, - 0x34, 0x5b, 0xb1, 0x40, 0x7a, 0x13, 0x0e, 0xc4, 0xe6, 0x54, 0xab, 0xb2, 0x31, 0xe9, 0xf7, 0xb9, - 0x92, 0x5e, 0xde, 0xa1, 0x11, 0x3e, 0x5d, 0x45, 0x83, 0xef, 0xa3, 0x89, 0x1c, 0x14, 0x7f, 0x00, - 0x7b, 0x1a, 0x8a, 0x94, 0x18, 0x9a, 0x77, 0x5d, 0xf1, 0x32, 0xfa, 0xdc, 0x43, 0xbe, 0x2b, 0x5a, - 0x9e, 0xc4, 0x60, 0x2f, 0xf1, 0xa7, 0x08, 0x72, 0xdc, 0x83, 0xc8, 0xd9, 0xe2, 0x5d, 0x11, 0x88, - 0xa1, 0x89, 0xec, 0x77, 0xb0, 0xde, 0x4e, 0x71, 0x45, 0x15, 0xae, 0x8c, 0xb4, 0xe8, 0x4a, 0x61, - 0x1f, 0xb3, 0x18, 0x9e, 0x3b, 0x57, 0x99, 0x3d, 0x5e, 0x7e, 0xb2, 0x0d, 0xff, 0x0f, 0x63, 0xba, - 0x68, 0x1b, 0xcf, 0xad, 0x26, 0xc2, 0x6e, 0x68, 0x8f, 0x76, 0xc3, 0x5f, 0xed, 0x30, 0xd6, 0x8a, - 0xc1, 0x97, 0x5e, 0x2b, 0x1f, 0x22, 0xe8, 0xe3, 0xa9, 0xaa, 0xd9, 0x2f, 0xa0, 0x5c, 0x78, 0x61, - 0x2e, 0x86, 0xa6, 0x78, 0xc1, 0xcc, 0xc2, 0x4e, 0x5a, 0xb7, 0xdd, 0x1b, 0xc4, 0x35, 0x8b, 0x9a, - 0x77, 0x60, 0xd0, 0xfe, 0x0e, 0x66, 0xfc, 0x40, 0x80, 0x98, 0xdf, 0x5b, 0x95, 0xab, 0x3e, 0xdb, - 0xac, 0x53, 0x5c, 0x11, 0x00, 0x77, 0xd0, 0xe8, 0x4b, 0x2a, 0xaf, 0xc2, 0xd1, 0x84, 0x2e, 0x5d, - 0xf2, 0x67, 0xd9, 0xb4, 0x97, 0xa5, 0x48, 0xbe, 0x9b, 0xa7, 0x1f, 0xca, 0x9a, 0x7e, 0x0d, 0xf9, - 0xbe, 0x8f, 0xe0, 0x58, 0x8b, 0x36, 0x5f, 0x76, 0xca, 0xe5, 0xdb, 0x30, 0x79, 0x91, 0xba, 0x66, - 0x59, 0x77, 0x49, 0x93, 0x22, 0xbf, 0x61, 0xfe, 0xc5, 0x50, 0x7d, 0x8b, 0xe0, 0xb5, 0x4d, 0xd8, - 0x17, 0x61, 0x4b, 0x9c, 0x6d, 0xe8, 0xc5, 0xcc, 0x36, 0x79, 0x11, 0x86, 0xd9, 0x16, 0xb3, 0xd0, - 0x78, 0x2c, 0x3f, 0xeb, 0xd1, 0xf2, 0x79, 0x27, 0x8c, 0x64, 0xea, 0x7d, 0xe9, 0xd3, 0x42, 0x87, - 0x5d, 0x0d, 0xe6, 0xb8, 0x43, 0x62, 0x50, 0x8c, 0xf9, 0xb1, 0xf7, 0x97, 0x41, 0x3f, 0xfc, 0x51, - 0x3d, 0x5c, 0x42, 0xd8, 0xc2, 0x46, 0x13, 0x25, 0x39, 0xc1, 0x1d, 0xff, 0x9d, 0xc3, 0xab, 0xf3, - 0x85, 0x1e, 0x5e, 0xe3, 0x5f, 0xec, 0x81, 0x2d, 0xac, 0x36, 0xf0, 0x47, 0x08, 0xba, 0xf8, 0x2a, - 0x8c, 0x87, 0xe3, 0xb2, 0xdb, 0xbc, 0x75, 0x4b, 0x23, 0x99, 0x7c, 0x3c, 0xf0, 0xf2, 0xd8, 0x9d, - 0x9f, 0x7e, 0xbb, 0xd7, 0x3e, 0x84, 0x65, 0x35, 0xe6, 0x5b, 0x42, 0xf8, 0x41, 0x80, 0x19, 0xff, - 0x18, 0xc1, 0xb6, 0x60, 0x17, 0xc6, 0x43, 0x71, 0x26, 0xd6, 0x6f, 0xe6, 0xd2, 0xe1, 0x0c, 0x2e, - 0xe1, 0x86, 0xc2, 0xdc, 0x18, 0xc5, 0xc3, 0x69, 0x6e, 0x84, 0x7b, 0x3b, 0x77, 0xc5, 0x5f, 0xb5, - 0x13, 0x5c, 0x59, 0xb7, 0x9d, 0x27, 0xb8, 0xb2, 0x7e, 0x5f, 0x6f, 0xd1, 0x15, 0xcb, 0xd2, 0xf8, - 0x72, 0x8e, 0xbf, 0x44, 0xb0, 0x73, 0xdd, 0xb2, 0x8d, 0xc7, 0x12, 0x51, 0x37, 0xad, 0xf0, 0xd2, - 0x91, 0x96, 0x78, 0x85, 0x73, 0xaf, 0x32, 0xe7, 0x14, 0x7c, 0x34, 0x3b, 0x4e, 0xe1, 0x56, 0x8f, - 0xbf, 0x43, 0xd0, 0x97, 0xb0, 0x8b, 0xe2, 0xf1, 0x84, 0xa8, 0xa4, 0xec, 0xc8, 0xd2, 0x89, 0x0d, - 0xc9, 0x08, 0xd7, 0xcf, 0x32, 0xd7, 0x4f, 0xe1, 0x89, 0xac, 0xb8, 0x9a, 0x11, 0x2d, 0x5a, 0xb0, - 0xd2, 0x3e, 0x46, 0xb0, 0x3f, 0x6d, 0x95, 0xc4, 0xa7, 0xe2, 0x9c, 0x6a, 0x61, 0x79, 0x95, 0x26, - 0x37, 0x2e, 0x28, 0x20, 0xcd, 0x32, 0x48, 0x97, 0xf0, 0x74, 0x1a, 0xa4, 0xa2, 0xaf, 0x29, 0x16, - 0x98, 0x7a, 0x4b, 0x2c, 0xce, 0xb7, 0xf1, 0x0f, 0x08, 0xa4, 0xe4, 0x6d, 0x14, 0xc7, 0x6e, 0xc4, - 0x99, 0x3b, 0xae, 0x74, 0x72, 0xa3, 0x62, 0x02, 0xdb, 0x39, 0x86, 0x6d, 0x12, 0x9f, 0xcc, 0x4a, - 0x57, 0xfc, 0x0a, 0x8b, 0x7f, 0x44, 0x20, 0x25, 0x6f, 0x86, 0x78, 0xa2, 0xd5, 0x63, 0xaa, 0x61, - 0xbf, 0x8d, 0x47, 0x93, 0xbd, 0x80, 0xca, 0xe7, 0x19, 0x9a, 0xd3, 0x78, 0x32, 0x0d, 0x4d, 0xfc, - 0xf1, 0xca, 0xa7, 0x3f, 0xfe, 0x03, 0xc1, 0xc1, 0xac, 0x2d, 0x10, 0x9f, 0x69, 0xd5, 0xbd, 0x98, - 0x05, 0x44, 0x7a, 0x7d, 0x73, 0xc2, 0x02, 0xe1, 0x9b, 0x0c, 0xe1, 0x1b, 0xf8, 0xd2, 0x86, 0x11, - 0x52, 0xf5, 0x56, 0xd3, 0x8d, 0xe5, 0x36, 0xbe, 0xd3, 0x1e, 0xdd, 0xec, 0x93, 0x76, 0x19, 0x7c, - 0x36, 0xdd, 0xe9, 0x8c, 0xa5, 0x4b, 0x3a, 0xb7, 0x59, 0x71, 0x81, 0xfa, 0x3d, 0x86, 0xfa, 0x1a, - 0x5e, 0x6c, 0x11, 0x75, 0x2d, 0xaa, 0x50, 0x5b, 0xae, 0x6b, 0x01, 0xf2, 0xd8, 0x20, 0xfc, 0x8d, - 0xe0, 0x70, 0x4b, 0x17, 0x7c, 0x7c, 0x7e, 0x03, 0xc9, 0x8b, 0xbd, 0x64, 0x4b, 0xf9, 0x67, 0xd0, - 0x20, 0xa2, 0x31, 0xc7, 0xa2, 0x71, 0x19, 0x5f, 0xdc, 0x78, 0x0d, 0x78, 0xb1, 0x08, 0xef, 0xf8, - 0xfc, 0xe3, 0xeb, 0xd7, 0xed, 0x70, 0x7c, 0xc3, 0x77, 0x76, 0x3c, 0x1b, 0x87, 0x63, 0xb3, 0xab, - 0x87, 0x34, 0xf7, 0x9c, 0xb4, 0x89, 0x08, 0xbd, 0xcb, 0x22, 0xb4, 0x84, 0x17, 0xd2, 0x22, 0x44, - 0x84, 0x7a, 0x2d, 0x6d, 0x20, 0xc4, 0x05, 0xec, 0x77, 0x7f, 0x82, 0xc7, 0xde, 0xe4, 0xf1, 0xe9, - 0xc4, 0x4b, 0x59, 0xe6, 0x5a, 0x21, 0x9d, 0xd9, 0x94, 0xac, 0x40, 0xbd, 0xc8, 0x50, 0xcf, 0xe3, - 0xb9, 0x34, 0xd4, 0xeb, 0xbf, 0x70, 0x66, 0x76, 0xc7, 0xd4, 0xfc, 0x83, 0x27, 0x39, 0xf4, 0xf0, - 0x49, 0x0e, 0xfd, 0xfa, 0x24, 0x87, 0x3e, 0x7b, 0x9a, 0x6b, 0x7b, 0xf8, 0x34, 0xd7, 0xf6, 0xf3, - 0xd3, 0x5c, 0xdb, 0xdb, 0x13, 0x91, 0x1b, 0xb0, 0x30, 0x79, 0xcc, 0xd2, 0x97, 0x69, 0x60, 0x7f, - 0xed, 0x94, 0x7a, 0x33, 0xea, 0x04, 0xbb, 0x14, 0x2f, 0x77, 0xb1, 0x7f, 0x24, 0x9d, 0xf8, 0x27, - 0x00, 0x00, 0xff, 0xff, 0x6f, 0xaa, 0xd8, 0x36, 0xc6, 0x1b, 0x00, 0x00, + // 1663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4b, 0x6c, 0xd4, 0x46, + 0x1f, 0xcf, 0x24, 0x21, 0x81, 0x3f, 0x12, 0x24, 0x03, 0x7c, 0x09, 0x06, 0x36, 0xe0, 0x84, 0x24, + 0x5f, 0x00, 0x9b, 0x84, 0x0f, 0xc8, 0x07, 0x05, 0xb1, 0x21, 0x40, 0x23, 0x25, 0x0d, 0x5d, 0x92, + 0x20, 0xf5, 0x21, 0xcb, 0x59, 0x0f, 0x8b, 0x15, 0xaf, 0xbd, 0xd9, 0xf1, 0xa6, 0xac, 0x10, 0xaa, + 0x44, 0x55, 0xa9, 0xa8, 0x87, 0x56, 0xe2, 0xd4, 0x53, 0x7b, 0xa5, 0x87, 0x5e, 0x7b, 0xe9, 0xa5, + 0xea, 0x05, 0xa9, 0xaa, 0x84, 0xd4, 0x4b, 0xd5, 0x03, 0x54, 0xd0, 0x63, 0x7b, 0xe9, 0xb1, 0xbd, + 0x54, 0x9e, 0x19, 0x3f, 0x36, 0xeb, 0xc7, 0x26, 0x50, 0xe8, 0x29, 0x6b, 0xff, 0x9f, 0xbf, 0xff, + 0x6b, 0xe6, 0xef, 0x40, 0xce, 0xa1, 0x65, 0x87, 0x9a, 0x54, 0xa5, 0xb5, 0x0a, 0xa9, 0xde, 0xb0, + 0x6a, 0xa6, 0xa1, 0xae, 0xd6, 0x48, 0xb5, 0xae, 0x54, 0xaa, 0x8e, 0xeb, 0x60, 0x2c, 0xe8, 0x4a, + 0x48, 0x97, 0x76, 0x97, 0x9c, 0x92, 0xc3, 0xc8, 0xaa, 0xf7, 0x8b, 0x73, 0x4a, 0xb9, 0x22, 0x63, + 0x55, 0x97, 0x75, 0x4a, 0xd4, 0xb5, 0xf1, 0x65, 0xe2, 0xea, 0xe3, 0x6a, 0xd1, 0x31, 0x6d, 0x41, + 0xdf, 0x5f, 0x72, 0x9c, 0x92, 0x45, 0x54, 0xbd, 0x62, 0xaa, 0xba, 0x6d, 0x3b, 0xae, 0xee, 0x9a, + 0x8e, 0x4d, 0x05, 0x75, 0x40, 0x50, 0xd9, 0xd3, 0x72, 0xed, 0x86, 0xea, 0x9a, 0x65, 0x42, 0x5d, + 0xbd, 0x5c, 0xf1, 0xd5, 0xaf, 0x67, 0x30, 0x6a, 0x55, 0xa6, 0x41, 0xd0, 0x07, 0x63, 0x80, 0x84, + 0x3f, 0x7d, 0x2b, 0x31, 0x4c, 0x15, 0xbd, 0xaa, 0x97, 0x7d, 0x37, 0xf6, 0xfa, 0x0c, 0x96, 0x53, + 0x5c, 0xa9, 0x55, 0xd8, 0x1f, 0x41, 0x1a, 0x8b, 0xe2, 0x63, 0x21, 0x0a, 0x50, 0x56, 0xf4, 0x92, + 0x69, 0x47, 0x9d, 0x19, 0x12, 0xbc, 0xd4, 0xd5, 0x57, 0x4c, 0xbb, 0x14, 0x30, 0x8a, 0x67, 0xce, + 0x25, 0xef, 0x06, 0xfc, 0xa6, 0xa7, 0xe7, 0x2a, 0xf3, 0xa0, 0x40, 0x56, 0x6b, 0x84, 0xba, 0xf2, + 0x3c, 0xec, 0x6a, 0x78, 0x4b, 0x2b, 0x8e, 0x4d, 0x09, 0x9e, 0x84, 0x2e, 0xee, 0x69, 0x3f, 0x3a, + 0x88, 0x46, 0xb7, 0x4f, 0x48, 0x4a, 0x73, 0x66, 0x14, 0x2e, 0x33, 0xd5, 0xf9, 0xf0, 0xf1, 0x40, + 0x5b, 0x41, 0xf0, 0xcb, 0xa3, 0xd0, 0x93, 0xa7, 0x94, 0xb8, 0x0b, 0xf5, 0x0a, 0x11, 0x46, 0xf0, + 0x6e, 0xd8, 0x62, 0x10, 0xdb, 0x29, 0x33, 0x65, 0xdb, 0x0a, 0xfc, 0x41, 0x7e, 0x1b, 0x7a, 0x23, + 0x9c, 0xc2, 0xf0, 0x65, 0x00, 0xdd, 0x7b, 0xa9, 0xb9, 0xf5, 0x0a, 0x61, 0xfc, 0x3b, 0x26, 0x46, + 0xe2, 0x8c, 0x5f, 0x0b, 0x7e, 0x86, 0x4a, 0xb6, 0xe9, 0xfe, 0x4f, 0x19, 0x43, 0x4f, 0xde, 0xb2, + 0x18, 0x29, 0xc0, 0xba, 0x04, 0xbd, 0x91, 0x77, 0xc2, 0x60, 0x1e, 0xba, 0x98, 0x94, 0x87, 0xb4, + 0x63, 0x74, 0xfb, 0xc4, 0x60, 0x0b, 0xc6, 0x7c, 0xc8, 0x5c, 0x50, 0x56, 0xe0, 0x3f, 0xec, 0xf5, + 0x5c, 0xcd, 0x72, 0xcd, 0x8a, 0x65, 0x92, 0x6a, 0x3a, 0xf0, 0x8f, 0x11, 0xf4, 0x35, 0x09, 0x08, + 0x77, 0x2a, 0x20, 0x79, 0xf6, 0x35, 0xb2, 0x5a, 0x33, 0xd7, 0x74, 0x8b, 0xd8, 0xae, 0x56, 0x0e, + 0xb8, 0x44, 0x32, 0x26, 0xe2, 0x5c, 0x9c, 0xa7, 0x65, 0xe7, 0x52, 0x20, 0x14, 0xd5, 0x5c, 0x74, + 0xaa, 0x46, 0xa1, 0xdf, 0x49, 0xa0, 0xcb, 0xf7, 0x10, 0x1c, 0x0a, 0xf1, 0xcd, 0xd8, 0x2e, 0xa9, + 0x96, 0x89, 0x61, 0xea, 0xd5, 0x7a, 0xbe, 0x58, 0x74, 0x6a, 0xb6, 0x3b, 0x63, 0xdf, 0x70, 0xe2, + 0x91, 0xe0, 0xbd, 0xb0, 0x75, 0x4d, 0xb7, 0x34, 0xdd, 0x30, 0xaa, 0xfd, 0xed, 0x8c, 0xd0, 0xbd, + 0xa6, 0x5b, 0x79, 0xc3, 0xa8, 0x7a, 0xa4, 0x92, 0x5e, 0x2b, 0x11, 0xcd, 0x34, 0xfa, 0x3b, 0x0e, + 0xa2, 0xd1, 0xce, 0x42, 0x37, 0x7b, 0x9e, 0x31, 0x70, 0x3f, 0x74, 0x7b, 0x12, 0x84, 0xd2, 0xfe, + 0x4e, 0x2e, 0x24, 0x1e, 0xe5, 0x9b, 0x90, 0xcb, 0x5b, 0x56, 0x8c, 0x0f, 0x7e, 0x0e, 0xbd, 0xfa, + 0x08, 0xeb, 0x5f, 0xc4, 0x63, 0x58, 0xe1, 0x0d, 0xa0, 0x78, 0xcd, 0xa2, 0xf0, 0x79, 0x22, 0x7a, + 0x40, 0xb9, 0xaa, 0x97, 0xfc, 0x32, 0x2c, 0x44, 0x24, 0xe5, 0xef, 0x10, 0x0c, 0x24, 0x9a, 0x12, + 0xb9, 0xb8, 0x0e, 0x5b, 0x75, 0xf1, 0x4e, 0x14, 0xc7, 0xc9, 0xf4, 0xe2, 0x48, 0x08, 0x9e, 0x28, + 0x97, 0x40, 0x19, 0xbe, 0xd2, 0x00, 0xa2, 0x9d, 0x81, 0x18, 0xc9, 0x04, 0xc1, 0xbd, 0x6a, 0x40, + 0x71, 0x1e, 0x06, 0x2f, 0x3a, 0xb6, 0x4d, 0x8a, 0x2e, 0x89, 0x33, 0xee, 0x07, 0xad, 0x0f, 0xba, + 0xbd, 0xd1, 0xe2, 0xa5, 0x02, 0xb1, 0x54, 0x74, 0x79, 0x8f, 0x33, 0x86, 0xfc, 0x1e, 0x0c, 0xa5, + 0xcb, 0x8b, 0x48, 0xcc, 0x43, 0xb7, 0x70, 0x5e, 0x84, 0x7c, 0x73, 0x81, 0x28, 0xf8, 0x5a, 0xe4, + 0x41, 0x38, 0xb4, 0xe0, 0xb8, 0xba, 0x15, 0x8a, 0x4c, 0x13, 0x8b, 0x94, 0xf8, 0x90, 0xf6, 0xfb, + 0xf5, 0x01, 0x02, 0x39, 0x8d, 0x4b, 0x38, 0x77, 0x17, 0x41, 0xaf, 0xeb, 0xb1, 0x69, 0x46, 0x48, + 0xe5, 0x75, 0x3a, 0xb5, 0xe8, 0x45, 0xfe, 0xe7, 0xc7, 0x03, 0xc3, 0x25, 0xd3, 0xbd, 0x59, 0x5b, + 0x56, 0x8a, 0x4e, 0x59, 0x15, 0xd3, 0x92, 0xff, 0x39, 0x46, 0x8d, 0x15, 0xd5, 0x9b, 0x35, 0x54, + 0x99, 0xb1, 0xdd, 0x3f, 0x1e, 0x0f, 0x0c, 0xd6, 0xf5, 0xb2, 0x75, 0x46, 0xe6, 0x0a, 0x43, 0x70, + 0x51, 0xdd, 0x72, 0xa1, 0x87, 0x91, 0x23, 0xce, 0xc8, 0xf7, 0x1b, 0xba, 0x28, 0xa4, 0xe4, 0xcb, + 0xd1, 0x44, 0x1c, 0x81, 0x5e, 0xa1, 0xc7, 0xa9, 0x6a, 0x7e, 0x0f, 0xf0, 0x8e, 0xea, 0x09, 0x08, + 0x79, 0xfe, 0xde, 0x63, 0x5e, 0xd3, 0x2d, 0xd3, 0x68, 0x60, 0xe6, 0x5d, 0xd6, 0x13, 0x10, 0x7c, + 0xe6, 0xa0, 0x3f, 0x3b, 0xa2, 0x93, 0xe6, 0x1e, 0x02, 0x39, 0xcd, 0x2b, 0x11, 0xc1, 0x22, 0x74, + 0xe9, 0x65, 0x91, 0x5d, 0xaf, 0xcc, 0xf7, 0x36, 0xd4, 0xa2, 0x5f, 0x85, 0x17, 0x1d, 0xd3, 0x9e, + 0x3a, 0xee, 0x05, 0xf4, 0xcb, 0x27, 0x03, 0xa3, 0x2d, 0x04, 0xd4, 0x13, 0xa0, 0x05, 0xa1, 0x5a, + 0x5e, 0x82, 0x91, 0xd8, 0x3c, 0x4e, 0xd5, 0xa7, 0x7d, 0xe4, 0x9b, 0x09, 0x93, 0xfc, 0x75, 0x07, + 0x8c, 0x66, 0x2b, 0x16, 0x48, 0x6f, 0xc1, 0x81, 0xd8, 0x9c, 0x6a, 0x55, 0x36, 0x26, 0xfd, 0x3e, + 0x57, 0xd2, 0xcb, 0x3b, 0x34, 0xc2, 0xa7, 0xab, 0x68, 0xf0, 0x7d, 0x34, 0x91, 0x83, 0xe2, 0xf7, + 0x61, 0x4f, 0x43, 0x91, 0x12, 0x43, 0xf3, 0xae, 0x2b, 0x5e, 0x46, 0x5f, 0x78, 0xc8, 0x77, 0x45, + 0xcb, 0x93, 0x18, 0xec, 0x25, 0xfe, 0x04, 0x41, 0x8e, 0x7b, 0x10, 0x39, 0x5b, 0xbc, 0x2b, 0x02, + 0x31, 0x34, 0x91, 0xfd, 0x0e, 0xd6, 0xdb, 0x29, 0xae, 0xa8, 0xc2, 0x95, 0x91, 0x16, 0x5d, 0x29, + 0xec, 0x63, 0x16, 0xc3, 0x73, 0xe7, 0x1a, 0xb3, 0xc7, 0xcb, 0x4f, 0xb6, 0xe1, 0xbf, 0x61, 0x4c, + 0x17, 0x6d, 0xe3, 0x85, 0xd5, 0x44, 0xd8, 0x0d, 0xed, 0xd1, 0x6e, 0xf8, 0xb3, 0x1d, 0xc6, 0x5a, + 0x31, 0xf8, 0xca, 0x6b, 0xe5, 0x03, 0x04, 0x7d, 0x3c, 0x55, 0x35, 0xfb, 0x25, 0x94, 0x0b, 0x2f, + 0xcc, 0xc5, 0xd0, 0x14, 0x2f, 0x98, 0x59, 0xd8, 0x49, 0xeb, 0xb6, 0x7b, 0x93, 0xb8, 0x66, 0x51, + 0xf3, 0x0e, 0x0c, 0xda, 0xdf, 0xc1, 0x8c, 0x1f, 0x08, 0x10, 0xf3, 0x7b, 0xab, 0x72, 0xcd, 0x67, + 0x9b, 0x75, 0x8a, 0x2b, 0x02, 0xe0, 0x0e, 0x1a, 0x7d, 0x49, 0xe5, 0x55, 0x38, 0x9a, 0xd0, 0xa5, + 0x4b, 0xfe, 0x2c, 0x9b, 0xf6, 0xb2, 0x14, 0xc9, 0x77, 0xf3, 0xf4, 0x43, 0x59, 0xd3, 0xaf, 0x21, + 0xdf, 0x0f, 0x10, 0x1c, 0x6b, 0xd1, 0xe6, 0xab, 0x4e, 0xb9, 0x7c, 0x07, 0x26, 0x2f, 0x51, 0xd7, + 0x2c, 0xeb, 0x2e, 0x69, 0x52, 0xe4, 0x37, 0xcc, 0x3f, 0x18, 0xaa, 0x6f, 0x10, 0xfc, 0x7f, 0x13, + 0xf6, 0x45, 0xd8, 0x12, 0x67, 0x1b, 0x7a, 0x39, 0xb3, 0x4d, 0x5e, 0x84, 0x61, 0xb6, 0xc5, 0x2c, + 0x34, 0x1e, 0xcb, 0xcf, 0x7b, 0xb4, 0x7c, 0xd6, 0x09, 0x23, 0x99, 0x7a, 0x5f, 0xf9, 0xb4, 0xd0, + 0x61, 0x57, 0x83, 0x39, 0xee, 0x90, 0x18, 0x14, 0x63, 0x7e, 0xec, 0xfd, 0x65, 0xd0, 0x0f, 0x7f, + 0x54, 0x0f, 0x97, 0x10, 0xb6, 0xb0, 0xd1, 0x44, 0x49, 0x4e, 0x70, 0xc7, 0xbf, 0xe7, 0xf0, 0xea, + 0x7c, 0xa9, 0x87, 0xd7, 0xc4, 0xe7, 0x7b, 0x60, 0x0b, 0xab, 0x0d, 0xfc, 0x21, 0x82, 0x2e, 0xbe, + 0x0a, 0xe3, 0xe1, 0xb8, 0xec, 0x36, 0x6f, 0xdd, 0xd2, 0x48, 0x26, 0x1f, 0x0f, 0xbc, 0x3c, 0x76, + 0xf7, 0xc7, 0x5f, 0xef, 0xb7, 0x0f, 0x61, 0x59, 0x8d, 0xf9, 0x96, 0x10, 0x7e, 0x10, 0x60, 0xc6, + 0x3f, 0x42, 0xb0, 0x2d, 0xd8, 0x85, 0xf1, 0x50, 0x9c, 0x89, 0xf5, 0x9b, 0xb9, 0x74, 0x38, 0x83, + 0x4b, 0xb8, 0xa1, 0x30, 0x37, 0x46, 0xf1, 0x70, 0x9a, 0x1b, 0xe1, 0xde, 0xce, 0x5d, 0xf1, 0x57, + 0xed, 0x04, 0x57, 0xd6, 0x6d, 0xe7, 0x09, 0xae, 0xac, 0xdf, 0xd7, 0x5b, 0x74, 0xc5, 0xb2, 0x34, + 0xbe, 0x9c, 0xe3, 0x2f, 0x10, 0xec, 0x5c, 0xb7, 0x6c, 0xe3, 0xb1, 0x44, 0xd4, 0x4d, 0x2b, 0xbc, + 0x74, 0xa4, 0x25, 0x5e, 0xe1, 0xdc, 0xff, 0x98, 0x73, 0x0a, 0x3e, 0x9a, 0x1d, 0xa7, 0x70, 0xab, + 0xc7, 0xdf, 0x22, 0xe8, 0x4b, 0xd8, 0x45, 0xf1, 0x44, 0x42, 0x54, 0x52, 0x76, 0x64, 0xe9, 0xc4, + 0x86, 0x64, 0x84, 0xeb, 0xe7, 0x98, 0xeb, 0xa7, 0xf1, 0xc9, 0xac, 0xb8, 0x9a, 0x11, 0x2d, 0x5a, + 0xb0, 0xd2, 0x3e, 0x41, 0xb0, 0x3f, 0x6d, 0x95, 0xc4, 0xa7, 0xe3, 0x9c, 0x6a, 0x61, 0x79, 0x95, + 0x26, 0x37, 0x2e, 0x28, 0x20, 0xcd, 0x32, 0x48, 0x97, 0xf1, 0x74, 0x1a, 0xa4, 0xa2, 0xaf, 0x29, + 0x16, 0x98, 0x7a, 0x5b, 0x2c, 0xce, 0x77, 0xf0, 0xf7, 0x08, 0xa4, 0xe4, 0x6d, 0x14, 0xc7, 0x6e, + 0xc4, 0x99, 0x3b, 0xae, 0x74, 0x6a, 0xa3, 0x62, 0x02, 0xdb, 0x79, 0x86, 0x6d, 0x12, 0x9f, 0xca, + 0x4a, 0x57, 0xfc, 0x0a, 0x8b, 0x7f, 0x40, 0x20, 0x25, 0x6f, 0x86, 0xf8, 0x64, 0xab, 0xc7, 0x54, + 0xc3, 0x7e, 0x1b, 0x8f, 0x26, 0x7b, 0x01, 0x95, 0x2f, 0x30, 0x34, 0x67, 0xf0, 0x64, 0x1a, 0x9a, + 0xf8, 0xe3, 0x95, 0x4f, 0x7f, 0xfc, 0x3b, 0x82, 0x83, 0x59, 0x5b, 0x20, 0x3e, 0xdb, 0xaa, 0x7b, + 0x31, 0x0b, 0x88, 0xf4, 0xda, 0xe6, 0x84, 0x05, 0xc2, 0x37, 0x18, 0xc2, 0xd7, 0xf1, 0xe5, 0x0d, + 0x23, 0xa4, 0xea, 0xed, 0xa6, 0x1b, 0xcb, 0x1d, 0x7c, 0xb7, 0x3d, 0xba, 0xd9, 0x27, 0xed, 0x32, + 0xf8, 0x5c, 0xba, 0xd3, 0x19, 0x4b, 0x97, 0x74, 0x7e, 0xb3, 0xe2, 0x02, 0xf5, 0xbb, 0x0c, 0xf5, + 0x75, 0xbc, 0xd8, 0x22, 0xea, 0x5a, 0x54, 0xa1, 0xb6, 0x5c, 0xd7, 0x02, 0xe4, 0xb1, 0x41, 0xf8, + 0x0b, 0xc1, 0xe1, 0x96, 0x2e, 0xf8, 0xf8, 0xc2, 0x06, 0x92, 0x17, 0x7b, 0xc9, 0x96, 0xf2, 0xcf, + 0xa1, 0x41, 0x44, 0x63, 0x8e, 0x45, 0xe3, 0x0a, 0xbe, 0xb4, 0xf1, 0x1a, 0xf0, 0x62, 0x11, 0xde, + 0xf1, 0xf9, 0xc7, 0xd7, 0xaf, 0xda, 0x61, 0x7c, 0xc3, 0x77, 0x76, 0x3c, 0x1b, 0x87, 0x63, 0xb3, + 0xab, 0x87, 0x34, 0xf7, 0x82, 0xb4, 0x89, 0x08, 0xbd, 0xc3, 0x22, 0xb4, 0x84, 0x17, 0xd2, 0x22, + 0x44, 0x84, 0x7a, 0x2d, 0x6d, 0x20, 0xc4, 0x05, 0xec, 0x37, 0x7f, 0x82, 0xc7, 0xde, 0xe4, 0xf1, + 0x99, 0xc4, 0x4b, 0x59, 0xe6, 0x5a, 0x21, 0x9d, 0xdd, 0x94, 0xac, 0x40, 0xbd, 0xc8, 0x50, 0xcf, + 0xe3, 0xb9, 0x34, 0xd4, 0xeb, 0xbf, 0x70, 0x66, 0x76, 0xc7, 0xd4, 0xd5, 0x87, 0x4f, 0x73, 0xe8, + 0xd1, 0xd3, 0x1c, 0xfa, 0xe5, 0x69, 0x0e, 0x7d, 0xfa, 0x2c, 0xd7, 0xf6, 0xe8, 0x59, 0xae, 0xed, + 0xa7, 0x67, 0xb9, 0xb6, 0xb7, 0x4e, 0x45, 0x6e, 0xc0, 0xc2, 0xe4, 0x31, 0x4b, 0x5f, 0xa6, 0x81, + 0xfd, 0xb5, 0xf1, 0xe3, 0xea, 0xad, 0xa8, 0x17, 0xec, 0x56, 0xbc, 0xdc, 0xc5, 0xfe, 0x93, 0x74, + 0xe2, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x59, 0xf2, 0xe9, 0xc7, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/superfluid/types/superfluid.pb.go b/x/superfluid/types/superfluid.pb.go index 3e2afc2e9cf..9a0cba469ac 100644 --- a/x/superfluid/types/superfluid.pb.go +++ b/x/superfluid/types/superfluid.pb.go @@ -404,51 +404,51 @@ func init() { } var fileDescriptor_79d3c29d82dbb734 = []byte{ - // 694 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0xd4, 0x40, - 0x14, 0xdf, 0xb2, 0x2b, 0xb0, 0x83, 0xd1, 0xa5, 0x10, 0x5c, 0x36, 0xa1, 0x8b, 0x25, 0x91, 0x0d, - 0x84, 0x36, 0x60, 0x8c, 0x09, 0xb7, 0x05, 0x34, 0x21, 0x41, 0x20, 0x45, 0x63, 0xc2, 0x65, 0x33, - 0xed, 0x0c, 0xdd, 0xc9, 0x4e, 0x3b, 0xa5, 0x33, 0xad, 0xee, 0xcd, 0x23, 0x47, 0x3f, 0x02, 0x89, - 0x37, 0x3f, 0x84, 0x67, 0x8e, 0x1c, 0x8d, 0x07, 0x34, 0x70, 0xf1, 0xcc, 0x27, 0x30, 0x9d, 0x76, - 0xbb, 0x15, 0x30, 0xea, 0xa9, 0x33, 0xef, 0xf7, 0xde, 0xef, 0xfd, 0xde, 0x9f, 0x0e, 0x58, 0x60, - 0xdc, 0x63, 0x9c, 0x70, 0x93, 0x47, 0x01, 0x0e, 0x8f, 0x68, 0x44, 0x50, 0xe1, 0x68, 0x04, 0x21, - 0x13, 0x4c, 0x55, 0x33, 0x27, 0x63, 0x88, 0x34, 0xa6, 0x5d, 0xe6, 0x32, 0x09, 0x9b, 0xc9, 0x29, - 0xf5, 0x6c, 0x68, 0x2e, 0x63, 0x2e, 0xc5, 0xa6, 0xbc, 0xd9, 0xd1, 0x91, 0x89, 0xa2, 0x10, 0x0a, - 0xc2, 0xfc, 0x0c, 0x6f, 0xde, 0xc4, 0x05, 0xf1, 0x30, 0x17, 0xd0, 0x0b, 0x06, 0x04, 0x8e, 0xcc, - 0x65, 0xda, 0x90, 0x63, 0x33, 0x5e, 0xb5, 0xb1, 0x80, 0xab, 0xa6, 0xc3, 0x48, 0x46, 0xa0, 0xf7, - 0xc1, 0xc3, 0x83, 0x5c, 0x44, 0x9b, 0x73, 0x2c, 0xd4, 0x69, 0x70, 0x0f, 0x61, 0x9f, 0x79, 0x75, - 0x65, 0x5e, 0x69, 0x55, 0xad, 0xf4, 0xa2, 0xbe, 0x04, 0x00, 0x26, 0x70, 0x47, 0xf4, 0x03, 0x5c, - 0x1f, 0x99, 0x57, 0x5a, 0x0f, 0xd6, 0x16, 0x8d, 0xdb, 0x85, 0x18, 0x37, 0xe8, 0x5e, 0xf7, 0x03, - 0x6c, 0x55, 0xe1, 0xe0, 0xb8, 0x3e, 0x7e, 0x72, 0xda, 0x2c, 0xfd, 0x3c, 0x6d, 0x2a, 0x7a, 0x0f, - 0xcc, 0x0d, 0x7d, 0xb7, 0x7d, 0x81, 0x43, 0x0f, 0x23, 0x02, 0xc3, 0x7e, 0xdb, 0x71, 0x58, 0xe4, - 0xff, 0x49, 0xc8, 0x2c, 0x18, 0x8f, 0x21, 0xed, 0x40, 0x84, 0x42, 0x29, 0xa3, 0x6a, 0x8d, 0xc5, - 0x90, 0xb6, 0x11, 0x0a, 0x13, 0xc8, 0x85, 0x91, 0x8b, 0x3b, 0x04, 0xd5, 0xcb, 0xf3, 0x4a, 0xab, - 0x62, 0x8d, 0xc9, 0xfb, 0x36, 0xd2, 0xbf, 0x28, 0x40, 0xdb, 0xe3, 0x1e, 0x7b, 0x71, 0x1c, 0x91, - 0x18, 0x52, 0xec, 0x8b, 0x57, 0x11, 0x15, 0x24, 0xa0, 0x04, 0x87, 0x16, 0x76, 0x58, 0x88, 0xd4, - 0xc7, 0xe0, 0x3e, 0x0e, 0x98, 0xd3, 0xed, 0xf8, 0x91, 0x67, 0xe3, 0x50, 0x66, 0x2d, 0x5b, 0x13, - 0xd2, 0xb6, 0x2b, 0x4d, 0x43, 0x45, 0x23, 0x45, 0x45, 0x0e, 0x00, 0x5e, 0x4e, 0x26, 0x13, 0x57, - 0x37, 0x36, 0xcf, 0x2e, 0x9a, 0xa5, 0x6f, 0x17, 0xcd, 0x27, 0x2e, 0x11, 0xdd, 0xc8, 0x36, 0x1c, - 0xe6, 0x99, 0xd9, 0x28, 0xd2, 0xcf, 0x0a, 0x47, 0x3d, 0x33, 0xe9, 0x25, 0x37, 0xb6, 0xb0, 0x73, - 0x7d, 0xd1, 0x9c, 0xec, 0x43, 0x8f, 0xae, 0xeb, 0x43, 0x26, 0xdd, 0x2a, 0xd0, 0xea, 0xd7, 0x23, - 0xa0, 0x31, 0x6c, 0xd7, 0x16, 0xa6, 0xd8, 0x95, 0x8b, 0x90, 0x89, 0x5f, 0x06, 0x93, 0x28, 0xb5, - 0xb1, 0x50, 0xf6, 0x06, 0x73, 0x9e, 0xf5, 0xad, 0x96, 0x03, 0xed, 0xd4, 0x9e, 0x38, 0xc7, 0x90, - 0x12, 0xf4, 0x9b, 0x73, 0x5a, 0x52, 0x2d, 0x07, 0x06, 0xce, 0xef, 0x72, 0x66, 0xc2, 0xfc, 0x0e, - 0xf4, 0x92, 0xd1, 0xc8, 0x22, 0x27, 0xd6, 0x66, 0x8d, 0xb4, 0x16, 0x23, 0xd9, 0x2e, 0x23, 0xdb, - 0x2e, 0x63, 0x93, 0x11, 0x7f, 0xc3, 0x4c, 0xea, 0xff, 0xfc, 0xbd, 0xb9, 0xf8, 0x0f, 0xf5, 0x27, - 0x01, 0xb9, 0x4a, 0xc2, 0xfc, 0xb6, 0xcc, 0xa1, 0x7e, 0x50, 0x40, 0x1d, 0xe7, 0xe3, 0xea, 0x70, - 0x01, 0x7b, 0x18, 0x0d, 0x04, 0x54, 0xfe, 0x26, 0x60, 0xf9, 0x7f, 0x92, 0xcf, 0x0c, 0xf3, 0x1c, - 0xc8, 0x34, 0xa9, 0x04, 0xfd, 0x18, 0x2c, 0xec, 0x30, 0xa7, 0xb7, 0x7d, 0xd7, 0x7a, 0x6e, 0x32, - 0xdf, 0xc7, 0x4e, 0xa2, 0x57, 0x7d, 0x04, 0xc6, 0x28, 0x73, 0x7a, 0xc9, 0xda, 0x29, 0x72, 0xed, - 0x46, 0xa9, 0x8c, 0x52, 0x57, 0xc1, 0x34, 0x29, 0x44, 0x76, 0x60, 0x1a, 0x9a, 0xf5, 0x7a, 0x8a, - 0xdc, 0x66, 0xd5, 0x97, 0xc0, 0xcc, 0x1b, 0x3f, 0x60, 0x8c, 0xbe, 0xed, 0x12, 0x81, 0x29, 0xe1, - 0x02, 0xa3, 0x7d, 0xc6, 0x28, 0x57, 0x6b, 0xa0, 0x4c, 0x50, 0x32, 0xd4, 0x72, 0xab, 0x62, 0x25, - 0xc7, 0xa5, 0x43, 0x30, 0x75, 0xc7, 0xdf, 0xa6, 0xce, 0x81, 0xd9, 0x3b, 0xcc, 0xbb, 0x50, 0x90, - 0x18, 0xd7, 0x4a, 0xaa, 0x56, 0x5c, 0xa4, 0x1c, 0xde, 0xd9, 0x3f, 0xe8, 0xc2, 0x10, 0xd7, 0x94, - 0x46, 0xe5, 0xe4, 0x93, 0x56, 0xda, 0xd8, 0x3b, 0xbb, 0xd4, 0x94, 0xf3, 0x4b, 0x4d, 0xf9, 0x71, - 0xa9, 0x29, 0x1f, 0xaf, 0xb4, 0xd2, 0xf9, 0x95, 0x56, 0xfa, 0x7a, 0xa5, 0x95, 0x0e, 0x9f, 0x15, - 0xba, 0x9a, 0xfd, 0xff, 0x2b, 0x14, 0xda, 0x7c, 0x70, 0x31, 0xe3, 0xe7, 0xe6, 0xfb, 0xe2, 0xfb, - 0x27, 0x1b, 0x6d, 0x8f, 0xca, 0x07, 0xe7, 0xe9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xfb, - 0xa8, 0x75, 0x22, 0x05, 0x00, 0x00, + // 696 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0xd4, 0x4e, + 0x18, 0xde, 0xb2, 0xfb, 0x03, 0x76, 0xf8, 0x45, 0x97, 0x42, 0x70, 0xd9, 0x84, 0x2e, 0x96, 0x44, + 0x36, 0x10, 0x5a, 0x17, 0x13, 0x0f, 0xdc, 0x16, 0xd0, 0x84, 0x04, 0x91, 0x14, 0x8d, 0x09, 0x97, + 0xcd, 0xb4, 0x33, 0x74, 0x27, 0x3b, 0xed, 0x94, 0xce, 0xb4, 0xba, 0x37, 0x8f, 0x1c, 0xfd, 0x08, + 0x24, 0xde, 0xfc, 0x10, 0x9e, 0x39, 0x72, 0x34, 0x1e, 0xd0, 0xc0, 0xc5, 0x33, 0x9f, 0xc0, 0x74, + 0xda, 0xed, 0x56, 0xc0, 0xa8, 0xa7, 0xce, 0xbc, 0xcf, 0xfb, 0x3e, 0xef, 0xf3, 0xfe, 0xe9, 0x80, + 0x25, 0xc6, 0x3d, 0xc6, 0x09, 0x37, 0x79, 0x14, 0xe0, 0xf0, 0x88, 0x46, 0x04, 0x15, 0x8e, 0x46, + 0x10, 0x32, 0xc1, 0x54, 0x35, 0x73, 0x32, 0x46, 0x48, 0x63, 0xd6, 0x65, 0x2e, 0x93, 0xb0, 0x99, + 0x9c, 0x52, 0xcf, 0x86, 0xe6, 0x32, 0xe6, 0x52, 0x6c, 0xca, 0x9b, 0x1d, 0x1d, 0x99, 0x28, 0x0a, + 0xa1, 0x20, 0xcc, 0xcf, 0xf0, 0xe6, 0x4d, 0x5c, 0x10, 0x0f, 0x73, 0x01, 0xbd, 0x60, 0x48, 0xe0, + 0xc8, 0x5c, 0xa6, 0x0d, 0x39, 0x36, 0xe3, 0xb6, 0x8d, 0x05, 0x6c, 0x9b, 0x0e, 0x23, 0x19, 0x81, + 0x3e, 0x00, 0xf7, 0x0f, 0x72, 0x11, 0x1d, 0xce, 0xb1, 0x50, 0x67, 0xc1, 0x7f, 0x08, 0xfb, 0xcc, + 0xab, 0x2b, 0x8b, 0x4a, 0xab, 0x6a, 0xa5, 0x17, 0xf5, 0x39, 0x00, 0x30, 0x81, 0xbb, 0x62, 0x10, + 0xe0, 0xfa, 0xd8, 0xa2, 0xd2, 0xba, 0xb7, 0xbe, 0x6c, 0xdc, 0x2e, 0xc4, 0xb8, 0x41, 0xf7, 0x6a, + 0x10, 0x60, 0xab, 0x0a, 0x87, 0xc7, 0x8d, 0xc9, 0x93, 0xd3, 0x66, 0xe9, 0xc7, 0x69, 0x53, 0xd1, + 0xfb, 0x60, 0x61, 0xe4, 0xbb, 0xe3, 0x0b, 0x1c, 0x7a, 0x18, 0x11, 0x18, 0x0e, 0x3a, 0x8e, 0xc3, + 0x22, 0xff, 0x77, 0x42, 0xe6, 0xc1, 0x64, 0x0c, 0x69, 0x17, 0x22, 0x14, 0x4a, 0x19, 0x55, 0x6b, + 0x22, 0x86, 0xb4, 0x83, 0x50, 0x98, 0x40, 0x2e, 0x8c, 0x5c, 0xdc, 0x25, 0xa8, 0x5e, 0x5e, 0x54, + 0x5a, 0x15, 0x6b, 0x42, 0xde, 0x77, 0x90, 0xfe, 0x59, 0x01, 0xda, 0x4b, 0xee, 0xb1, 0x67, 0xc7, + 0x11, 0x89, 0x21, 0xc5, 0xbe, 0x78, 0x11, 0x51, 0x41, 0x02, 0x4a, 0x70, 0x68, 0x61, 0x87, 0x85, + 0x48, 0x7d, 0x08, 0xfe, 0xc7, 0x01, 0x73, 0x7a, 0x5d, 0x3f, 0xf2, 0x6c, 0x1c, 0xca, 0xac, 0x65, + 0x6b, 0x4a, 0xda, 0xf6, 0xa4, 0x69, 0xa4, 0x68, 0xac, 0xa8, 0xc8, 0x01, 0xc0, 0xcb, 0xc9, 0x64, + 0xe2, 0xea, 0xe6, 0xd6, 0xd9, 0x45, 0xb3, 0xf4, 0xf5, 0xa2, 0xf9, 0xc8, 0x25, 0xa2, 0x17, 0xd9, + 0x86, 0xc3, 0x3c, 0x33, 0x1b, 0x45, 0xfa, 0x59, 0xe3, 0xa8, 0x6f, 0x26, 0xbd, 0xe4, 0xc6, 0x36, + 0x76, 0xae, 0x2f, 0x9a, 0xd3, 0x03, 0xe8, 0xd1, 0x0d, 0x7d, 0xc4, 0xa4, 0x5b, 0x05, 0x5a, 0xfd, + 0x7a, 0x0c, 0x34, 0x46, 0xed, 0xda, 0xc6, 0x14, 0xbb, 0x72, 0x11, 0x32, 0xf1, 0xab, 0x60, 0x1a, + 0xa5, 0x36, 0x16, 0xca, 0xde, 0x60, 0xce, 0xb3, 0xbe, 0xd5, 0x72, 0xa0, 0x93, 0xda, 0x13, 0xe7, + 0x18, 0x52, 0x82, 0x7e, 0x71, 0x4e, 0x4b, 0xaa, 0xe5, 0xc0, 0xd0, 0xf9, 0x6d, 0xce, 0x4c, 0x98, + 0xdf, 0x85, 0x5e, 0x32, 0x1a, 0x59, 0xe4, 0xd4, 0xfa, 0xbc, 0x91, 0xd6, 0x62, 0x24, 0xdb, 0x65, + 0x64, 0xdb, 0x65, 0x6c, 0x31, 0xe2, 0x6f, 0x9a, 0x49, 0xfd, 0x9f, 0xbe, 0x35, 0x97, 0xff, 0xa2, + 0xfe, 0x24, 0x20, 0x57, 0x49, 0x98, 0xdf, 0x91, 0x39, 0xd4, 0xf7, 0x0a, 0xa8, 0xe3, 0x7c, 0x5c, + 0x5d, 0x2e, 0x60, 0x1f, 0xa3, 0xa1, 0x80, 0xca, 0x9f, 0x04, 0xac, 0xfe, 0x4b, 0xf2, 0xb9, 0x51, + 0x9e, 0x03, 0x99, 0x26, 0x95, 0xa0, 0x1f, 0x83, 0xa5, 0x5d, 0xe6, 0xf4, 0x77, 0xee, 0x5a, 0xcf, + 0x2d, 0xe6, 0xfb, 0xd8, 0x49, 0xf4, 0xaa, 0x0f, 0xc0, 0x04, 0x65, 0x4e, 0x3f, 0x59, 0x3b, 0x45, + 0xae, 0xdd, 0x38, 0x95, 0x51, 0x6a, 0x1b, 0xcc, 0x92, 0x42, 0x64, 0x17, 0xa6, 0xa1, 0x59, 0xaf, + 0x67, 0xc8, 0x6d, 0x56, 0x7d, 0x05, 0xcc, 0xbd, 0xf6, 0x03, 0xc6, 0xe8, 0x9b, 0x1e, 0x11, 0x98, + 0x12, 0x2e, 0x30, 0xda, 0x67, 0x8c, 0x72, 0xb5, 0x06, 0xca, 0x04, 0x25, 0x43, 0x2d, 0xb7, 0x2a, + 0x56, 0x72, 0x5c, 0x39, 0x04, 0x33, 0x77, 0xfc, 0x6d, 0xea, 0x02, 0x98, 0xbf, 0xc3, 0xbc, 0x07, + 0x05, 0x89, 0x71, 0xad, 0xa4, 0x6a, 0xc5, 0x45, 0xca, 0xe1, 0xdd, 0xfd, 0x83, 0x1e, 0x0c, 0x71, + 0x4d, 0x69, 0x54, 0x4e, 0x3e, 0x6a, 0xa5, 0xcd, 0xfd, 0xb3, 0x4b, 0x4d, 0x39, 0xbf, 0xd4, 0x94, + 0xef, 0x97, 0x9a, 0xf2, 0xe1, 0x4a, 0x2b, 0x9d, 0x5f, 0x69, 0xa5, 0x2f, 0x57, 0x5a, 0xe9, 0xf0, + 0x69, 0xa1, 0xab, 0xd9, 0xff, 0xbf, 0x46, 0xa1, 0xcd, 0x87, 0x17, 0x33, 0x6e, 0x3f, 0x36, 0xdf, + 0x15, 0x1f, 0x40, 0xd9, 0x69, 0x7b, 0x5c, 0xbe, 0x38, 0x4f, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, + 0xd3, 0xa7, 0xdf, 0xd8, 0x23, 0x05, 0x00, 0x00, } func (this *SuperfluidAsset) Equal(that interface{}) bool { diff --git a/x/superfluid/types/tx.pb.go b/x/superfluid/types/tx.pb.go index 2e00a381f2d..2932c083bb7 100644 --- a/x/superfluid/types/tx.pb.go +++ b/x/superfluid/types/tx.pb.go @@ -530,45 +530,45 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/tx.proto", fileDescriptor_55b645f187d22814) } var fileDescriptor_55b645f187d22814 = []byte{ - // 607 bytes of a gzipped FileDescriptorProto + // 608 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0x93, 0x90, 0xc2, 0xa0, 0x16, 0x61, 0xb5, 0xaa, 0x63, 0xc0, 0x0e, 0x06, 0xa1, 0xa0, - 0x52, 0x6f, 0xd3, 0xf2, 0x27, 0x6e, 0x0d, 0xb9, 0x04, 0x35, 0x02, 0x19, 0x55, 0x48, 0x48, 0x28, - 0xb2, 0xb3, 0x5b, 0xd7, 0x8a, 0xe3, 0x8d, 0xbc, 0x4e, 0x94, 0x8a, 0x07, 0xe0, 0xca, 0x73, 0xf0, - 0x22, 0xf4, 0xd8, 0x23, 0xa7, 0x80, 0x92, 0x37, 0xa8, 0x78, 0x00, 0xe4, 0xdf, 0x50, 0xb0, 0x43, - 0x22, 0xe0, 0xe4, 0x9d, 0x99, 0x6f, 0xbf, 0xf9, 0x46, 0x33, 0xe3, 0x85, 0x1b, 0x94, 0xf5, 0x28, - 0xb3, 0x18, 0x62, 0x83, 0x3e, 0x71, 0x8f, 0xec, 0x81, 0x85, 0x91, 0x37, 0x52, 0xfb, 0x2e, 0xf5, - 0x28, 0xcf, 0x47, 0x41, 0x75, 0x16, 0x14, 0xd7, 0x4d, 0x6a, 0xd2, 0x20, 0x8c, 0xfc, 0x53, 0x88, - 0x14, 0x25, 0x93, 0x52, 0xd3, 0x26, 0x28, 0xb0, 0x8c, 0xc1, 0x11, 0xc2, 0x03, 0x57, 0xf7, 0x2c, - 0xea, 0xc4, 0xf1, 0x4e, 0x40, 0x85, 0x0c, 0x9d, 0x11, 0x34, 0xac, 0x19, 0xc4, 0xd3, 0x6b, 0xa8, - 0x43, 0xad, 0x38, 0x7e, 0x27, 0x45, 0xc6, 0xec, 0x18, 0x82, 0x94, 0x21, 0x6c, 0xb4, 0x98, 0xf9, - 0x3a, 0x71, 0x37, 0x88, 0x4d, 0x4c, 0xdd, 0x23, 0xfc, 0x7d, 0x28, 0x31, 0xe2, 0x60, 0xe2, 0x0a, - 0x5c, 0x85, 0xab, 0x5e, 0xa9, 0x5f, 0x3f, 0x1f, 0xcb, 0xab, 0x27, 0x7a, 0xcf, 0x7e, 0xa6, 0x84, - 0x7e, 0x45, 0x8b, 0x00, 0xfc, 0x26, 0xac, 0xd8, 0xb4, 0xd3, 0x6d, 0x5b, 0x58, 0xc8, 0x57, 0xb8, - 0x6a, 0x51, 0x2b, 0xf9, 0x66, 0x13, 0xf3, 0x65, 0xb8, 0x3c, 0xd4, 0xed, 0xb6, 0x8e, 0xb1, 0x2b, - 0x14, 0x7c, 0x16, 0x6d, 0x65, 0xa8, 0xdb, 0xfb, 0x18, 0xbb, 0x8a, 0x0c, 0xb7, 0x52, 0xf3, 0x6a, - 0x84, 0xf5, 0xa9, 0xc3, 0x88, 0xf2, 0x0e, 0x36, 0x2f, 0x00, 0x0e, 0x1d, 0xfc, 0x0f, 0xa5, 0x29, - 0xb7, 0x41, 0xce, 0xa0, 0x9f, 0xa3, 0xc0, 0xa0, 0x0e, 0x3e, 0xa0, 0x9d, 0xee, 0x7f, 0x52, 0x10, - 0xd3, 0x27, 0x0a, 0x3e, 0x73, 0x70, 0xb3, 0xc5, 0x4c, 0xdf, 0xb7, 0xef, 0xe0, 0xbf, 0x6b, 0x92, - 0x0e, 0x97, 0xfc, 0xd9, 0x60, 0x42, 0xbe, 0x52, 0xa8, 0x5e, 0xdd, 0x2d, 0xab, 0xe1, 0xf4, 0xa8, - 0xfe, 0xf4, 0xa8, 0xd1, 0xf4, 0xa8, 0xcf, 0xa9, 0xe5, 0xd4, 0x77, 0x4e, 0xc7, 0x72, 0xee, 0xd3, - 0x57, 0xb9, 0x6a, 0x5a, 0xde, 0xf1, 0xc0, 0x50, 0x3b, 0xb4, 0x87, 0xa2, 0x51, 0x0b, 0x3f, 0xdb, - 0x0c, 0x77, 0x91, 0x77, 0xd2, 0x27, 0x2c, 0xb8, 0xc0, 0xb4, 0x90, 0x79, 0x5e, 0xbb, 0x1f, 0xc3, - 0xdd, 0x79, 0x85, 0xc4, 0x15, 0xf3, 0x6b, 0x90, 0x6f, 0x36, 0x82, 0x62, 0x8a, 0x5a, 0xbe, 0xd9, - 0x50, 0x5c, 0x10, 0x5a, 0xcc, 0x3c, 0x74, 0x5e, 0x51, 0x6a, 0xbf, 0x39, 0xb6, 0x3c, 0x62, 0x5b, - 0xcc, 0x23, 0xd8, 0x37, 0x97, 0x29, 0x7e, 0x0b, 0x56, 0xfa, 0x94, 0xda, 0x49, 0x13, 0xea, 0xfc, - 0xf9, 0x58, 0x5e, 0x0b, 0xb1, 0x51, 0x40, 0xd1, 0x4a, 0xfe, 0xa9, 0x89, 0x95, 0x17, 0x50, 0xc9, - 0xca, 0x99, 0xe8, 0xbc, 0x07, 0xd7, 0xc8, 0xc8, 0xf2, 0x08, 0x6e, 0x47, 0xcd, 0x65, 0x02, 0x57, - 0x29, 0x54, 0x8b, 0xda, 0x6a, 0xe8, 0x3e, 0x08, 0x7a, 0xcc, 0x76, 0xbf, 0x17, 0xa1, 0xd0, 0x62, - 0x26, 0xef, 0x02, 0x9f, 0xd6, 0x3e, 0xf5, 0xf7, 0x9f, 0x81, 0x9a, 0xba, 0x16, 0x62, 0x6d, 0x61, - 0x68, 0xa2, 0x71, 0x04, 0xeb, 0xa9, 0xeb, 0xb3, 0xf5, 0x47, 0xaa, 0x19, 0x58, 0xdc, 0x5b, 0x02, - 0x9c, 0x95, 0x39, 0x59, 0x9b, 0x45, 0x32, 0xc7, 0xe0, 0x85, 0x32, 0xff, 0xba, 0x31, 0xfc, 0x07, - 0x0e, 0xca, 0xd9, 0xeb, 0xb2, 0x93, 0x41, 0x99, 0x79, 0x43, 0x7c, 0xba, 0xec, 0x8d, 0x44, 0xc9, - 0x7b, 0xd8, 0x48, 0x1f, 0xdb, 0x07, 0x19, 0x94, 0xa9, 0x68, 0xf1, 0xe1, 0x32, 0xe8, 0x38, 0x79, - 0xfd, 0xe5, 0xe9, 0x44, 0xe2, 0xce, 0x26, 0x12, 0xf7, 0x6d, 0x22, 0x71, 0x1f, 0xa7, 0x52, 0xee, - 0x6c, 0x2a, 0xe5, 0xbe, 0x4c, 0xa5, 0xdc, 0xdb, 0x47, 0x3f, 0x2d, 0x75, 0xc4, 0xbc, 0x6d, 0xeb, - 0x06, 0x8b, 0x0d, 0x34, 0x7c, 0x82, 0x46, 0x17, 0x1e, 0x2e, 0x7f, 0xcf, 0x8d, 0x52, 0xf0, 0x5a, - 0xec, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xa8, 0x54, 0x0e, 0xdb, 0x06, 0x00, 0x00, + 0x10, 0x8e, 0x93, 0x90, 0xc0, 0xa2, 0x16, 0x61, 0xb5, 0xaa, 0x63, 0xc0, 0x0e, 0x06, 0xa1, 0xa0, + 0x52, 0x6f, 0xd2, 0xa2, 0x0a, 0x71, 0x6b, 0xc8, 0x25, 0xa8, 0x91, 0x2a, 0xa3, 0x0a, 0x09, 0x09, + 0x45, 0x76, 0x76, 0xeb, 0x5a, 0xd9, 0x78, 0x23, 0xaf, 0x63, 0xa5, 0xe2, 0x01, 0xb8, 0xf2, 0x1c, + 0xbc, 0x08, 0x3d, 0xf6, 0xc8, 0x29, 0xa0, 0xe4, 0x0d, 0x2a, 0x1e, 0x00, 0xf9, 0x37, 0x14, 0xec, + 0x90, 0x08, 0x7a, 0xf2, 0xce, 0xcc, 0xb7, 0xdf, 0x7c, 0xa3, 0x99, 0xf1, 0x82, 0x7b, 0x94, 0x0d, + 0x28, 0xb3, 0x18, 0x64, 0xa3, 0x21, 0x76, 0x4e, 0xc8, 0xc8, 0x42, 0xd0, 0x1d, 0xab, 0x43, 0x87, + 0xba, 0x94, 0xe7, 0xa3, 0xa0, 0x3a, 0x0f, 0x8a, 0x1b, 0x26, 0x35, 0x69, 0x10, 0x86, 0xfe, 0x29, + 0x44, 0x8a, 0x92, 0x49, 0xa9, 0x49, 0x30, 0x0c, 0x2c, 0x63, 0x74, 0x02, 0xd1, 0xc8, 0xd1, 0x5d, + 0x8b, 0xda, 0x71, 0xbc, 0x17, 0x50, 0x41, 0x43, 0x67, 0x18, 0x7a, 0x0d, 0x03, 0xbb, 0x7a, 0x03, + 0xf6, 0xa8, 0x15, 0xc7, 0x1f, 0xa5, 0xc8, 0x98, 0x1f, 0x43, 0x90, 0xe2, 0x81, 0xcd, 0x0e, 0x33, + 0xdf, 0x24, 0xee, 0x16, 0x26, 0xd8, 0xd4, 0x5d, 0xcc, 0x3f, 0x05, 0x25, 0x86, 0x6d, 0x84, 0x1d, + 0x81, 0xab, 0x72, 0xb5, 0x5b, 0xcd, 0xbb, 0x97, 0x13, 0x79, 0xed, 0x4c, 0x1f, 0x90, 0x97, 0x4a, + 0xe8, 0x57, 0xb4, 0x08, 0xc0, 0x6f, 0x81, 0x32, 0xa1, 0xbd, 0x7e, 0xd7, 0x42, 0x42, 0xbe, 0xca, + 0xd5, 0x8a, 0x5a, 0xc9, 0x37, 0xdb, 0x88, 0xaf, 0x80, 0x9b, 0x9e, 0x4e, 0xba, 0x3a, 0x42, 0x8e, + 0x50, 0xf0, 0x59, 0xb4, 0xb2, 0xa7, 0x93, 0x03, 0x84, 0x1c, 0x45, 0x06, 0x0f, 0x52, 0xf3, 0x6a, + 0x98, 0x0d, 0xa9, 0xcd, 0xb0, 0xf2, 0x1e, 0x6c, 0x5d, 0x01, 0x1c, 0xdb, 0xe8, 0x3f, 0x4a, 0x53, + 0x1e, 0x02, 0x39, 0x83, 0x7e, 0x81, 0x02, 0x83, 0xda, 0xe8, 0x90, 0xf6, 0xfa, 0xd7, 0xa4, 0x20, + 0xa6, 0x4f, 0x14, 0x7c, 0xe1, 0xc0, 0xfd, 0x0e, 0x33, 0x7d, 0xdf, 0x81, 0x8d, 0xfe, 0xad, 0x49, + 0x3a, 0xb8, 0xe1, 0xcf, 0x06, 0x13, 0xf2, 0xd5, 0x42, 0xed, 0xf6, 0x6e, 0x45, 0x0d, 0xa7, 0x47, + 0xf5, 0xa7, 0x47, 0x8d, 0xa6, 0x47, 0x7d, 0x45, 0x2d, 0xbb, 0x59, 0x3f, 0x9f, 0xc8, 0xb9, 0xcf, + 0xdf, 0xe4, 0x9a, 0x69, 0xb9, 0xa7, 0x23, 0x43, 0xed, 0xd1, 0x01, 0x8c, 0x46, 0x2d, 0xfc, 0xec, + 0x30, 0xd4, 0x87, 0xee, 0xd9, 0x10, 0xb3, 0xe0, 0x02, 0xd3, 0x42, 0xe6, 0x45, 0xed, 0xde, 0x07, + 0x8f, 0x17, 0x15, 0x12, 0x57, 0xcc, 0xaf, 0x83, 0x7c, 0xbb, 0x15, 0x14, 0x53, 0xd4, 0xf2, 0xed, + 0x96, 0xe2, 0x00, 0xa1, 0xc3, 0xcc, 0x63, 0xfb, 0x88, 0x52, 0xf2, 0xf6, 0xd4, 0x72, 0x31, 0xb1, + 0x98, 0x8b, 0x91, 0x6f, 0xae, 0x52, 0xfc, 0x36, 0x28, 0x0f, 0x29, 0x25, 0x49, 0x13, 0x9a, 0xfc, + 0xe5, 0x44, 0x5e, 0x0f, 0xb1, 0x51, 0x40, 0xd1, 0x4a, 0xfe, 0xa9, 0x8d, 0x94, 0xd7, 0xa0, 0x9a, + 0x95, 0x33, 0xd1, 0xf9, 0x04, 0xdc, 0xc1, 0x63, 0xcb, 0xc5, 0xa8, 0x1b, 0x35, 0x97, 0x09, 0x5c, + 0xb5, 0x50, 0x2b, 0x6a, 0x6b, 0xa1, 0xfb, 0x30, 0xe8, 0x31, 0xdb, 0xfd, 0x51, 0x04, 0x85, 0x0e, + 0x33, 0x79, 0x07, 0xf0, 0x69, 0xed, 0x53, 0xff, 0xfc, 0x19, 0xa8, 0xa9, 0x6b, 0x21, 0x36, 0x96, + 0x86, 0x26, 0x1a, 0xc7, 0x60, 0x23, 0x75, 0x7d, 0xb6, 0xff, 0x4a, 0x35, 0x07, 0x8b, 0x7b, 0x2b, + 0x80, 0xb3, 0x32, 0x27, 0x6b, 0xb3, 0x4c, 0xe6, 0x18, 0xbc, 0x54, 0xe6, 0xdf, 0x37, 0x86, 0xff, + 0xc8, 0x81, 0x4a, 0xf6, 0xba, 0xd4, 0x33, 0x28, 0x33, 0x6f, 0x88, 0x2f, 0x56, 0xbd, 0x91, 0x28, + 0xf9, 0x00, 0x36, 0xd3, 0xc7, 0xf6, 0x59, 0x06, 0x65, 0x2a, 0x5a, 0x7c, 0xbe, 0x0a, 0x3a, 0x4e, + 0xde, 0x3c, 0x3a, 0x9f, 0x4a, 0xdc, 0xc5, 0x54, 0xe2, 0xbe, 0x4f, 0x25, 0xee, 0xd3, 0x4c, 0xca, + 0x5d, 0xcc, 0xa4, 0xdc, 0xd7, 0x99, 0x94, 0x7b, 0xb7, 0xff, 0xcb, 0x52, 0x47, 0xcc, 0x3b, 0x44, + 0x37, 0x58, 0x6c, 0x40, 0xaf, 0x51, 0x87, 0xe3, 0x2b, 0x2f, 0x97, 0xbf, 0xe8, 0x46, 0x29, 0x78, + 0x2e, 0xf6, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x43, 0xb4, 0xc4, 0x07, 0xdc, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index c07a0e8c212..470b0bf5d3b 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -13,7 +13,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index a1c22e8c118..c649af4bbbb 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index 3a62d2304ed..48ec2814a06 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 958d52643a2..6f687c86537 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index bf23d1c273b..39b569aef80 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 89658322d58..7add23564cb 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 64179a3972b..876c9375329 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index c87cfa94743..4ab32c0a010 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // InitGenesis initializes the tokenfactory module's state from a provided genesis diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 2e99a6c0a11..0eb7f08a13c 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -5,7 +5,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 87bb2dd6412..f2efef6465f 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index b4798b2d631..9b885a3b4a7 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 587fa7d030e..0689769ebc4 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) type KeeperTestSuite struct { diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index f211dbfa82c..9403654f828 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index ad99bf757c3..472d6cf91c2 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index 68a0207310e..67aee24683a 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -15,9 +15,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 484a1cd1fa9..86353fe3e6b 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -81,7 +81,7 @@ func init() { } var fileDescriptor_99435de88ae175f7 = []byte{ - // 238 bytes of a gzipped FileDescriptorProto + // 239 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xc9, 0xcf, 0x4e, 0xcd, 0x4b, 0x4b, 0x4c, 0x2e, 0xc9, 0x2f, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x2c, 0x2d, 0xc9, 0xc8, 0x2f, 0xca, @@ -91,12 +91,12 @@ var fileDescriptor_99435de88ae175f7 = []byte{ 0xa7, 0xc2, 0x2d, 0x48, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0xb9, 0x71, 0x89, 0xb9, 0xa4, 0xe6, 0xe5, 0xe7, 0x3a, 0xa2, 0xdb, 0x29, 0xa4, 0xc6, 0xc5, 0x9a, 0x98, 0x92, 0x9b, 0x99, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xf0, 0xe9, 0x9e, 0x3c, 0x4f, 0x65, 0x62, 0x6e, 0x8e, 0x95, - 0x12, 0x58, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x53, 0xe0, 0x89, + 0x12, 0x58, 0x58, 0x29, 0x08, 0x22, 0x6d, 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x53, 0xd0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, - 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x99, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, + 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x3d, 0xa0, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, - 0x99, 0xeb, 0x57, 0xa0, 0x06, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x85, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xcc, 0xc4, 0x2f, 0x2d, 0x01, 0x00, 0x00, + 0x19, 0x1a, 0xe8, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0x09, 0x62, 0x7b, 0x2e, 0x01, 0x00, 0x00, } func (this *DenomAuthorityMetadata) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index 31234344753..cf7c817d371 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func TestDecomposeDenoms(t *testing.T) { diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 9e7458096ba..109e99fe2e8 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -142,7 +142,7 @@ func init() { } var fileDescriptor_5749c3f71850298b = []byte{ - // 364 bytes of a gzipped FileDescriptorProto + // 365 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xc9, 0xcf, 0x4e, 0xcd, 0x4b, 0x4b, 0x4c, 0x2e, 0xc9, 0x2f, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, @@ -160,12 +160,12 @@ var fileDescriptor_5749c3f71850298b = []byte{ 0xe0, 0xd3, 0x3d, 0x79, 0x1e, 0x88, 0x49, 0x60, 0x61, 0xa5, 0x20, 0x88, 0xb4, 0x50, 0x1b, 0x23, 0x97, 0x10, 0x3c, 0x18, 0xe3, 0x73, 0xa1, 0xe1, 0x28, 0xc1, 0x04, 0xf6, 0xbb, 0x09, 0x7e, 0xf7, 0x82, 0x6d, 0x72, 0x44, 0x8f, 0x03, 0x27, 0x45, 0xa8, 0xcb, 0x25, 0x21, 0xf6, 0x61, 0x9a, 0xae, - 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0x05, 0x9e, 0x78, 0x24, + 0x14, 0x24, 0x88, 0x11, 0x73, 0x56, 0x2c, 0x2f, 0x16, 0xc8, 0x33, 0x3a, 0x05, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, - 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x79, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, - 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xb9, - 0x7e, 0x05, 0x6a, 0x84, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x23, 0xda, 0x18, 0x10, - 0x00, 0x00, 0xff, 0xff, 0xa8, 0x21, 0x20, 0xd8, 0xab, 0x02, 0x00, 0x00, + 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, + 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xa1, + 0x81, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x06, 0x2f, 0x93, 0x12, 0xac, 0x02, 0x00, 0x00, } func (this *GenesisDenom) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index 6b6e3bf86f3..e14dd592763 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 30c3c741204..9c42c5fd823 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - appparams "github.com/osmosis-labs/osmosis/v7/app/params" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 6755f175e5e..05fd46c8f75 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -81,26 +81,26 @@ func init() { var fileDescriptor_cc8299d306f3ff47 = []byte{ // 309 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcc, 0x2f, 0xce, 0xcd, - 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xc9, 0xcf, 0x4e, 0xcd, 0x4b, 0x4b, 0x4c, 0x2e, 0xc9, 0x2f, 0xaa, - 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd5, 0x43, 0x56, 0xaa, 0x07, 0x55, 0x2a, - 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x48, 0x99, 0xe0, 0x35, - 0x3e, 0xb1, 0xb4, 0x24, 0x23, 0xbf, 0x28, 0xb3, 0xa4, 0xd2, 0x37, 0xb5, 0x24, 0x31, 0x25, 0xb1, - 0x24, 0x11, 0xaa, 0x4b, 0x32, 0x19, 0xac, 0x2d, 0x1e, 0x62, 0x1c, 0x84, 0x03, 0x95, 0x92, 0x83, - 0xf0, 0xf4, 0x93, 0x12, 0x8b, 0x53, 0xe1, 0xe6, 0x24, 0xe7, 0x67, 0xe6, 0x41, 0xe4, 0x95, 0x16, - 0x32, 0x72, 0xb1, 0x05, 0x80, 0x5d, 0x2d, 0x34, 0x8d, 0x91, 0x4b, 0x28, 0x25, 0x35, 0x2f, 0x3f, - 0x37, 0x3e, 0xb9, 0x28, 0x35, 0xb1, 0x24, 0x33, 0x3f, 0x2f, 0x3e, 0x2d, 0x35, 0x55, 0x82, 0x51, - 0x81, 0x59, 0x83, 0xdb, 0x48, 0x52, 0x0f, 0x6a, 0x2c, 0xc8, 0x20, 0x98, 0x27, 0xf4, 0x9c, 0xf3, - 0x33, 0xf3, 0x9c, 0x7c, 0x4f, 0xdc, 0x93, 0x67, 0xf8, 0x74, 0x4f, 0x5e, 0xb2, 0x32, 0x31, 0x37, - 0xc7, 0x4a, 0x09, 0xd3, 0x08, 0xa5, 0x55, 0xf7, 0xe5, 0x35, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, - 0xf4, 0x92, 0xf3, 0x73, 0xa1, 0x0e, 0x84, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x25, 0x95, 0x05, - 0xa9, 0xc5, 0x60, 0xd3, 0x8a, 0x83, 0x04, 0xc0, 0x06, 0x38, 0x43, 0xf5, 0xbb, 0xa5, 0xa6, 0x3a, - 0x05, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, - 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x39, 0x92, 0xa9, 0xd0, - 0x90, 0xd3, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0xcc, 0xf5, 0x2b, 0x50, 0xc3, 0x12, - 0x6c, 0x55, 0x12, 0x1b, 0xd8, 0xf7, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xb5, 0xd8, - 0xe2, 0xcf, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xbf, 0x4e, 0xf3, 0x30, + 0x14, 0xc5, 0x63, 0x7d, 0x52, 0x87, 0x7e, 0x0b, 0xaa, 0x18, 0x68, 0x85, 0x1c, 0x94, 0xa9, 0x0c, + 0xb5, 0x09, 0x30, 0x20, 0xc6, 0x56, 0x62, 0xab, 0x84, 0x3a, 0xb2, 0x44, 0x37, 0x89, 0x9b, 0x5a, + 0x6d, 0x72, 0xa3, 0xd8, 0xad, 0xc8, 0x5b, 0x30, 0xb1, 0xb3, 0xf2, 0x24, 0x1d, 0x3b, 0x32, 0x15, + 0x94, 0xbc, 0x01, 0x4f, 0x80, 0xea, 0xb8, 0xa8, 0x08, 0x89, 0xc9, 0x3e, 0xba, 0xe7, 0xfc, 0xee, + 0x9f, 0xf6, 0x39, 0xaa, 0x14, 0x95, 0x54, 0x5c, 0xe3, 0x5c, 0x64, 0x53, 0x88, 0x34, 0x16, 0x25, + 0x5f, 0xf9, 0xa1, 0xd0, 0xe0, 0xf3, 0x1c, 0x0a, 0x48, 0x15, 0xcb, 0x0b, 0xd4, 0xd8, 0x39, 0xb5, + 0x56, 0x76, 0x68, 0x65, 0xd6, 0xda, 0x3b, 0x4e, 0x30, 0x41, 0x63, 0xe4, 0xbb, 0x5f, 0x93, 0xe9, + 0x5d, 0xff, 0x89, 0x87, 0xa5, 0x9e, 0x61, 0x21, 0x75, 0x39, 0x16, 0x1a, 0x62, 0xd0, 0x60, 0x53, + 0xdd, 0xc8, 0xc4, 0x82, 0x06, 0xd7, 0x08, 0x5b, 0xa2, 0x8d, 0xe2, 0x21, 0x28, 0xf1, 0xcd, 0x89, + 0x50, 0x66, 0x4d, 0xdd, 0x7b, 0x21, 0xed, 0xd6, 0xbd, 0x99, 0xba, 0xf3, 0x4c, 0xda, 0x9d, 0x58, + 0x64, 0x98, 0x06, 0x51, 0x21, 0x40, 0x4b, 0xcc, 0x82, 0xa9, 0x10, 0x27, 0xe4, 0xec, 0x5f, 0xff, + 0xff, 0x65, 0x97, 0x59, 0xec, 0x0e, 0xb4, 0x5f, 0x82, 0x8d, 0x50, 0x66, 0xc3, 0xf1, 0x7a, 0xeb, + 0x3a, 0x9f, 0x5b, 0xb7, 0x5b, 0x42, 0xba, 0xb8, 0xf5, 0x7e, 0x23, 0xbc, 0xd7, 0x77, 0xb7, 0x9f, + 0x48, 0x3d, 0x5b, 0x86, 0x2c, 0xc2, 0xd4, 0x0e, 0x68, 0x9f, 0x81, 0x8a, 0xe7, 0x5c, 0x97, 0xb9, + 0x50, 0x86, 0xa6, 0x26, 0x47, 0x06, 0x30, 0xb2, 0xf9, 0x3b, 0x21, 0x86, 0x93, 0x75, 0x45, 0xc9, + 0xa6, 0xa2, 0xe4, 0xa3, 0xa2, 0xe4, 0xa9, 0xa6, 0xce, 0xa6, 0xa6, 0xce, 0x5b, 0x4d, 0x9d, 0x87, + 0x9b, 0x03, 0xaa, 0xbd, 0xdc, 0x60, 0x01, 0xa1, 0xda, 0x0b, 0xbe, 0xf2, 0x2f, 0xf8, 0xe3, 0xcf, + 0x63, 0x9a, 0x5e, 0x61, 0xcb, 0xac, 0x7f, 0xf5, 0x15, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x4f, 0x79, + 0xa2, 0xd0, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index a8eb09754b1..70f59238689 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -311,43 +311,43 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 573 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6b, 0x13, 0x4f, - 0x18, 0xcf, 0xfc, 0xff, 0x6d, 0xa4, 0xe3, 0x0b, 0x66, 0x2c, 0xa2, 0xa1, 0x6e, 0x74, 0x2c, 0x25, - 0x95, 0xba, 0x63, 0x6a, 0xa1, 0x60, 0x15, 0xcd, 0x56, 0xf4, 0xa0, 0x05, 0xbb, 0x37, 0xbd, 0x84, - 0x49, 0x3a, 0xdd, 0x2e, 0x66, 0x77, 0xb6, 0x3b, 0x93, 0x62, 0x28, 0xbd, 0x78, 0xf0, 0x2c, 0x78, - 0xf4, 0x3b, 0xf8, 0x39, 0x7a, 0x2c, 0xf4, 0xe2, 0x69, 0x91, 0xa4, 0xf8, 0x01, 0xf2, 0x09, 0x64, - 0x67, 0x26, 0xb1, 0x75, 0xe3, 0x12, 0xf5, 0x94, 0x65, 0x9e, 0xdf, 0xf3, 0x7b, 0x79, 0x9e, 0x87, - 0xc0, 0x2a, 0x17, 0x01, 0x17, 0xbe, 0x20, 0x92, 0xbf, 0x65, 0xe1, 0x36, 0x6d, 0x49, 0x1e, 0x77, - 0xc9, 0x5e, 0xad, 0xc9, 0x24, 0xad, 0x91, 0xdd, 0x0e, 0x8b, 0xbb, 0x76, 0x14, 0x73, 0xc9, 0xd1, - 0x9c, 0x41, 0xda, 0xa7, 0x91, 0xb6, 0x41, 0x96, 0x67, 0x3d, 0xee, 0x71, 0x05, 0x24, 0xe9, 0x97, - 0xee, 0x29, 0xcf, 0x79, 0x9c, 0x7b, 0x6d, 0x46, 0x68, 0xe4, 0x13, 0x1a, 0x86, 0x5c, 0x52, 0xe9, - 0xf3, 0x50, 0x98, 0xea, 0x9d, 0x96, 0xa2, 0x24, 0x4d, 0x2a, 0x98, 0x96, 0x1a, 0x09, 0x47, 0xd4, - 0xf3, 0x43, 0x05, 0x36, 0xd8, 0x95, 0x5c, 0x9f, 0xb4, 0x23, 0x77, 0x78, 0xec, 0xcb, 0xee, 0x06, - 0x93, 0x74, 0x8b, 0x4a, 0x6a, 0xba, 0x16, 0x73, 0xbb, 0x22, 0x1a, 0xd3, 0xc0, 0x98, 0xc1, 0xb3, - 0x10, 0x6d, 0xa6, 0x16, 0x5e, 0xa9, 0x47, 0x97, 0xed, 0x76, 0x98, 0x90, 0xf8, 0x35, 0xbc, 0x72, - 0xe6, 0x55, 0x44, 0x3c, 0x14, 0x0c, 0x39, 0xb0, 0xa8, 0x9b, 0xaf, 0x81, 0x9b, 0xa0, 0x7a, 0x7e, - 0x79, 0xde, 0xce, 0x1b, 0x8e, 0xad, 0xbb, 0x9d, 0xa9, 0xc3, 0xa4, 0x52, 0x70, 0x4d, 0x27, 0x7e, - 0x09, 0xb1, 0xa2, 0x7e, 0xca, 0x42, 0x1e, 0xd4, 0x7f, 0x0d, 0x60, 0x0c, 0xa0, 0x05, 0x38, 0xbd, - 0x95, 0x02, 0x94, 0xd0, 0x8c, 0x73, 0x79, 0x90, 0x54, 0x2e, 0x74, 0x69, 0xd0, 0x7e, 0x80, 0xd5, - 0x33, 0x76, 0x75, 0x19, 0x7f, 0x01, 0xf0, 0x76, 0x2e, 0x9d, 0x71, 0xfe, 0x01, 0x40, 0x34, 0x9a, - 0x56, 0x23, 0x30, 0x65, 0x13, 0x63, 0x25, 0x3f, 0xc6, 0x78, 0x6a, 0xe7, 0x56, 0x1a, 0x6b, 0x90, - 0x54, 0xae, 0x6b, 0x5f, 0x59, 0x76, 0xec, 0x96, 0x32, 0x0b, 0xc2, 0x1b, 0xf0, 0xc6, 0x4f, 0xbf, - 0xe2, 0x59, 0xcc, 0x83, 0xf5, 0x98, 0x51, 0xc9, 0xe3, 0x61, 0xf2, 0x25, 0x78, 0xae, 0xa5, 0x5f, - 0x4c, 0x76, 0x34, 0x48, 0x2a, 0x97, 0xb4, 0x86, 0x29, 0x60, 0x77, 0x08, 0xc1, 0x2f, 0xa0, 0xf5, - 0x3b, 0x3a, 0x93, 0x7c, 0x11, 0x16, 0xd5, 0xa8, 0xd2, 0x9d, 0xfd, 0x5f, 0x9d, 0x71, 0x4a, 0x83, - 0xa4, 0x72, 0xf1, 0xd4, 0x28, 0x05, 0x76, 0x0d, 0x60, 0xf9, 0x64, 0x0a, 0x4e, 0x2b, 0x36, 0xf4, - 0x19, 0xc0, 0xa2, 0xde, 0x1e, 0xba, 0x97, 0x3f, 0x9c, 0xec, 0xf1, 0x94, 0x6b, 0x7f, 0xd0, 0xa1, - 0x4d, 0xe2, 0xa5, 0xf7, 0xc7, 0x27, 0x9f, 0xfe, 0x5b, 0x40, 0xf3, 0x64, 0x82, 0xcb, 0x45, 0xdf, - 0x01, 0xbc, 0x3a, 0x7e, 0x29, 0xe8, 0xc9, 0x04, 0xda, 0xb9, 0x97, 0x57, 0xae, 0xff, 0x03, 0x83, - 0x49, 0xf3, 0x5c, 0xa5, 0xa9, 0xa3, 0xc7, 0xf9, 0x69, 0xf4, 0xd4, 0xc9, 0xbe, 0xfa, 0x3d, 0x20, - 0xd9, 0x03, 0x42, 0xc7, 0x00, 0x96, 0x32, 0x9b, 0x45, 0x6b, 0x93, 0x3a, 0x1c, 0x73, 0x5e, 0xe5, - 0x87, 0x7f, 0xd7, 0x6c, 0x92, 0xad, 0xab, 0x64, 0x8f, 0xd0, 0xda, 0x24, 0xc9, 0x1a, 0xdb, 0x31, - 0x0f, 0x1a, 0xe6, 0x52, 0xc9, 0xbe, 0xf9, 0x38, 0x70, 0x36, 0x0f, 0x7b, 0x16, 0x38, 0xea, 0x59, - 0xe0, 0x5b, 0xcf, 0x02, 0x1f, 0xfb, 0x56, 0xe1, 0xa8, 0x6f, 0x15, 0xbe, 0xf6, 0xad, 0xc2, 0x9b, - 0x55, 0xcf, 0x97, 0x3b, 0x9d, 0xa6, 0xdd, 0xe2, 0xc1, 0x50, 0xe0, 0x6e, 0x9b, 0x36, 0xc5, 0x48, - 0x6d, 0x6f, 0x95, 0xbc, 0x3b, 0x2b, 0x29, 0xbb, 0x11, 0x13, 0xcd, 0xa2, 0xfa, 0x33, 0xbb, 0xff, - 0x23, 0x00, 0x00, 0xff, 0xff, 0x10, 0x82, 0xc8, 0x64, 0xd7, 0x05, 0x00, 0x00, + // 572 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0x13, 0x41, + 0x14, 0xcf, 0x68, 0x1b, 0xe9, 0xf8, 0x07, 0x33, 0x16, 0xd1, 0x50, 0x37, 0x3a, 0x96, 0x92, 0x4a, + 0xdd, 0x69, 0x6a, 0x0f, 0x62, 0x15, 0xcd, 0x56, 0xf4, 0xa0, 0x05, 0xdd, 0x9b, 0x5e, 0xc2, 0x24, + 0x9d, 0x6e, 0x17, 0xb3, 0x3b, 0xdb, 0x9d, 0x49, 0x31, 0x94, 0x5e, 0x3c, 0x78, 0x16, 0x3c, 0xfa, + 0x1d, 0xfc, 0x1c, 0x3d, 0x16, 0x7a, 0xf1, 0xb4, 0x48, 0x52, 0xfc, 0x00, 0xf9, 0x04, 0xb2, 0x33, + 0x93, 0xd8, 0xba, 0x71, 0x89, 0x7a, 0xca, 0x32, 0xef, 0xf7, 0x7e, 0x7f, 0xde, 0x7b, 0x04, 0x56, + 0xb9, 0x08, 0xb8, 0xf0, 0x05, 0x91, 0xfc, 0x1d, 0x0b, 0xb7, 0x68, 0x4b, 0xf2, 0xb8, 0x4b, 0x76, + 0x6b, 0x4d, 0x26, 0x69, 0x8d, 0xec, 0x74, 0x58, 0xdc, 0xb5, 0xa3, 0x98, 0x4b, 0x8e, 0xe6, 0x0c, + 0xd2, 0x3e, 0x89, 0xb4, 0x0d, 0xb2, 0x3c, 0xeb, 0x71, 0x8f, 0x2b, 0x20, 0x49, 0xbf, 0x74, 0x4f, + 0x79, 0xce, 0xe3, 0xdc, 0x6b, 0x33, 0x42, 0x23, 0x9f, 0xd0, 0x30, 0xe4, 0x92, 0x4a, 0x9f, 0x87, + 0xc2, 0x54, 0xef, 0xb4, 0x14, 0x25, 0x69, 0x52, 0xc1, 0xb4, 0xd4, 0x48, 0x38, 0xa2, 0x9e, 0x1f, + 0x2a, 0xb0, 0xc1, 0xae, 0xe6, 0xfa, 0xa4, 0x1d, 0xb9, 0xcd, 0x63, 0x5f, 0x76, 0x37, 0x98, 0xa4, + 0x9b, 0x54, 0x52, 0xd3, 0xb5, 0x98, 0xdb, 0x15, 0xd1, 0x98, 0x06, 0xc6, 0x0c, 0x9e, 0x85, 0xe8, + 0x75, 0x6a, 0xe1, 0x95, 0x7a, 0x74, 0xd9, 0x4e, 0x87, 0x09, 0x89, 0xdf, 0xc0, 0x2b, 0xa7, 0x5e, + 0x45, 0xc4, 0x43, 0xc1, 0x90, 0x03, 0x8b, 0xba, 0xf9, 0x1a, 0xb8, 0x09, 0xaa, 0xe7, 0x57, 0xe6, + 0xed, 0xbc, 0xe1, 0xd8, 0xba, 0xdb, 0x99, 0x3a, 0x48, 0x2a, 0x05, 0xd7, 0x74, 0xe2, 0x97, 0x10, + 0x2b, 0xea, 0xa7, 0x2c, 0xe4, 0x41, 0xfd, 0xf7, 0x00, 0xc6, 0x00, 0x5a, 0x80, 0xd3, 0x9b, 0x29, + 0x40, 0x09, 0xcd, 0x38, 0x97, 0x07, 0x49, 0xe5, 0x42, 0x97, 0x06, 0xed, 0x07, 0x58, 0x3d, 0x63, + 0x57, 0x97, 0xf1, 0x57, 0x00, 0x6f, 0xe7, 0xd2, 0x19, 0xe7, 0x1f, 0x01, 0x44, 0xa3, 0x69, 0x35, + 0x02, 0x53, 0x36, 0x31, 0x56, 0xf3, 0x63, 0x8c, 0xa7, 0x76, 0x6e, 0xa5, 0xb1, 0x06, 0x49, 0xe5, + 0xba, 0xf6, 0x95, 0x65, 0xc7, 0x6e, 0x29, 0xb3, 0x20, 0xbc, 0x01, 0x6f, 0xfc, 0xf2, 0x2b, 0x9e, + 0xc5, 0x3c, 0x58, 0x8f, 0x19, 0x95, 0x3c, 0x1e, 0x26, 0x5f, 0x82, 0xe7, 0x5a, 0xfa, 0xc5, 0x64, + 0x47, 0x83, 0xa4, 0x72, 0x49, 0x6b, 0x98, 0x02, 0x76, 0x87, 0x10, 0xfc, 0x02, 0x5a, 0x7f, 0xa2, + 0x33, 0xc9, 0x17, 0x61, 0x51, 0x8d, 0x2a, 0xdd, 0xd9, 0xd9, 0xea, 0x8c, 0x53, 0x1a, 0x24, 0x95, + 0x8b, 0x27, 0x46, 0x29, 0xb0, 0x6b, 0x00, 0x2b, 0xc7, 0x53, 0x70, 0x5a, 0xb1, 0xa1, 0x2f, 0x00, + 0x16, 0xf5, 0xf6, 0xd0, 0x72, 0xfe, 0x70, 0xb2, 0xc7, 0x53, 0xae, 0xfd, 0x45, 0x87, 0x36, 0x89, + 0x97, 0x3e, 0x1c, 0x1d, 0x7f, 0x3e, 0xb3, 0x80, 0xe6, 0xc9, 0x04, 0x97, 0x8b, 0x7e, 0x00, 0x78, + 0x75, 0xfc, 0x52, 0xd0, 0x93, 0x09, 0xb4, 0x73, 0x2f, 0xaf, 0x5c, 0xff, 0x0f, 0x06, 0x93, 0xe6, + 0xb9, 0x4a, 0x53, 0x47, 0x8f, 0xf3, 0xd3, 0xe8, 0xa9, 0x93, 0x3d, 0xf5, 0xbb, 0x4f, 0xb2, 0x07, + 0x84, 0x8e, 0x00, 0x2c, 0x65, 0x36, 0x8b, 0xd6, 0x26, 0x75, 0x38, 0xe6, 0xbc, 0xca, 0x0f, 0xff, + 0xad, 0xd9, 0x24, 0x5b, 0x57, 0xc9, 0x1e, 0xa1, 0xb5, 0x49, 0x92, 0x35, 0xb6, 0x62, 0x1e, 0x34, + 0xcc, 0xa5, 0x92, 0x3d, 0xf3, 0xb1, 0xef, 0xb8, 0x07, 0x3d, 0x0b, 0x1c, 0xf6, 0x2c, 0xf0, 0xbd, + 0x67, 0x81, 0x4f, 0x7d, 0xab, 0x70, 0xd8, 0xb7, 0x0a, 0xdf, 0xfa, 0x56, 0xe1, 0xed, 0x7d, 0xcf, + 0x97, 0xdb, 0x9d, 0xa6, 0xdd, 0xe2, 0xc1, 0x50, 0xe0, 0x6e, 0x9b, 0x36, 0xc5, 0x48, 0x6d, 0xb7, + 0xb6, 0x4c, 0xde, 0x9f, 0xd6, 0x94, 0xdd, 0x88, 0x89, 0x66, 0x51, 0xfd, 0x9b, 0xdd, 0xfb, 0x19, + 0x00, 0x00, 0xff, 0xff, 0x1b, 0xfc, 0x95, 0xd7, 0xd8, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index e3088cd3959..0f3a637ada6 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -436,36 +436,36 @@ var fileDescriptor_283b6c9a90a846b4 = []byte{ // 513 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x94, 0x4d, 0x6e, 0xd3, 0x40, 0x14, 0xc7, 0x63, 0x02, 0xa1, 0x9d, 0x52, 0xd2, 0x9a, 0x52, 0x05, 0x0b, 0xd9, 0x68, 0xa4, 0x22, - 0x90, 0xe8, 0x8c, 0x52, 0x90, 0x2a, 0xb1, 0xc3, 0x65, 0xc1, 0x26, 0x0b, 0x2c, 0x56, 0xa8, 0x52, - 0x35, 0x4e, 0x06, 0xd7, 0x22, 0x9e, 0x09, 0x9e, 0x49, 0xd3, 0x6c, 0x38, 0x03, 0x2b, 0xae, 0xc0, - 0x55, 0xba, 0xec, 0x92, 0x95, 0x85, 0x92, 0x1b, 0xf8, 0x04, 0x68, 0x3e, 0x92, 0x38, 0x20, 0xd1, - 0x64, 0xc5, 0x2e, 0xf1, 0xfb, 0xbd, 0xff, 0xfb, 0xf8, 0x3f, 0x1b, 0x1c, 0x70, 0x91, 0x71, 0x91, - 0x0a, 0x2c, 0xf9, 0x67, 0xca, 0x3e, 0x91, 0xae, 0xe4, 0xf9, 0x18, 0x5f, 0xb4, 0x63, 0x2a, 0x49, - 0x1b, 0xcb, 0x4b, 0x34, 0xc8, 0xb9, 0xe4, 0xee, 0x63, 0x8b, 0xa1, 0x2a, 0x86, 0x2c, 0xe6, 0xed, - 0x25, 0x3c, 0xe1, 0x1a, 0xc4, 0xea, 0x97, 0xc9, 0xf1, 0xfc, 0xae, 0x4e, 0xc2, 0x31, 0x11, 0x74, - 0xae, 0xd8, 0xe5, 0x29, 0x33, 0x71, 0xd8, 0x07, 0xf7, 0x3b, 0x22, 0x39, 0xc9, 0x29, 0x91, 0xf4, - 0x2d, 0x65, 0x3c, 0x73, 0x9f, 0x83, 0x86, 0xa0, 0xac, 0x47, 0xf3, 0x96, 0xf3, 0xc4, 0x79, 0xb6, - 0x19, 0xee, 0x96, 0x45, 0xb0, 0x3d, 0x26, 0x59, 0xff, 0x35, 0x34, 0xcf, 0x61, 0x64, 0x01, 0x17, - 0x83, 0x0d, 0x31, 0x8c, 0x7b, 0x2a, 0xad, 0x75, 0x4b, 0xc3, 0x0f, 0xca, 0x22, 0x68, 0x5a, 0xd8, - 0x46, 0x60, 0x34, 0x87, 0xe0, 0x29, 0xd8, 0x5f, 0xae, 0x16, 0x51, 0x31, 0xe0, 0x4c, 0x50, 0x37, - 0x04, 0x4d, 0x46, 0x47, 0x67, 0x7a, 0xb2, 0x33, 0xa3, 0x68, 0xca, 0x7b, 0x65, 0x11, 0xec, 0x1b, - 0xc5, 0x3f, 0x00, 0x18, 0x6d, 0x33, 0x3a, 0xfa, 0xa0, 0x1e, 0x68, 0x2d, 0xf8, 0x15, 0xdc, 0xed, - 0x88, 0xa4, 0x93, 0x32, 0xb9, 0xce, 0x10, 0xef, 0x40, 0x83, 0x64, 0x7c, 0xc8, 0xa4, 0x1e, 0x61, - 0xeb, 0xe8, 0x11, 0x32, 0x2b, 0x43, 0x6a, 0x65, 0xb3, 0xed, 0xa2, 0x13, 0x9e, 0xb2, 0xf0, 0xe1, - 0x55, 0x11, 0xd4, 0x16, 0x4a, 0x26, 0x0d, 0x46, 0x36, 0x1f, 0xee, 0x82, 0xa6, 0xad, 0x3f, 0x1b, - 0xcb, 0xb6, 0x14, 0x0e, 0x73, 0xf6, 0x3f, 0x5b, 0x52, 0xf5, 0xe7, 0x2d, 0x7d, 0x77, 0x8c, 0xe5, - 0xe7, 0x84, 0x25, 0xf4, 0x4d, 0x2f, 0x4b, 0xd7, 0x6a, 0xed, 0x29, 0xb8, 0x53, 0xf5, 0x7b, 0xa7, - 0x2c, 0x82, 0x7b, 0x86, 0xb4, 0x9e, 0x98, 0xb0, 0xdb, 0x06, 0x9b, 0xca, 0x2e, 0xa2, 0xf4, 0x5b, - 0x75, 0xcd, 0xee, 0x95, 0x45, 0xb0, 0xb3, 0x70, 0x52, 0x87, 0x60, 0xb4, 0xc1, 0xe8, 0x48, 0x77, - 0x01, 0x5b, 0xe6, 0x38, 0x16, 0x7d, 0xcd, 0x5a, 0x3e, 0xfa, 0x51, 0x07, 0xf5, 0x8e, 0x48, 0xdc, - 0x2f, 0x60, 0xab, 0x7a, 0xa9, 0x2f, 0xd0, 0xbf, 0x5e, 0x08, 0xb4, 0x7c, 0x69, 0xde, 0xab, 0x75, - 0xe8, 0xf9, 0x5d, 0x9e, 0x82, 0xdb, 0xfa, 0xa0, 0x0e, 0x6e, 0xcc, 0x56, 0x98, 0x77, 0xb8, 0x12, - 0x56, 0x55, 0xd7, 0xb7, 0x71, 0xb3, 0xba, 0xc2, 0x56, 0x50, 0xaf, 0x3a, 0xad, 0xd7, 0x55, 0x71, - 0x79, 0x85, 0x75, 0x2d, 0xe8, 0x55, 0xd6, 0xf5, 0xb7, 0x53, 0xe1, 0xfb, 0xab, 0x89, 0xef, 0x5c, - 0x4f, 0x7c, 0xe7, 0xd7, 0xc4, 0x77, 0xbe, 0x4d, 0xfd, 0xda, 0xf5, 0xd4, 0xaf, 0xfd, 0x9c, 0xfa, - 0xb5, 0x8f, 0xc7, 0x49, 0x2a, 0xcf, 0x87, 0x31, 0xea, 0xf2, 0x0c, 0x5b, 0xe5, 0xc3, 0x3e, 0x89, - 0xc5, 0xec, 0x0f, 0xbe, 0x38, 0xc6, 0x97, 0xcb, 0x1f, 0x40, 0x39, 0x1e, 0x50, 0x11, 0x37, 0xf4, - 0x87, 0xea, 0xe5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x53, 0xa0, 0x7f, 0x25, 0x05, 0x00, + 0x90, 0xe8, 0x0c, 0x29, 0x2c, 0x10, 0x3b, 0x5c, 0x16, 0x6c, 0xb2, 0xb1, 0x58, 0xa1, 0x4a, 0xd5, + 0x38, 0x19, 0x5c, 0x8b, 0x78, 0x26, 0x78, 0x26, 0x4d, 0xb3, 0xe1, 0x0c, 0xac, 0xb8, 0x02, 0x57, + 0xe9, 0xb2, 0x4b, 0x56, 0x16, 0x4a, 0x6e, 0xe0, 0x13, 0xa0, 0xf9, 0x48, 0xe2, 0x80, 0x44, 0x93, + 0x55, 0x77, 0x89, 0xdf, 0xef, 0xfd, 0xdf, 0xc7, 0xff, 0xd9, 0xe0, 0x80, 0x8b, 0x8c, 0x8b, 0x54, + 0x60, 0xc9, 0xbf, 0x50, 0xf6, 0x99, 0x74, 0x25, 0xcf, 0xc7, 0xf8, 0xbc, 0x1d, 0x53, 0x49, 0xda, + 0x58, 0x5e, 0xa0, 0x41, 0xce, 0x25, 0x77, 0x1f, 0x5b, 0x0c, 0x55, 0x31, 0x64, 0x31, 0x6f, 0x2f, + 0xe1, 0x09, 0xd7, 0x20, 0x56, 0xbf, 0x4c, 0x8e, 0xe7, 0x77, 0x75, 0x12, 0x8e, 0x89, 0xa0, 0x73, + 0xc5, 0x2e, 0x4f, 0x99, 0x89, 0xc3, 0x3e, 0xb8, 0xdf, 0x11, 0xc9, 0x71, 0x4e, 0x89, 0xa4, 0xef, + 0x29, 0xe3, 0x99, 0xfb, 0x1c, 0x34, 0x04, 0x65, 0x3d, 0x9a, 0xb7, 0x9c, 0x27, 0xce, 0xb3, 0xcd, + 0x70, 0xb7, 0x2c, 0x82, 0xed, 0x31, 0xc9, 0xfa, 0x6f, 0xa1, 0x79, 0x0e, 0x23, 0x0b, 0xb8, 0x18, + 0x6c, 0x88, 0x61, 0xdc, 0x53, 0x69, 0xad, 0x5b, 0x1a, 0x7e, 0x50, 0x16, 0x41, 0xd3, 0xc2, 0x36, + 0x02, 0xa3, 0x39, 0x04, 0x4f, 0xc0, 0xfe, 0x72, 0xb5, 0x88, 0x8a, 0x01, 0x67, 0x82, 0xba, 0x21, + 0x68, 0x32, 0x3a, 0x3a, 0xd5, 0x93, 0x9d, 0x1a, 0x45, 0x53, 0xde, 0x2b, 0x8b, 0x60, 0xdf, 0x28, + 0xfe, 0x05, 0xc0, 0x68, 0x9b, 0xd1, 0xd1, 0x47, 0xf5, 0x40, 0x6b, 0xc1, 0x6f, 0xe0, 0x6e, 0x47, + 0x24, 0x9d, 0x94, 0xc9, 0x75, 0x86, 0xf8, 0x00, 0x1a, 0x24, 0xe3, 0x43, 0x26, 0xf5, 0x08, 0x5b, + 0x47, 0x8f, 0x90, 0x59, 0x19, 0x52, 0x2b, 0x9b, 0x6d, 0x17, 0x1d, 0xf3, 0x94, 0x85, 0x0f, 0x2f, + 0x8b, 0xa0, 0xb6, 0x50, 0x32, 0x69, 0x30, 0xb2, 0xf9, 0x70, 0x17, 0x34, 0x6d, 0xfd, 0xd9, 0x58, + 0xb6, 0xa5, 0x70, 0x98, 0xb3, 0x9b, 0x6c, 0x49, 0xd5, 0x9f, 0xb7, 0xf4, 0xc3, 0x31, 0x96, 0x9f, + 0x11, 0x96, 0xd0, 0x77, 0xbd, 0x2c, 0x5d, 0xab, 0xb5, 0xa7, 0xe0, 0x4e, 0xd5, 0xef, 0x9d, 0xb2, + 0x08, 0xee, 0x19, 0xd2, 0x7a, 0x62, 0xc2, 0x6e, 0x1b, 0x6c, 0x2a, 0xbb, 0x88, 0xd2, 0x6f, 0xd5, + 0x35, 0xbb, 0x57, 0x16, 0xc1, 0xce, 0xc2, 0x49, 0x1d, 0x82, 0xd1, 0x06, 0xa3, 0x23, 0xdd, 0x05, + 0x6c, 0x99, 0xe3, 0x58, 0xf4, 0x35, 0x6b, 0xf9, 0xe8, 0x67, 0x1d, 0xd4, 0x3b, 0x22, 0x71, 0xbf, + 0x82, 0xad, 0xea, 0xa5, 0xbe, 0x40, 0xff, 0x7b, 0x21, 0xd0, 0xf2, 0xa5, 0x79, 0xaf, 0xd7, 0xa1, + 0xe7, 0x77, 0x79, 0x02, 0x6e, 0xeb, 0x83, 0x3a, 0xb8, 0x36, 0x5b, 0x61, 0xde, 0xe1, 0x4a, 0x58, + 0x55, 0x5d, 0xdf, 0xc6, 0xf5, 0xea, 0x0a, 0x5b, 0x41, 0xbd, 0xea, 0xb4, 0x5e, 0x57, 0xc5, 0xe5, + 0x15, 0xd6, 0xb5, 0xa0, 0x57, 0x59, 0xd7, 0xbf, 0x4e, 0x85, 0xd1, 0xe5, 0xc4, 0x77, 0xae, 0x26, + 0xbe, 0xf3, 0x7b, 0xe2, 0x3b, 0xdf, 0xa7, 0x7e, 0xed, 0x6a, 0xea, 0xd7, 0x7e, 0x4d, 0xfd, 0xda, + 0xa7, 0x37, 0x49, 0x2a, 0xcf, 0x86, 0x31, 0xea, 0xf2, 0x0c, 0x5b, 0xe5, 0xc3, 0x3e, 0x89, 0xc5, + 0xec, 0x0f, 0x3e, 0x6f, 0xbf, 0xc4, 0x17, 0xcb, 0x5f, 0x40, 0x39, 0x1e, 0x50, 0x11, 0x37, 0xf4, + 0x97, 0xea, 0xd5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x37, 0x11, 0x83, 0x05, 0x26, 0x05, 0x00, 0x00, } diff --git a/x/txfees/client/cli/query.go b/x/txfees/client/cli/query.go index 1190f93a149..c6b61e119a9 100644 --- a/x/txfees/client/cli/query.go +++ b/x/txfees/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/txfees/client/cli/tx.go b/x/txfees/client/cli/tx.go index 476b1701491..641ae9d98ae 100644 --- a/x/txfees/client/cli/tx.go +++ b/x/txfees/client/cli/tx.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/txfees/handler.go b/x/txfees/handler.go index 2eb01c9052b..4ea5e538877 100644 --- a/x/txfees/handler.go +++ b/x/txfees/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func NewUpdateFeeTokenProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/txfees/keeper/feedecorator.go b/x/txfees/keeper/feedecorator.go index 1f4cb51ee1c..caa93cfee9a 100644 --- a/x/txfees/keeper/feedecorator.go +++ b/x/txfees/keeper/feedecorator.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper/txfee_filters" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper/txfee_filters" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/txfees/keeper/feedecorator_test.go b/x/txfees/keeper/feedecorator_test.go index 5faddf95259..1838a2c303d 100644 --- a/x/txfees/keeper/feedecorator_test.go +++ b/x/txfees/keeper/feedecorator_test.go @@ -9,8 +9,8 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func (suite *KeeperTestSuite) TestFeeDecorator() { diff --git a/x/txfees/keeper/feetokens.go b/x/txfees/keeper/feetokens.go index f1da6a3765f..0f532e3f139 100644 --- a/x/txfees/keeper/feetokens.go +++ b/x/txfees/keeper/feetokens.go @@ -2,7 +2,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/txfees/keeper/feetokens_test.go b/x/txfees/keeper/feetokens_test.go index 1dd945f1c00..74c296de67c 100644 --- a/x/txfees/keeper/feetokens_test.go +++ b/x/txfees/keeper/feetokens_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/genesis.go b/x/txfees/keeper/genesis.go index 858b6a3235a..9cd9cf00782 100644 --- a/x/txfees/keeper/genesis.go +++ b/x/txfees/keeper/genesis.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/gov.go b/x/txfees/keeper/gov.go index 8d2550b4843..38dcd27cc07 100644 --- a/x/txfees/keeper/gov.go +++ b/x/txfees/keeper/gov.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func (k Keeper) HandleUpdateFeeTokenProposal(ctx sdk.Context, p *types.UpdateFeeTokenProposal) error { diff --git a/x/txfees/keeper/grpc_query.go b/x/txfees/keeper/grpc_query.go index e2a017a710e..9a6626591c3 100644 --- a/x/txfees/keeper/grpc_query.go +++ b/x/txfees/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var _ types.QueryServer = Querier{} diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go index 6cb662b36a7..33721062fc9 100644 --- a/x/txfees/keeper/hooks.go +++ b/x/txfees/keeper/hooks.go @@ -3,9 +3,9 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/osmoutils" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" - txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) {} diff --git a/x/txfees/keeper/hooks_test.go b/x/txfees/keeper/hooks_test.go index 6b5f97b1ef8..e868b8022c9 100644 --- a/x/txfees/keeper/hooks_test.go +++ b/x/txfees/keeper/hooks_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var defaultPooledAssetAmount = int64(500) diff --git a/x/txfees/keeper/keeper.go b/x/txfees/keeper/keeper.go index 1c60dd2add8..54a14d51897 100644 --- a/x/txfees/keeper/keeper.go +++ b/x/txfees/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type Keeper struct { diff --git a/x/txfees/keeper/keeper_test.go b/x/txfees/keeper/keeper_test.go index 52f7420ec51..72acced6e3f 100644 --- a/x/txfees/keeper/keeper_test.go +++ b/x/txfees/keeper/keeper_test.go @@ -8,10 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - osmosisapp "github.com/osmosis-labs/osmosis/v7/app" + osmosisapp "github.com/osmosis-labs/osmosis/v10/app" - "github.com/osmosis-labs/osmosis/v7/app/apptesting" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type KeeperTestSuite struct { diff --git a/x/txfees/keeper/txfee_filters/arb_tx.go b/x/txfees/keeper/txfee_filters/arb_tx.go index 03a7fb80b10..800bfb62e62 100644 --- a/x/txfees/keeper/txfee_filters/arb_tx.go +++ b/x/txfees/keeper/txfee_filters/arb_tx.go @@ -1,7 +1,7 @@ package txfee_filters import ( - gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/module.go b/x/txfees/module.go index 5949982b711..e898172259f 100644 --- a/x/txfees/module.go +++ b/x/txfees/module.go @@ -16,9 +16,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v7/x/txfees/client/cli" - "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v7/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var ( diff --git a/x/txfees/module_test.go b/x/txfees/module_test.go index af76b0eec12..e1e2a880060 100644 --- a/x/txfees/module_test.go +++ b/x/txfees/module_test.go @@ -7,7 +7,7 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v7/app" + simapp "github.com/osmosis-labs/osmosis/v10/app" ) func TestSetBaseDenomOnInitBlock(t *testing.T) { diff --git a/x/txfees/types/expected_keepers.go b/x/txfees/types/expected_keepers.go index c8a3d2df789..9e2ae585cd8 100644 --- a/x/txfees/types/expected_keepers.go +++ b/x/txfees/types/expected_keepers.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) // SpotPriceCalculator defines the contract that must be fulfilled by a spot price calculator diff --git a/x/txfees/types/feetoken.pb.go b/x/txfees/types/feetoken.pb.go index e532700ac28..2d910c87b38 100644 --- a/x/txfees/types/feetoken.pb.go +++ b/x/txfees/types/feetoken.pb.go @@ -88,7 +88,7 @@ func init() { } var fileDescriptor_c50689857adfcfe0 = []byte{ - // 235 bytes of a gzipped FileDescriptorProto + // 236 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcd, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4b, 0x4d, 0x2d, 0xc9, 0xcf, 0x4e, 0xcd, 0xd3, 0x2b, 0x28, 0xca, 0x2f, @@ -98,12 +98,12 @@ var fileDescriptor_c50689857adfcfe0 = []byte{ 0x38, 0x9d, 0x04, 0x3e, 0xdd, 0x93, 0xe7, 0xa9, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x02, 0x0b, 0x2b, 0x05, 0x41, 0xa4, 0x85, 0xb4, 0xb8, 0xd8, 0x0a, 0xf2, 0xf3, 0x73, 0x3c, 0x5d, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x9c, 0x84, 0x3e, 0xdd, 0x93, 0xe7, 0x83, 0x28, 0x04, 0x89, 0xc7, 0x67, 0xa6, - 0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x7d, 0xe2, 0x91, 0x1c, + 0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, - 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x86, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, - 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0xe6, 0xfa, - 0x15, 0x30, 0x1f, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x5d, 0x6e, 0x0c, 0x08, 0x00, - 0x00, 0xff, 0xff, 0x6f, 0x91, 0x61, 0xbb, 0x10, 0x01, 0x00, 0x00, + 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x46, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, + 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x86, 0x06, + 0xfa, 0x15, 0x30, 0x2f, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x9d, 0x6e, 0x0c, 0x08, + 0x00, 0x00, 0xff, 0xff, 0x94, 0x93, 0x95, 0xe8, 0x11, 0x01, 0x00, 0x00, } func (this *FeeToken) Equal(that interface{}) bool { diff --git a/x/txfees/types/genesis.pb.go b/x/txfees/types/genesis.pb.go index 141fe5bb96e..3b13e04ea9c 100644 --- a/x/txfees/types/genesis.pb.go +++ b/x/txfees/types/genesis.pb.go @@ -85,7 +85,7 @@ func init() { } var fileDescriptor_4423c18e3d020b37 = []byte{ - // 235 bytes of a gzipped FileDescriptorProto + // 236 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, @@ -95,12 +95,12 @@ var fileDescriptor_4423c18e3d020b37 = []byte{ 0x24, 0x55, 0x48, 0x86, 0x8b, 0x33, 0x29, 0xb1, 0x38, 0x35, 0x25, 0x35, 0x2f, 0x3f, 0x57, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0x21, 0x20, 0xe4, 0xc2, 0xc5, 0x09, 0xd3, 0x5f, 0x2c, 0xc1, 0xa4, 0xc0, 0xac, 0xc1, 0x6d, 0xa4, 0xa0, 0x87, 0xdd, 0x59, 0x7a, 0x6e, 0xa9, 0xa9, 0x21, 0x20, - 0x85, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x34, 0x3a, 0x79, 0x9f, 0x78, 0x24, 0xc7, + 0x85, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x34, 0x3a, 0xf9, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, - 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, - 0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0x5c, 0xbf, - 0x02, 0xe6, 0xa3, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x3f, 0x8c, 0x01, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xdd, 0x30, 0x73, 0x62, 0x44, 0x01, 0x00, 0x00, + 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, + 0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x40, + 0xbf, 0x02, 0xe6, 0xa5, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x47, 0x8c, 0x01, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x95, 0x53, 0x23, 0xcd, 0x45, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/txfees/types/gov.pb.go b/x/txfees/types/gov.pb.go index 34add7f87d3..0cff1a6cc96 100644 --- a/x/txfees/types/gov.pb.go +++ b/x/txfees/types/gov.pb.go @@ -73,7 +73,7 @@ func init() { func init() { proto.RegisterFile("osmosis/txfees/v1beta1/gov.proto", fileDescriptor_2c4a51bafc82863d) } var fileDescriptor_2c4a51bafc82863d = []byte{ - // 311 bytes of a gzipped FileDescriptorProto + // 312 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0xaa, @@ -88,12 +88,12 @@ var fileDescriptor_2c4a51bafc82863d = []byte{ 0x98, 0x73, 0x24, 0x98, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0x14, 0xf4, 0xb0, 0x7b, 0x52, 0x0f, 0xe6, 0x3a, 0x27, 0x89, 0x13, 0xf7, 0xe4, 0x19, 0x3e, 0xdd, 0x93, 0x17, 0x80, 0x18, 0x9e, 0x96, 0x9a, 0x1a, 0x0f, 0x36, 0x40, 0x29, 0x08, 0x6e, 0x96, 0x15, 0x4f, 0xc7, 0x02, 0x79, 0x86, 0x19, 0x0b, - 0xe4, 0x19, 0x5e, 0x2c, 0x90, 0x67, 0x74, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, + 0xe4, 0x19, 0x5e, 0x2c, 0x90, 0x67, 0x74, 0xf2, 0x39, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, - 0xbd, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xb9, 0x7e, 0x05, 0x2c, 0x00, 0x4b, - 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xc1, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x40, - 0x95, 0x3f, 0xf6, 0xaf, 0x01, 0x00, 0x00, + 0x39, 0x86, 0x28, 0xa3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, + 0xbd, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xa1, 0x81, 0x7e, 0x05, 0x2c, 0x04, + 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xe1, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, + 0xc9, 0xf0, 0x09, 0x43, 0xb0, 0x01, 0x00, 0x00, } func (this *UpdateFeeTokenProposal) Equal(that interface{}) bool { diff --git a/x/txfees/types/query.pb.go b/x/txfees/types/query.pb.go index 7b45155d0e0..9beef390b32 100644 --- a/x/txfees/types/query.pb.go +++ b/x/txfees/types/query.pb.go @@ -389,44 +389,44 @@ func init() { var fileDescriptor_6cbc1b48c44dfdd6 = []byte{ // 611 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6b, 0x13, 0x4f, - 0x18, 0xc6, 0x33, 0xfd, 0xff, 0x53, 0xc8, 0x54, 0x8a, 0x0e, 0xb6, 0x8d, 0xab, 0x6c, 0xc2, 0xa0, - 0xa5, 0x54, 0xb2, 0x63, 0x12, 0x45, 0xf0, 0x66, 0x0c, 0x05, 0x11, 0xa4, 0xae, 0x9e, 0x7a, 0x59, - 0x76, 0x93, 0x37, 0x71, 0x69, 0x92, 0xd9, 0x66, 0x26, 0xa5, 0x41, 0xbc, 0xf8, 0x09, 0x04, 0xc5, - 0xaf, 0xe0, 0x49, 0x3f, 0x47, 0x8f, 0x05, 0x2f, 0xe2, 0x21, 0x48, 0xe2, 0x27, 0xc8, 0x27, 0x90, - 0x9d, 0x9d, 0xcd, 0xa6, 0x6d, 0x62, 0x9a, 0x53, 0xb2, 0xf3, 0x3e, 0xf3, 0xbc, 0xcf, 0xbb, 0xf3, - 0x9b, 0xc5, 0x94, 0x8b, 0x36, 0x17, 0xbe, 0x60, 0xf2, 0xa4, 0x01, 0x20, 0xd8, 0x71, 0xd1, 0x03, - 0xe9, 0x16, 0xd9, 0x51, 0x0f, 0xba, 0x7d, 0x2b, 0xe8, 0x72, 0xc9, 0xc9, 0xa6, 0xd6, 0x58, 0x91, - 0xc6, 0xd2, 0x1a, 0xe3, 0x66, 0x93, 0x37, 0xb9, 0x92, 0xb0, 0xf0, 0x5f, 0xa4, 0x36, 0xee, 0x34, - 0x39, 0x6f, 0xb6, 0x80, 0xb9, 0x81, 0xcf, 0xdc, 0x4e, 0x87, 0x4b, 0x57, 0xfa, 0xbc, 0x23, 0x74, - 0xd5, 0xd4, 0x55, 0xf5, 0xe4, 0xf5, 0x1a, 0xac, 0xde, 0xeb, 0x2a, 0x81, 0xae, 0xdf, 0x9b, 0x93, - 0xa7, 0x01, 0x20, 0xf9, 0x21, 0x68, 0x19, 0xdd, 0xc2, 0x1b, 0xaf, 0xc2, 0x84, 0x7b, 0x00, 0x6f, - 0xc2, 0x65, 0x61, 0xc3, 0x51, 0x0f, 0x84, 0xa4, 0x12, 0x6f, 0x5e, 0x2c, 0x88, 0x80, 0x77, 0x04, - 0x90, 0x03, 0x8c, 0x1b, 0x00, 0x8e, 0x72, 0x11, 0x59, 0x94, 0xff, 0x6f, 0x67, 0xad, 0x94, 0xb7, - 0x66, 0x8f, 0x66, 0xc5, 0xdb, 0x2b, 0xb7, 0x4e, 0x07, 0xb9, 0xd4, 0x78, 0x90, 0xbb, 0xd1, 0x77, - 0xdb, 0xad, 0x27, 0x34, 0x71, 0xa0, 0x76, 0xa6, 0x11, 0xf7, 0xa0, 0x55, 0x6c, 0xa8, 0xae, 0x55, - 0xe8, 0xf0, 0xf6, 0xeb, 0x80, 0xcb, 0xfd, 0xae, 0x5f, 0x03, 0x9d, 0x89, 0x6c, 0xe3, 0x74, 0x3d, - 0x2c, 0x64, 0x51, 0x1e, 0xed, 0x64, 0x2a, 0xd7, 0xc7, 0x83, 0xdc, 0xb5, 0xc8, 0x4e, 0x2d, 0x53, - 0x3b, 0x2a, 0xd3, 0x6f, 0x08, 0xdf, 0x9e, 0x69, 0xa3, 0x27, 0xd8, 0xc5, 0xab, 0x01, 0xe7, 0xad, - 0xe7, 0x55, 0x65, 0xf4, 0x7f, 0x85, 0x8c, 0x07, 0xb9, 0xf5, 0xc8, 0x28, 0x5c, 0x77, 0xfc, 0x3a, - 0xb5, 0xb5, 0x82, 0x78, 0x18, 0x8b, 0x80, 0x4b, 0x27, 0x08, 0x1d, 0xb2, 0x2b, 0xaa, 0xf1, 0xb3, - 0x70, 0x96, 0x5f, 0x83, 0xdc, 0x76, 0xd3, 0x97, 0x6f, 0x7b, 0x9e, 0x55, 0xe3, 0x6d, 0x56, 0x53, - 0x2f, 0x40, 0xff, 0x14, 0x44, 0xfd, 0x90, 0xc9, 0x7e, 0x00, 0xc2, 0xaa, 0x42, 0x2d, 0x99, 0x3a, - 0x71, 0xa2, 0x76, 0x46, 0xc4, 0xb9, 0xe8, 0x53, 0xbc, 0x95, 0xc4, 0xdd, 0x0f, 0xfb, 0xd6, 0x97, - 0x1d, 0x79, 0x0f, 0x67, 0x2f, 0x5b, 0x2c, 0x3f, 0xee, 0x84, 0x87, 0x8a, 0x2b, 0x40, 0x79, 0xc5, - 0x3c, 0xbc, 0xd4, 0x3c, 0x4c, 0x15, 0xb4, 0xfd, 0x43, 0x8c, 0x3d, 0x57, 0x80, 0x33, 0x9d, 0x73, - 0x23, 0x99, 0x39, 0xa9, 0x51, 0x3b, 0xe3, 0xc5, 0xbb, 0x4b, 0x9f, 0xd3, 0x38, 0xad, 0x0c, 0xc9, - 0x17, 0x84, 0x33, 0x13, 0xca, 0x48, 0x61, 0x1e, 0x49, 0x33, 0x31, 0x35, 0xac, 0xab, 0xca, 0xa3, - 0xb0, 0x74, 0xf7, 0xc3, 0x8f, 0x3f, 0x9f, 0x56, 0xee, 0x12, 0xca, 0xe6, 0xdf, 0x0f, 0x0d, 0x26, - 0xf9, 0x8e, 0xf0, 0xfa, 0x79, 0x82, 0x48, 0xe9, 0x9f, 0xed, 0x66, 0x52, 0x6b, 0x94, 0x97, 0xda, - 0xa3, 0x73, 0x96, 0x55, 0xce, 0x02, 0xb9, 0x3f, 0x2f, 0x67, 0x82, 0x92, 0xe3, 0xf5, 0xa3, 0xf7, - 0x4b, 0xbe, 0x22, 0xbc, 0x36, 0x05, 0x00, 0x61, 0x8b, 0x3b, 0x9f, 0xa3, 0xcd, 0x78, 0x70, 0xf5, - 0x0d, 0x3a, 0xe7, 0x23, 0x95, 0x93, 0x91, 0xc2, 0xbc, 0x9c, 0x2a, 0x99, 0xa3, 0x39, 0x63, 0xef, - 0xd4, 0xe3, 0x7b, 0x75, 0xe6, 0x13, 0x92, 0x16, 0x9c, 0xf9, 0x45, 0x14, 0x17, 0x9c, 0xf9, 0x25, - 0x40, 0x17, 0x9f, 0x79, 0x82, 0x68, 0xe5, 0xc5, 0xe9, 0xd0, 0x44, 0x67, 0x43, 0x13, 0xfd, 0x1e, - 0x9a, 0xe8, 0xe3, 0xc8, 0x4c, 0x9d, 0x8d, 0xcc, 0xd4, 0xcf, 0x91, 0x99, 0x3a, 0x28, 0x4e, 0x5d, - 0x76, 0xed, 0x53, 0x68, 0xb9, 0x9e, 0x98, 0x98, 0x1e, 0x3f, 0x66, 0x27, 0xb1, 0xb3, 0xba, 0xfb, - 0xde, 0xaa, 0xfa, 0xc6, 0x96, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x77, 0xe0, 0xbb, 0x37, 0x1c, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6f, 0x12, 0x4f, + 0x18, 0xc6, 0x99, 0xfe, 0xff, 0x34, 0x61, 0x6a, 0x1a, 0x9d, 0xd8, 0x16, 0x57, 0xb3, 0x90, 0x89, + 0x36, 0x4d, 0x0d, 0x3b, 0x05, 0xf4, 0xe2, 0x4d, 0x24, 0x4d, 0x4c, 0x8c, 0xa9, 0xab, 0xa7, 0x5e, + 0x36, 0xbb, 0xf0, 0x82, 0x9b, 0x02, 0xb3, 0x65, 0x86, 0xa6, 0xc4, 0x78, 0xf1, 0x13, 0x98, 0x68, + 0xfc, 0x0a, 0x9e, 0xf4, 0x73, 0xf4, 0xd8, 0xc4, 0x8b, 0xf1, 0x40, 0x0c, 0xf8, 0x09, 0xf8, 0x04, + 0x66, 0x67, 0x67, 0x59, 0xda, 0x82, 0x94, 0x13, 0xec, 0xbc, 0xcf, 0x3c, 0xef, 0xf3, 0xee, 0xfc, + 0x66, 0x31, 0xe5, 0xa2, 0xcd, 0x85, 0x2f, 0x98, 0x3c, 0x6d, 0x00, 0x08, 0x76, 0x52, 0xf4, 0x40, + 0xba, 0x45, 0x76, 0xdc, 0x83, 0x6e, 0xdf, 0x0a, 0xba, 0x5c, 0x72, 0xb2, 0xa9, 0x35, 0x56, 0xa4, + 0xb1, 0xb4, 0xc6, 0xb8, 0xdd, 0xe4, 0x4d, 0xae, 0x24, 0x2c, 0xfc, 0x17, 0xa9, 0x8d, 0x7b, 0x4d, + 0xce, 0x9b, 0x2d, 0x60, 0x6e, 0xe0, 0x33, 0xb7, 0xd3, 0xe1, 0xd2, 0x95, 0x3e, 0xef, 0x08, 0x5d, + 0x35, 0x75, 0x55, 0x3d, 0x79, 0xbd, 0x06, 0xab, 0xf7, 0xba, 0x4a, 0xa0, 0xeb, 0x0f, 0xe6, 0xe4, + 0x69, 0x00, 0x48, 0x7e, 0x04, 0x5a, 0x46, 0xb7, 0xf0, 0xc6, 0xab, 0x30, 0xe1, 0x3e, 0xc0, 0x9b, + 0x70, 0x59, 0xd8, 0x70, 0xdc, 0x03, 0x21, 0xa9, 0xc4, 0x9b, 0x97, 0x0b, 0x22, 0xe0, 0x1d, 0x01, + 0xe4, 0x10, 0xe3, 0x06, 0x80, 0xa3, 0x5c, 0x44, 0x16, 0xe5, 0xff, 0xdb, 0x59, 0x2b, 0xe5, 0xad, + 0xd9, 0xa3, 0x59, 0xf1, 0xf6, 0xca, 0x9d, 0xb3, 0x41, 0x2e, 0x35, 0x1e, 0xe4, 0x6e, 0xf5, 0xdd, + 0x76, 0xeb, 0x09, 0x4d, 0x1c, 0xa8, 0x9d, 0x69, 0xc4, 0x3d, 0x68, 0x15, 0x1b, 0xaa, 0x6b, 0x15, + 0x3a, 0xbc, 0xfd, 0x3a, 0xe0, 0xf2, 0xa0, 0xeb, 0xd7, 0x40, 0x67, 0x22, 0xdb, 0x38, 0x5d, 0x0f, + 0x0b, 0x59, 0x94, 0x47, 0x3b, 0x99, 0xca, 0xcd, 0xf1, 0x20, 0x77, 0x23, 0xb2, 0x53, 0xcb, 0xd4, + 0x8e, 0xca, 0xf4, 0x1b, 0xc2, 0x77, 0x67, 0xda, 0xe8, 0x09, 0x76, 0xf1, 0x6a, 0xc0, 0x79, 0xeb, + 0x79, 0x55, 0x19, 0xfd, 0x5f, 0x21, 0xe3, 0x41, 0x6e, 0x3d, 0x32, 0x0a, 0xd7, 0x1d, 0xbf, 0x4e, + 0x6d, 0xad, 0x20, 0x1e, 0xc6, 0x22, 0xe0, 0xd2, 0x09, 0x42, 0x87, 0xec, 0x8a, 0x6a, 0xfc, 0x2c, + 0x9c, 0xe5, 0xd7, 0x20, 0xb7, 0xdd, 0xf4, 0xe5, 0xdb, 0x9e, 0x67, 0xd5, 0x78, 0x9b, 0xd5, 0xd4, + 0x0b, 0xd0, 0x3f, 0x05, 0x51, 0x3f, 0x62, 0xb2, 0x1f, 0x80, 0xb0, 0xaa, 0x50, 0x4b, 0xa6, 0x4e, + 0x9c, 0xa8, 0x9d, 0x11, 0x71, 0x2e, 0xfa, 0x14, 0x6f, 0x25, 0x71, 0x0f, 0xc2, 0xbe, 0xf5, 0x65, + 0x47, 0xde, 0xc7, 0xd9, 0xab, 0x16, 0xcb, 0x8f, 0x3b, 0xe1, 0xa1, 0xe2, 0x0a, 0x50, 0x5e, 0x31, + 0x0f, 0x2f, 0x35, 0x0f, 0x53, 0x05, 0x6d, 0xff, 0x08, 0x63, 0xcf, 0x15, 0xe0, 0x4c, 0xe7, 0xdc, + 0x48, 0x66, 0x4e, 0x6a, 0xd4, 0xce, 0x78, 0xf1, 0xee, 0xd2, 0xe7, 0x34, 0x4e, 0x2b, 0x43, 0xf2, + 0x05, 0xe1, 0xcc, 0x84, 0x32, 0x52, 0x98, 0x47, 0xd2, 0x4c, 0x4c, 0x0d, 0xeb, 0xba, 0xf2, 0x28, + 0x2c, 0xdd, 0xfd, 0xf0, 0xe3, 0xcf, 0xa7, 0x95, 0xfb, 0x84, 0xb2, 0xf9, 0xf7, 0x43, 0x83, 0x49, + 0xbe, 0x23, 0xbc, 0x7e, 0x91, 0x20, 0x52, 0xfa, 0x67, 0xbb, 0x99, 0xd4, 0x1a, 0xe5, 0xa5, 0xf6, + 0xe8, 0x9c, 0x65, 0x95, 0xb3, 0x40, 0x1e, 0xce, 0xcb, 0x99, 0xa0, 0xe4, 0x78, 0xfd, 0xe8, 0xfd, + 0x92, 0xaf, 0x08, 0xaf, 0x4d, 0x01, 0x40, 0xd8, 0xe2, 0xce, 0x17, 0x68, 0x33, 0xf6, 0xae, 0xbf, + 0x41, 0xe7, 0x7c, 0xac, 0x72, 0x32, 0x52, 0x98, 0x97, 0x53, 0x25, 0x73, 0x34, 0x67, 0xec, 0x9d, + 0x7a, 0x7c, 0xaf, 0xce, 0x7c, 0x42, 0xd2, 0x82, 0x33, 0xbf, 0x8c, 0xe2, 0x82, 0x33, 0xbf, 0x02, + 0xe8, 0xe2, 0x33, 0x4f, 0x10, 0xad, 0xbc, 0x38, 0x1b, 0x9a, 0xe8, 0x7c, 0x68, 0xa2, 0xdf, 0x43, + 0x13, 0x7d, 0x1c, 0x99, 0xa9, 0xf3, 0x91, 0x99, 0xfa, 0x39, 0x32, 0x53, 0x87, 0xa5, 0xa9, 0xcb, + 0xae, 0x7d, 0x0a, 0x2d, 0xd7, 0x13, 0x13, 0xd3, 0x93, 0xe2, 0x1e, 0x3b, 0x8d, 0xad, 0xd5, 0xe5, + 0xf7, 0x56, 0xd5, 0x47, 0xb6, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xb3, 0xd1, 0x75, 0xfb, 0x1d, 0x06, 0x00, 0x00, }