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.

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

feat: CreateCLPool & LinkCFMMtoCL pool into one gov-prop #5890

Merged
merged 7 commits into from
Aug 3, 2023

Conversation

stackman27
Copy link
Contributor

@stackman27 stackman27 commented Jul 26, 2023

Closes: #5888

What is the purpose of the change

Currently we have 2 gov prop message to migrate pool from GAMM.

Create CL Pool
Link GammPool with CL pool
This take 2 gov period which is too long. Lets create a gov-prop that will handle both of these commands in one

Testing and Verifying

localosmosis tested

/osmosis # 
/osmosis # osmosisd q gov proposals 1 
pagination:
  next_key: null
  total: "0"
proposals:
- content:
    '@type': /osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal
    description: add
    pool_records_with_cfmm_link:
    - balancer_pool_id: "2"
      denom0: uosmo
      denom1: uion
      exponent_at_price_one: "-6"
      spread_factor: "0.001000000000000000"
      tick_spacing: "100"
    title: add
  deposit_end_time: "2023-07-28T21:02:14.184663875Z"
  final_tally_result:
    abstain: "0"
    "no": "0"
    no_with_veto: "0"
    "yes": "0"
  is_expedited: false
  proposal_id: "1"
  status: PROPOSAL_STATUS_VOTING_PERIOD
  submit_time: "2023-07-26T21:02:14.184663875Z"
  total_deposit:
  - amount: "1000000000"
    denom: uosmo
  voting_end_time: "2023-07-26T21:03:34.234001152Z"
  voting_start_time: "2023-07-26T21:02:34.234001152Z"
-------
/osmosis # osmosisd q gamm cl-pool-link-from-cfmm 2
concentrated_pool_id: "4"

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes?
  • Changelog entry added to Unreleased section of CHANGELOG.md?

Where is the change documented?

  • Specification (x/{module}/README.md)
  • Osmosis documentation site
  • Code comments?
  • N/A

@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/concentrated-liquidity C:CLI C:app-wiring Changes to the app folder labels Jul 26, 2023
@stackman27 stackman27 force-pushed the stack/join-gov-prop branch from bb68eef to 957cf62 Compare July 26, 2023 21:08
@stackman27 stackman27 marked this pull request as ready for review July 26, 2023 21:18
@stackman27 stackman27 added the V:state/breaking State machine breaking PR label Jul 26, 2023
x/gamm/keeper/migrate.go Outdated Show resolved Hide resolved
@stackman27 stackman27 force-pushed the stack/join-gov-prop branch from 9e63479 to 94be8c7 Compare July 28, 2023 18:15
@stackman27 stackman27 force-pushed the stack/join-gov-prop branch 2 times, most recently from 8c933ac to f10f334 Compare July 31, 2023 23:06
@stackman27 stackman27 requested a review from ValarDragon August 1, 2023 06:32
@stackman27 stackman27 force-pushed the stack/join-gov-prop branch from f18b523 to b09b70b Compare August 1, 2023 06:39
@czarcas7ic czarcas7ic self-assigned this Aug 1, 2023
Copy link
Member

@czarcas7ic czarcas7ic left a comment

Choose a reason for hiding this comment

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

First pass looks good, it appears you only tested that the prop gets posted though according to your log though. Can you pass the prop and confirm the results? After that I think we can merge.

@stackman27
Copy link
Contributor Author

stackman27 commented Aug 2, 2023

just checked and it works fine!

/osmosis # osmosisd q gov proposal 1
content:
  '@type': /osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal
  description: add
  pool_records_with_cfmm_link:
  - balancer_pool_id: "2"
    denom0: uion
    denom1: uosmo
    exponent_at_price_one: "-6"
    spread_factor: "0.001000000000000000"
    tick_spacing: "100"
  title: add
deposit_end_time: "2023-08-04T20:35:26.728976737Z"
final_tally_result:
  abstain: "0"
  "no": "0"
  no_with_veto: "0"
  "yes": "500000000"
is_expedited: false
proposal_id: "1"
status: PROPOSAL_STATUS_PASSED
submit_time: "2023-08-02T20:35:26.728976737Z"
total_deposit:
- amount: "1000000000"
  denom: uosmo
voting_end_time: "2023-08-02T20:36:36.753489095Z"
voting_start_time: "2023-08-02T20:35:36.753489095Z"


/osmosis # osmosisd q gamm cl-pool-link-from-cfmm 2
concentrated_pool_id: "4"


/osmosis # osmosisd q concentratedliquidity pools
pagination:
  next_key: null
  total: "0"
pools:
- '@type': /osmosis.concentratedliquidity.v1beta1.Pool
  address: osmo1ad4r3uh5pdn5pgg5hnl6u5utfeqmpwstlvgvg2h2jdztrcnwkqgs3hs85z
  current_sqrt_price: "0.000000000000000000000000000000000000"
  current_tick: "0"
  current_tick_liquidity: "0.000000000000000000"
  exponent_at_price_one: "-6"
  id: "4"
  incentives_address: osmo1ra25mx8lch089mxf97nr6cnzns7vesecvw0mxj32fcaj5ygrsd8sqwhjpk
  last_liquidity_update: "2023-08-02T20:36:36.898121604Z"
  spread_factor: "0.001000000000000000"
  spread_rewards_address: osmo1w60ad6wuhkxeyuqfhnflvtkzcsrpey2xv6s05r00xxegl4vcedsqqu89g6
  tick_spacing: "100"
  token0: uion
  token1: uosmo



@stackman27 stackman27 force-pushed the stack/join-gov-prop branch from b09b70b to 88d175e Compare August 2, 2023 20:38
@stackman27 stackman27 force-pushed the stack/join-gov-prop branch from d3bae35 to e9ba483 Compare August 3, 2023 01:02
@stackman27
Copy link
Contributor Author

First pass looks good, it appears you only tested that the prop gets posted though according to your log though. Can you pass the prop and confirm the results? After that I think we can merge.

merging this as the gov prop has been tested and logs are posted

@stackman27 stackman27 merged commit b028777 into main Aug 3, 2023
@stackman27 stackman27 deleted the stack/join-gov-prop branch August 3, 2023 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:app-wiring Changes to the app folder C:CLI C:x/concentrated-liquidity C:x/gamm Changes, features and bugs related to the gamm module. V:state/breaking State machine breaking PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

v17: Add CreateCLPool & LinkCFMMtoCL pool into one gov-prop
3 participants