[E2E] Create stableswap and cl pools #4175

phamminh0811 · 2023-01-31T13:05:55Z

Closes: #3742

What is the purpose of the change

This pull request add CreateStableSwapPool function to e2e test and also create stableswap and CL pools to setup test

Testing and Verifying

This change is already covered by existing tests.

Documentation and Release Note

Does this pull request introduce a new feature or user-facing behavior changes? (yes / no)
Is a relevant changelog entry added to the Unreleased section in CHANGELOG.md? (yes / no)
How is the feature or change documented? (not applicable / specification (x/<module>/spec/) / Osmosis docs repo / not documented)

tests/e2e/configurer/chain/commands.go

tests/e2e/configurer/upgrade.go

delete redundant Co-authored-by: Roman <[email protected]>

…com/notional-labs/osmosis into minh/create-stableswap-and-cl-pools

tests/e2e/scripts/stablePool.json

pysel · 2023-02-01T14:34:56Z

There is no need to commit rate_limiter.wasm, this file is generated when running e2e, @phamminh0811, could you please remove it?

…com/notional-labs/osmosis into minh/create-stableswap-and-cl-pools

pysel

LGTM when comments addressed. Please, reset rate_limiter.wasm to the commit of development:

git checkout <latest main commit hash> -- <path to rate limiter>

tests/e2e/scripts/stablePool.json

phamminh0811 · 2023-02-03T04:48:22Z

LGTM when comments addressed. Please, reset rate_limiter.wasm to the commit of development:
git checkout <latest main commit hash> -- <path to rate limiter>

seems like this wasm file is deleted from main branch since this commit #4208
should we reset them?

pysel · 2023-02-03T15:23:06Z

LGTM when comments addressed. Please, reset rate_limiter.wasm to the commit of development:
git checkout <latest main commit hash> -- <path to rate limiter>
seems like this wasm file is deleted from main branch since this commit #4208 should we reset them?

I see, SG, I think then you may merge main to this PR and the issue is solved! Lmk when this is ready!

tests/e2e/scripts/stablePool.json

tests/e2e/configurer/chain/commands.go

Co-authored-by: Ruslan Akhtariev <[email protected]>

pysel

LGTM! The only thing is rate_limiter.wasm file. Can you please pull changes from main, I think it should be gone then?

tests/e2e/e2e_test.go

…post upgrade

p0mvn · 2023-02-23T21:35:45Z

tests/e2e/configurer/config/constants.go

@@ -35,4 +35,7 @@ var (
 	// creation in case more pools are added to genesis
 	// in the future
 	PreUpgradePoolId uint64 = 2
+	// Stableswap pool is created after balance pool,
+	// so the pool id should be 3.
+	PreUpgradeStableSwapPoolId uint64 = 3


This has changed since #4384

Let's make sure that we are not hard-coding this value. Instead, let's get the resulting pool id from CreateStableSwapPool and persist it until we reach TestStableSwapPostUpgrade

Can you please make a similar update for PreUpgradePoolId?

We do something similar with wallet creation where we set it pre-upgrade here:

osmosis/tests/e2e/configurer/upgrade.go

Lines 159 to 163 in 7158199

config.StrideMigrateWallet = chainANode.CreateWalletAndFund(config.StrideMigrateWallet, []string{

fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StOsmoDenom),

fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StJunoDenom),

fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StStarsDenom),

})

and then use here in tests:

osmosis/tests/e2e/e2e_test.go

Line 1116 in 7158199

node.BankSend(token, initialization.ValidatorWalletName, config.StrideMigrateWallet)

We should have similar logic for pool ids because now we create pools with ids 1 to 833 in genesis. So your stabelswap pool number is likely to be 835 or so

p0mvn · 2023-02-27T01:57:28Z

Hi @phamminh0811 . Do you have any updates here?

p0mvn

LGTM nice work

p0mvn · 2023-03-06T16:03:29Z

Hi @phamminh0811 . Can you please resolve conflicts here? Let's get this in

phamminh0811 · 2023-03-10T02:49:53Z

hi @p0mvn , I have resolved those conflicts, please check it

p0mvn

Thank you

go.work.sum

p0mvn

LGTM thank you

* Create stableswap pools and CL pools * Refactor code to make sure e2e test upgrading run well * Update tests/e2e/configurer/chain/commands.go delete redundant Co-authored-by: Roman <[email protected]> * Remove CL pool and change stable token denom * renome debug bin * Remove rate limiter * resolve compile osmosis amd64 for linux error * resolve conflict * Update stablepool Co-authored-by: Ruslan Akhtariev <[email protected]> * update create function name Co-authored-by: Ruslan Akhtariev <[email protected]> * rename create stableswap function * add rate_limiter.wasm * Update whitespace error * add some logic to execute a swap * update wasm file * Add stableswap pool test to e2e * Change TestStableSwapPostUpgrade to try swapping the pool created in post upgrade * avoid hard code on e2e test * fix conflict * Delete go.work.sum --------- Co-authored-by: Roman <[email protected]> Co-authored-by: Ruslan Akhtariev <[email protected]> (cherry picked from commit c99200b) # Conflicts: # tests/e2e/e2e_test.go

Co-authored-by: Roman <[email protected]>

* Create stableswap pools and CL pools * Refactor code to make sure e2e test upgrading run well * Update tests/e2e/configurer/chain/commands.go delete redundant Co-authored-by: Roman <[email protected]> * Remove CL pool and change stable token denom * renome debug bin * Remove rate limiter * resolve compile osmosis amd64 for linux error * resolve conflict * Update stablepool Co-authored-by: Ruslan Akhtariev <[email protected]> * update create function name Co-authored-by: Ruslan Akhtariev <[email protected]> * rename create stableswap function * add rate_limiter.wasm * Update whitespace error * add some logic to execute a swap * update wasm file * Add stableswap pool test to e2e * Change TestStableSwapPostUpgrade to try swapping the pool created in post upgrade * avoid hard code on e2e test * fix conflict * Delete go.work.sum --------- Co-authored-by: Roman <[email protected]> Co-authored-by: Ruslan Akhtariev <[email protected]>

phamminh0811 added 2 commits January 31, 2023 19:44

Create stableswap pools and CL pools

3815303

Refactor code to make sure e2e test upgrading run well

f34a8b4

phamminh0811 changed the title ~~Minh/create stableswap and cl pools~~ [E2E] Create stableswap and cl pools Jan 31, 2023

p0mvn reviewed Jan 31, 2023

View reviewed changes

tests/e2e/configurer/chain/commands.go Outdated Show resolved Hide resolved

tests/e2e/configurer/upgrade.go Outdated Show resolved Hide resolved

tests/e2e/configurer/upgrade.go Outdated Show resolved Hide resolved

p0mvn reviewed Jan 31, 2023

View reviewed changes

tests/e2e/configurer/upgrade.go Outdated Show resolved Hide resolved

phamminh0811 and others added 4 commits January 31, 2023 20:30

Update tests/e2e/configurer/chain/commands.go

a51508e

delete redundant Co-authored-by: Roman <[email protected]>

Remove CL pool and change stable token denom

f51ee8d

renome debug bin

f387979

Merge branch 'minh/create-stableswap-and-cl-pools' of https://github.…

3d73423

…com/notional-labs/osmosis into minh/create-stableswap-and-cl-pools

phamminh0811 requested a review from p0mvn February 1, 2023 01:38

pysel reviewed Feb 1, 2023

View reviewed changes

tests/e2e/scripts/stablePool.json Outdated Show resolved Hide resolved

pysel added the V:state/compatible/no_backport State machine compatible PR, depends on prior breaks label Feb 1, 2023

pysel marked this pull request as draft February 1, 2023 14:33

phamminh0811 added 4 commits February 3, 2023 10:43

Remove rate limiter

f157d7b

resolve compile osmosis amd64 for linux error

e1ca8cf

Merge branch 'minh/create-stableswap-and-cl-pools' of https://github.…

3a9b011

…com/notional-labs/osmosis into minh/create-stableswap-and-cl-pools

resolve conflict

33bb4aa

pysel requested changes Feb 3, 2023

View reviewed changes

tests/e2e/scripts/stablePool.json Outdated Show resolved Hide resolved

pysel requested changes Feb 5, 2023

View reviewed changes

tests/e2e/scripts/stablePool.json Outdated Show resolved Hide resolved

tests/e2e/configurer/chain/commands.go Outdated Show resolved Hide resolved

phamminh0811 and others added 3 commits February 6, 2023 10:24

Update stablepool

ab120e7

Co-authored-by: Ruslan Akhtariev <[email protected]>

update create function name

e5658fa

Co-authored-by: Ruslan Akhtariev <[email protected]>

rename create stableswap function

ee984e4

phamminh0811 marked this pull request as ready for review February 6, 2023 08:19

phamminh0811 requested a review from pysel February 6, 2023 08:20

pysel requested changes Feb 6, 2023

View reviewed changes

add rate_limiter.wasm

08f0b2b

pysel approved these changes Feb 7, 2023

View reviewed changes

Add stableswap pool test to e2e

67cd658

phamminh0811 requested a review from p0mvn February 20, 2023 14:28

p0mvn reviewed Feb 21, 2023

View reviewed changes

tests/e2e/e2e_test.go Outdated Show resolved Hide resolved

tests/e2e/e2e_test.go Outdated Show resolved Hide resolved

Change TestStableSwapPostUpgrade to try swapping the pool created in …

e1ab28e

…post upgrade

phamminh0811 requested a review from p0mvn February 22, 2023 08:13

p0mvn reviewed Feb 23, 2023

View reviewed changes

phamminh0811 added 2 commits February 27, 2023 10:33

merge stable pool migrate

b6ad44e

avoid hard code on e2e test

2ca5dd1

phamminh0811 requested a review from p0mvn February 27, 2023 07:41

phamminh0811 added 2 commits February 28, 2023 15:15

fix conflict

5dfcc36

fix conflict

47468ed

p0mvn approved these changes Mar 6, 2023

View reviewed changes

resolve conflict main

a8fb39a

phamminh0811 requested a review from p0mvn March 10, 2023 06:40

p0mvn approved these changes Mar 11, 2023

View reviewed changes

p0mvn requested changes Mar 11, 2023

View reviewed changes

go.work.sum Outdated Show resolved Hide resolved

p0mvn added V:state/compatible/backport State machine compatible PR, should be backported A:backport/v15.x backport patches to v15.x branch and removed V:state/compatible/no_backport State machine compatible PR, depends on prior breaks labels Mar 11, 2023

Delete go.work.sum

eaec8fb

p0mvn approved these changes Mar 13, 2023

View reviewed changes

p0mvn merged commit c99200b into osmosis-labs:main Mar 13, 2023

mergify bot mentioned this pull request Mar 13, 2023

[E2E] Create stableswap and cl pools (backport #4175) #4606

Merged

p0mvn added a commit that referenced this pull request Mar 13, 2023

[E2E] Create stableswap and cl pools (backport #4175)

06d9abf

p0mvn added a commit that referenced this pull request Mar 13, 2023

[E2E] Create stableswap and cl pools (backport #4175) (#4606)

cde469e

Co-authored-by: Roman <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[E2E] Create stableswap and cl pools #4175

[E2E] Create stableswap and cl pools #4175

phamminh0811 commented Jan 31, 2023

pysel commented Feb 1, 2023

pysel left a comment •

edited

Loading

phamminh0811 commented Feb 3, 2023

pysel commented Feb 3, 2023 •

edited

Loading

pysel left a comment

p0mvn Feb 23, 2023

p0mvn Feb 23, 2023

p0mvn commented Feb 27, 2023 •

edited

Loading

p0mvn left a comment

p0mvn commented Mar 6, 2023

phamminh0811 commented Mar 10, 2023

p0mvn left a comment

p0mvn left a comment

	config.StrideMigrateWallet = chainANode.CreateWalletAndFund(config.StrideMigrateWallet, []string{
	fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StOsmoDenom),
	fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StJunoDenom),
	fmt.Sprintf("%d%s", amountOfEachTokenToLP, initialization.StStarsDenom),
	})

[E2E] Create stableswap and cl pools #4175

[E2E] Create stableswap and cl pools #4175

Conversation

phamminh0811 commented Jan 31, 2023

What is the purpose of the change

Testing and Verifying

Documentation and Release Note

pysel commented Feb 1, 2023

pysel left a comment • edited Loading

Choose a reason for hiding this comment

phamminh0811 commented Feb 3, 2023

pysel commented Feb 3, 2023 • edited Loading

pysel left a comment

Choose a reason for hiding this comment

p0mvn Feb 23, 2023

Choose a reason for hiding this comment

p0mvn Feb 23, 2023

Choose a reason for hiding this comment

p0mvn commented Feb 27, 2023 • edited Loading

p0mvn left a comment

Choose a reason for hiding this comment

p0mvn commented Mar 6, 2023

phamminh0811 commented Mar 10, 2023

p0mvn left a comment

Choose a reason for hiding this comment

p0mvn left a comment

Choose a reason for hiding this comment

pysel left a comment •

edited

Loading

pysel commented Feb 3, 2023 •

edited

Loading

p0mvn commented Feb 27, 2023 •

edited

Loading