Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove exit fee param #4440

Closed
wants to merge 29 commits into from
Closed

remove exit fee param #4440

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f84fce3
remove exit fee param
hieuvubk Feb 27, 2023
eac9f6f
remove exit-fee in e2e
hieuvubk Feb 27, 2023
12583ff
fix proto
hieuvubk Feb 28, 2023
7e8f7c0
create old proto for upgrade
hieuvubk Feb 28, 2023
bc5de98
update proto for old types
hieuvubk Mar 9, 2023
536f69a
codec
hieuvubk Mar 9, 2023
f0c4d6a
implement poolI interface
hieuvubk Mar 9, 2023
a1f0370
convert from old => new types
hieuvubk Mar 9, 2023
1a90863
migrate store
hieuvubk Mar 9, 2023
9483832
upgrade handler
hieuvubk Mar 9, 2023
d88c9c6
test
hieuvubk Mar 9, 2023
22dbceb
fix e2e
hieuvubk Mar 9, 2023
3148b6c
lint
hieuvubk Mar 9, 2023
ea88524
fix test: change hex string for new types
hieuvubk Mar 9, 2023
267c0f8
try to use reversed
hieuvubk Mar 13, 2023
c956971
testing
hieuvubk Mar 13, 2023
59d74c9
set up test
hieuvubk Mar 13, 2023
441196f
testing
hieuvubk Mar 13, 2023
3a05a49
testing
hieuvubk Mar 13, 2023
8455809
test 3 pools
hieuvubk Mar 13, 2023
0bf6f3f
test passed
hieuvubk Mar 13, 2023
11d4f34
fix proto
hieuvubk Mar 13, 2023
2db6074
Merge branch 'main' into remove_exit_fee
hieuvubk Mar 13, 2023
96780d9
merge main
hieuvubk Mar 21, 2023
a15654a
format
hieuvubk Mar 21, 2023
b040201
Update go.mod
hieuvubk Mar 21, 2023
456f19f
remove all exitfee
hieuvubk Mar 27, 2023
292d853
merge main
hieuvubk Mar 27, 2023
464cde3
fix upgrade handler
hieuvubk Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/apptesting/gamm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,13 @@ func (s *KeeperTestHelper) PrepareBalancerPoolWithCoinsAndWeights(coins sdk.Coin

return s.PrepareCustomBalancerPool(poolAssets, balancer.PoolParams{
SwapFee: sdk.ZeroDec(),
ExitFee: sdk.ZeroDec(),
})
}

// PrepareBalancerPool returns a Balancer pool's pool-ID with pool params set in PrepareBalancerPoolWithPoolParams.
func (s *KeeperTestHelper) PrepareBalancerPool() uint64 {
poolId := s.PrepareBalancerPoolWithPoolParams(balancer.PoolParams{
SwapFee: sdk.NewDec(0),
ExitFee: sdk.NewDec(0),
})

spotPrice, err := s.App.GAMMKeeper.CalculateSpotPrice(s.Ctx, poolId, "foo", "bar")
Expand Down Expand Up @@ -117,7 +115,6 @@ func (s *KeeperTestHelper) PrepareBasicStableswapPool() uint64 {

params := stableswap.PoolParams{
SwapFee: sdk.NewDec(0),
ExitFee: sdk.NewDec(0),
}

msg := stableswap.NewMsgCreateStableswapPool(s.TestAccs[0], params, DefaultStableswapLiquidity, []uint64{}, "")
Expand All @@ -132,7 +129,6 @@ func (s *KeeperTestHelper) PrepareImbalancedStableswapPool() uint64 {

params := stableswap.PoolParams{
SwapFee: sdk.NewDec(0),
ExitFee: sdk.NewDec(0),
}

msg := stableswap.NewMsgCreateStableswapPool(s.TestAccs[0], params, ImbalancedStableswapLiquidity, []uint64{1, 1, 1}, "")
Expand Down
1 change: 0 additions & 1 deletion app/apptesting/test_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ func (s *KeeperTestHelper) SetupGammPoolsWithBondDenomMultiplier(multipliers []s

poolParams := balancer.PoolParams{
SwapFee: sdk.NewDecWithPrec(1, 2),
ExitFee: sdk.NewDecWithPrec(1, 2),
}
msg := balancer.NewMsgCreateBalancerPool(acc1, poolParams, poolAssets, defaultFutureGovernor)

Expand Down
1 change: 1 addition & 0 deletions app/upgrades/v15/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const UpgradeName = "v15"
const stOSMO_OSMOPoolId = 833
const stJUNO_JUNOPoolId = 817
const stSTARS_STARSPoolId = 810
var exitFeePools = []uint64{553, 596, 555, 905, 597, 802, 654, 595, 696, 551, 552, 554, 652, 655, 657, 797}

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
Expand Down
4 changes: 4 additions & 0 deletions app/upgrades/v15/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ func MigrateBalancerPoolToSolidlyStable(ctx sdk.Context, gammKeeper *gammkeeper.
func SetRateLimits(ctx sdk.Context, accountKeeper *authkeeper.AccountKeeper, rateLimitingICS4Wrapper *ibcratelimit.ICS4Wrapper, wasmKeeper *wasmkeeper.Keeper) {
setRateLimits(ctx, accountKeeper, rateLimitingICS4Wrapper, wasmKeeper)
}

func RemoveExitFee(ctx sdk.Context, gammKeeper gammkeeper.Keeper, poolsWithExitFee []uint64) {
removeExitFee(ctx, gammKeeper, poolsWithExitFee)
}
40 changes: 34 additions & 6 deletions app/upgrades/v15/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package v15_test

import (
"encoding/hex"
"fmt"
"os"
"reflect"
"testing"
// "time"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
Expand All @@ -22,6 +24,9 @@ import (
gamm "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
balancer "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
balancertypes "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
// oldbalancer "github.com/osmosis-labs/osmosis/v15/x/gamm/v2types/balancer"
// oldstableswap "github.com/osmosis-labs/osmosis/v15/x/gamm/v2types/stableswap"
poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
)

Expand Down Expand Up @@ -51,9 +56,7 @@ func (suite *UpgradeTestSuite) TestMigrateNextPoolIdAndCreatePool() {
expectedNextPoolId uint64 = 1
)

var (
gammKeeperType = reflect.TypeOf(&gamm.Keeper{})
)
gammKeeperType := reflect.TypeOf(&gamm.Keeper{})

ctx := suite.Ctx
gammKeeper := suite.App.GAMMKeeper
Expand Down Expand Up @@ -101,13 +104,11 @@ func (suite *UpgradeTestSuite) TestMigrateBalancerToStablePools() {

// Create the balancer pool
swapFee := sdk.MustNewDecFromStr("0.003")
exitFee := sdk.MustNewDecFromStr("0.025")
poolID, err := suite.App.PoolManagerKeeper.CreatePool(
suite.Ctx,
balancer.NewMsgCreateBalancerPool(suite.TestAccs[0],
balancer.PoolParams{
SwapFee: swapFee,
ExitFee: exitFee,
},
[]balancertypes.PoolAsset{
{
Expand Down Expand Up @@ -245,7 +246,6 @@ func (suite *UpgradeTestSuite) TestSetRateLimits() {
// This is the last one. If the others failed the upgrade would've panicked before adding this one
state, err = suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1"}}`))
suite.Require().Greaterf(len(state), 0, "state should not be empty")

}

func (suite *UpgradeTestSuite) validateCons(coinsA, coinsB sdk.Coins) {
Expand All @@ -256,3 +256,31 @@ func (suite *UpgradeTestSuite) validateCons(coinsA, coinsB sdk.Coins) {
osmoassert.DecApproxEq(suite.T(), coinBAmount.ToDec(), coinA.Amount.ToDec(), sdk.NewDec(2))
}
}

func (suite *UpgradeTestSuite) TestRemoveExitFee() {
suite.SetupTest() // reset

store := suite.Ctx.KVStore(suite.App.GAMMKeeper.GetStoreKey(suite.Ctx))

// Set up balancer pool 2 with zero exit fee
pool2Bz, err := hex.DecodeString("0a1a2f6f736d6f7369732e67616d6d2e763162657461312e506f6f6c12db010a3f6f736d6f316d773061633672776c70357238776170776b337a73366732396838666373637871616b647a7739656d6b6e65366338776a70397130743376387410011a260a113130303030303030303030303030303030121131303030303030303030303030303030302a240a0b67616d6d2f706f6f6c2f311215313030303030303030303030303030303030303030321c0a0c0a0362617212053130303030120c313037333734313832343030321c0a0c0a03666f6f12053130303030120c3130373337343138323430303a0c323134373438333634383030")
store.Set(gammtypes.GetKeyPrefixPools(1), pool2Bz)

// Set up balancer pool 553 with non zero exit fee
pool553Bz, err := hex.DecodeString("0a1a2f6f736d6f7369732e67616d6d2e763162657461312e506f6f6c12de010a3f6f736d6f316d3830666e71767673643833776538676e68393938726535356a71386371326d646b6363636c716d7571773878706d36396167736d386666643610a9041a260a113235303030303030303030303030303030121132353030303030303030303030303030302a260a0d67616d6d2f706f6f6c2f3535331215313030303030303030303030303030303030303030321c0a0c0a0362617212053130303030120c313037333734313832343030321c0a0c0a03666f6f12053130303030120c3130373337343138323430303a0c323134373438333634383030")
store.Set(gammtypes.GetKeyPrefixPools(553), pool553Bz)

// Set up stableswap pool 596 with non zero exit fee
pool596Bz, err := hex.DecodeString("0a302f6f736d6f7369732e67616d6d2e706f6f6c6d6f64656c732e737461626c65737761702e763162657461312e506f6f6c12b4010a3f6f736d6f316a747a6b7a32333833636567676138707a7137617a6d377470336c63757465703935757270767571787a3378383573667077377373617170633510d4041a260a113130303030303030303030303030303030121131303030303030303030303030303030302a260a0d67616d6d2f706f6f6c2f3539361215313030303030303030303030303030303030303030320c0a0362617212053130303030320c0a03666f6f120531303030303a020101")
store.Set(gammtypes.GetKeyPrefixPools(596), pool596Bz)

v15.RemoveExitFee(suite.Ctx, *suite.App.GAMMKeeper, []uint64{553, 596})

bz := store.Get(gammtypes.GetKeyPrefixPools(1))
pool1, err := suite.App.GAMMKeeper.UnmarshalPool(bz)
suite.Require().NoError(err)
suite.Require().NotNil(pool1)

suite.Require().True(!store.Has(gammtypes.GetKeyPrefixPools(553)))
suite.Require().True(!store.Has(gammtypes.GetKeyPrefixPools(596)))
}
21 changes: 20 additions & 1 deletion app/upgrades/v15/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package v15

import (
"fmt"

packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"

poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
Expand Down Expand Up @@ -47,6 +49,13 @@ func CreateUpgradeHandler(
// Instead,it is moved to poolmanager.
migrateNextPoolId(ctx, keepers.GAMMKeeper, keepers.PoolManagerKeeper)

removeExitFee(ctx, *keepers.GAMMKeeper, exitFeePools)

// N.B.: this is done to avoid initializing genesis for gamm module.
// Otherwise, it would overwrite migrations with InitGenesis().
// See RunMigrations() for details.
fromVM[gammtypes.ModuleName] = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only needed for newly added modules

Suggested change
// N.B.: this is done to avoid initializing genesis for gamm module.
// Otherwise, it would overwrite migrations with InitGenesis().
// See RunMigrations() for details.
fromVM[gammtypes.ModuleName] = 0


// N.B.: this is done to avoid initializing genesis for poolmanager module.
// Otherwise, it would overwrite migrations with InitGenesis().
// See RunMigrations() for details.
Expand Down Expand Up @@ -83,6 +92,7 @@ func migrateBalancerPoolsToSolidlyStable(ctx sdk.Context, gammKeeper *gammkeeper
// migrate stOSMO_OSMOPoolId, stJUNO_JUNOPoolId, stSTARS_STARSPoolId
pools := []uint64{stOSMO_OSMOPoolId, stJUNO_JUNOPoolId, stSTARS_STARSPoolId}
for _, poolId := range pools {
fmt.Println("poolId", poolId)
migrateBalancerPoolToSolidlyStable(ctx, gammKeeper, poolmanagerKeeper, bankKeeper, poolId)
}
}
Expand All @@ -97,7 +107,7 @@ func migrateBalancerPoolToSolidlyStable(ctx sdk.Context, gammKeeper *gammkeeper.
// initialize the stableswap pool
stableswapPool, err := stableswap.NewStableswapPool(
poolId,
stableswap.PoolParams{SwapFee: balancerPool.GetSwapFee(ctx), ExitFee: balancerPool.GetExitFee(ctx)},
stableswap.PoolParams{SwapFee: balancerPool.GetSwapFee(ctx)},
balancerPool.GetTotalPoolLiquidity(ctx),
[]uint64{1, 1},
"osmo1k8c2m5cn322akk5wy8lpt87dd2f4yh9afcd7af", // Stride Foundation 2/3 multisig
Expand Down Expand Up @@ -286,3 +296,12 @@ func registerOsmoIonMetadata(ctx sdk.Context, bankKeeper bankkeeper.Keeper) {
bankKeeper.SetDenomMetaData(ctx, uosmoMetadata)
bankKeeper.SetDenomMetaData(ctx, uionMetadata)
}

func removeExitFee(ctx sdk.Context, gammKeeper gammkeeper.Keeper, poolsWithExitFee []uint64) {
for _, poolId := range poolsWithExitFee {
err := gammKeeper.DeletePool(ctx, poolId)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we deleting these pools? The pools should stay, only the exit fee setting is removed

if err != nil {
panic(err)
}
}
}
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ require (
github.com/mattn/go-sqlite3 v1.14.16
github.com/ory/dockertest/v3 v3.9.1
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230316203321-2edd49875f80
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230317232332-81bd3c5ef0c2
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230313084619-8d291c1d9813
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230316203321-2edd49875f80
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230321051856-a15654a06c9f
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230321051856-a15654a06c9f
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230321051856-a15654a06c9f
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230321051856-a15654a06c9f
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.5.0
Expand Down
18 changes: 8 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,16 +933,14 @@ github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20230313061712-4f857c6a941a h1:ycdL
github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20230313061712-4f857c6a941a/go.mod h1:rud0OaBIuq3+qOqtwT4SR7Q7iSzRp7w41fjninTjfnQ=
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230316203321-2edd49875f80 h1:MqSb3Q5Uqb2r3PcyijgFL0lcIe57PqncqyfkRtyyn6E=
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230316203321-2edd49875f80/go.mod h1:PT796t7vS3STUWYikgwzY9e7jhLo0N/hwZf4R6haj0o=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230316203321-2edd49875f80 h1:p/+OkuP3fvSK6UvUxeaX6JirBMhs2yveDmT9Vi80Je0=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230316203321-2edd49875f80/go.mod h1:spcwVLt51T9NAUpFb+W0UKO7e9mwF5K/hc3nTrmGoP4=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230317232332-81bd3c5ef0c2 h1:syLNakfGKE9SjReHzcE8B0vWaykxKeno10uOyHi+0aI=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230317232332-81bd3c5ef0c2/go.mod h1:spcwVLt51T9NAUpFb+W0UKO7e9mwF5K/hc3nTrmGoP4=
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230313084619-8d291c1d9813 h1:OVT8hqFET8DkAeiSUs5h2nTg1uZFU6kPRP2sDWzVm/o=
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230313084619-8d291c1d9813/go.mod h1:lJebPe8cmSTwXXuWmgSNc1S4Bobz9g3x05ZL4igbAAI=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230316203321-2edd49875f80 h1:8gZdQsLkU0XOJ43xlzr1ig9fTVqgdZcoGbLL0ZnUzZs=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230316203321-2edd49875f80/go.mod h1:M8MLeBNbbG6qB5/2B5RUPTvqhsNaG0XagqdQfk/lVfY=
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230321051856-a15654a06c9f h1:DD7hL/KEy0pg/2y+dVdi54MI/zULp9SJYL/FyyD9hyw=
github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230321051856-a15654a06c9f/go.mod h1:PT796t7vS3STUWYikgwzY9e7jhLo0N/hwZf4R6haj0o=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230321051856-a15654a06c9f h1:5/xxQ05neDMbdwZtpzs+u29wNlprQ7PHoquFSlxGsww=
github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230321051856-a15654a06c9f/go.mod h1:spcwVLt51T9NAUpFb+W0UKO7e9mwF5K/hc3nTrmGoP4=
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230321051856-a15654a06c9f h1:5QL4c8+zZyaf/P7tGXJ+q5AwsjW9d73cW9+eeMXcV6U=
github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230321051856-a15654a06c9f/go.mod h1:lJebPe8cmSTwXXuWmgSNc1S4Bobz9g3x05ZL4igbAAI=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230321051856-a15654a06c9f h1:KhTDnk6xiGL/36Kbgn85cTnlX300R4QE00zqj2JwicU=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230321051856-a15654a06c9f/go.mod h1:M8MLeBNbbG6qB5/2B5RUPTvqhsNaG0XagqdQfk/lVfY=
github.com/osmosis-labs/wasmd v0.30.0-osmo-v15 h1:vjbzq9ta/KmQwUM6PcRmrBJuDwILgLbV4POypC1Uhn8=
github.com/osmosis-labs/wasmd v0.30.0-osmo-v15/go.mod h1:5fDYJyMXBq6u2iuHqqOTYiZ5NitIOeIW5k7qEXqbwJE=
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
Expand Down
6 changes: 1 addition & 5 deletions proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,7 @@ message PoolParams {
(gogoproto.moretags) = "yaml:\"swap_fee\"",
(gogoproto.nullable) = false
];
string exit_fee = 2 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.moretags) = "yaml:\"exit_fee\"",
(gogoproto.nullable) = false
];
reserved 2;
SmoothWeightChangeParams smooth_weight_change_params = 3 [
(gogoproto.moretags) = "yaml:\"smooth_weight_change_params\"",
(gogoproto.nullable) = true
Expand Down
6 changes: 1 addition & 5 deletions proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ message PoolParams {
(gogoproto.moretags) = "yaml:\"swap_fee\"",
(gogoproto.nullable) = false
];
string exit_fee = 2 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.moretags) = "yaml:\"exit_fee\"",
(gogoproto.nullable) = false
];
reserved 2;
}

// Pool is the stableswap Pool struct
Expand Down
1 change: 0 additions & 1 deletion scripts/setup_superfluid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# "weights": "5stake,5uosmo",
# "initial-deposit": "1000000stake,1000000uosmo",
# "swap-fee": "0.01",
# "exit-fee": "0.01",
# "future-governor": "168h"
# }

Expand Down
1 change: 0 additions & 1 deletion scripts/upgrade/upgrade_lockup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Create pool.json
"weights": "1stake,1valtoken",
"initial-deposit": "100stake,20valtoken",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": "168h"
}
```
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/configurer/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ func (uc *UpgradeConfigurer) CreatePreUpgradeState() error {
chainA.SendIBC(chainB, chainB.NodeConfigs[0].PublicAddress, initialization.StakeToken)
chainB.SendIBC(chainA, chainA.NodeConfigs[0].PublicAddress, initialization.StakeToken)

config.PreUpgradePoolId = chainANode.CreateBalancerPool("pool1A.json", initialization.ValidatorWalletName)
config.PreUpgradePoolId = chainANode.CreateBalancerPool("pool1A-legacy.json", initialization.ValidatorWalletName)
poolShareDenom := fmt.Sprintf("gamm/pool/%d", config.PreUpgradePoolId)
chainBNode.CreateBalancerPool("pool1B.json", initialization.ValidatorWalletName)
chainBNode.CreateBalancerPool("pool1B-legacy.json", initialization.ValidatorWalletName)
config.PreUpgradeStableSwapPoolId = chainANode.CreateStableswapPool("stablePool.json", initialization.ValidatorWalletName)
chainBNode.CreateStableswapPool("stablePool.json", initialization.ValidatorWalletName)

Expand Down
1 change: 0 additions & 1 deletion tests/e2e/scripts/geometricPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "1uosmo,1stake",
"initial-deposit": "1000000uosmo,2000000stake",
"swap-fee": "0",
"exit-fee": "0",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/ibcDenomPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "5ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,5uosmo",
"initial-deposit": "499404ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,500000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/nativeDenomPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "5uosmo,5stake",
"initial-deposit": "499404uosmo,500000stake",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/nativeDenomThreeAssetPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "5stake,5uion,5uosmo",
"initial-deposit": "10000000stake,1000000uion,20000000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": ""
}
7 changes: 7 additions & 0 deletions tests/e2e/scripts/pool1A-legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"weights": "5ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518,5uosmo",
"initial-deposit": "499404ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518,500000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/pool1A.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "5ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518,5uosmo",
"initial-deposit": "499404ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518,500000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e2e is failing because this is removed.

Basically, it tries to create a pool for pre-upgrade Osmosis (v14) that still has and expects this parameter.

I suggest copying this file and naming it pool1A-legacy.json and using it in:

osmosis/tests/e2e/configurer/upgrade.go

Line 128 in ae97cec

config.PreUpgradePoolId = chainANode.CreateBalancerPool("pool1A.json", initialization.ValidatorWalletName)

Also, please do the same for pool1B.json. Please create an issue to track the removal of these legacy files later

"future-governor": ""
}
7 changes: 7 additions & 0 deletions tests/e2e/scripts/pool1B-legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"weights": "5ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,5uosmo",
"initial-deposit": "499404ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,500000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.0",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/pool1B.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "5ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,5uosmo",
"initial-deposit": "499404ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878,500000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/protorevPool1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "1ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC,1uosmo",
"initial-deposit": "18986995439401ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC,191801648570uosmo",
"swap-fee": "0.002",
"exit-fee": "0.0",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/protorevPool2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "1ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0,1ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC",
"initial-deposit": "72765460003038ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0,596032233203ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC",
"swap-fee": "0.00535",
"exit-fee": "0.0",
"future-governor": ""
}
1 change: 0 additions & 1 deletion tests/e2e/scripts/protorevPool3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"weights": "1ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0,1uosmo",
"initial-deposit": "165624820984787ibc/0EF15DF2F02480ADE0BB6E85D9EBB5DAEA2836D3860E9F97F9AADE4F57A31AA0,13901565323uosmo",
"swap-fee": "0.002",
"exit-fee": "0.0",
"future-governor": ""
}
2 changes: 0 additions & 2 deletions tests/ibc-hooks/ibc_middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,6 @@ func (suite *HooksTestSuite) SetupPools(chainName Chain, multipliers []sdk.Dec)

poolParams := balancer.PoolParams{
SwapFee: sdk.NewDecWithPrec(1, 2),
ExitFee: sdk.NewDecWithPrec(1, 2),
}
msg := balancer.NewMsgCreateBalancerPool(acc1, poolParams, poolAssets, defaultFutureGovernor)

Expand Down Expand Up @@ -1212,7 +1211,6 @@ func (suite *HooksTestSuite) CreateIBCPoolOnChainB() {

poolParams := balancer.PoolParams{
SwapFee: sdk.NewDecWithPrec(1, 2),
ExitFee: sdk.NewDecWithPrec(1, 2),
}
msg := balancer.NewMsgCreateBalancerPool(acc1, poolParams, poolAssets, defaultFutureGovernor)

Expand Down
1 change: 0 additions & 1 deletion tests/ibc-hooks/test_crosschain_swaps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ cat >sample_pool.json <<EOF
"weights": "1${DENOM},1uosmo",
"initial-deposit": "1000000${DENOM},1000000uosmo",
"swap-fee": "0.01",
"exit-fee": "0.01",
"future-governor": "168h"
}
EOF
Expand Down
Loading