Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
- release_*

env:
SOLANA_CLI_VERSION: 2.1.0
SOLANA_CLI_VERSION: 2.3.13
NODE_VERSION: 18.20.6
ANCHOR_CLI_VERSION: 0.31.0
TOOLCHAIN: 1.76.0
TOOLCHAIN: 1.85.0

jobs:
program_changed_files:
Expand Down
2 changes: 1 addition & 1 deletion Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

[toolchain]
anchor_version = "0.31.0"
solana_version = "2.1.0"
solana_version = "2.3.13"
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Breaking Changes

## cp_amm [0.2.0]

### Added

- Pool now will track reserves balances `(token_a_amount, token_b_amount)` if `pool.layout_version == 1`. For pool layout_version 0, operator can call the new endpoint `fix_pool_layout_version` to pump pool version.
- Add a new `collect_fee_mode (Compounding)`, in the new collect fee mode, fee will be collected in quote token, and a percentage of fee (configurable) will be added in reserves for compounding. In the new collect fee mode, the pool doesn't have concentrated price range, instead following constant-product formula `token_a_amount * token_b_amount = constant`.
- Endpoints `create_config`, `initialize_customizable_pool` and `initialize_pool_with_dynamic_config` will allow user to create pool with `collect_fee_mode == Compounding`, and config for `compounding_fee_bps`.

### Changed

- Related to event `EvtSwap2`, in `swap_result` field, `partner_fee` will be replaced by `compounding_fee`, now total_trading_fee will be calculated as `swap_result.claiming_fee + swap_result.compounding_fee`

### Removed

- Removed `partner` field from Pool struct
- Removed unused `partner_fee` feature and the `claim_partner_fee` endpoint

### Breaking Changes

- Quote function will be changed by the new fee mode

## cp_amm [0.1.8][PR #177](https://github.com/MeteoraAg/damm-v2/pull/177)

### Added

- New endpoint `fix_pool_params` and `fix_config_fee_params` to allow `operator` to fix invalid scheduler params that causes blocking operation on `update_pool_fees` endpoint.
- New endpoint `lock_inner_position`, that allow to vest liquidity without external `Vesting` account for better composability.
- New endpoint `lock_inner_position`, that allow to vest liquidity without external `Vesting` account for better composability.

### Changed

Expand Down
60 changes: 46 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["programs/*", "rust-sdk", "libs/*"]
members = ["programs/*", "rust-sdk"]
resolver = "2"

[profile.release]
Expand All @@ -16,4 +16,5 @@ codegen-units = 1
anchor-lang = { version = "0.31.0", features = ["init-if-needed"] }
anchor-spl = "0.31.0"
anchor-client = "0.31.0"
bytemuck = { version = "1.20.0"}
bytemuck = { version = "1.20.0"}
proptest = "1.2.0"
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ MCPA is a brand new AMM program of Meteora that includes almost all features fro
- fund_reward: fund reward for on-chain liquidity mining
- withdraw_ineligible_reward: withdraw ineligible reward

### Partner (aka Launchpad)
- claim_partner_fee: claim partner fee

### Token deployer
- initialize_pool: create a new pool from a static config key
- initialize_pool_with_dynamic_config: create a new pool from a dynamic config key
Expand All @@ -54,7 +51,7 @@ MCPA is a brand new AMM program of Meteora that includes almost all features fro
## Config key state
- vault_config_key: alpha-vault address that is able to buy pool before activation_point
- pool_creator_authority: if this address is non-default, then only this address can create pool with that config key (for launchpad)
- pool_fees: includes base fee scheduler, dynamic-fee, protocol fee percent, partner fee percent, and referral fee percent configuration
- pool_fees: includes base fee scheduler, dynamic-fee, protocol fee percent, and referral fee percent configuration
- activation_type: determines whether pools are run in slot or timestamp
- collect_fee_mode: determines whether pool should collect fees in both tokens or only one token
- sqrt_min_price: square root of min price for pools
Expand Down
Loading
Loading