-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from osmosis-labs/feat/add-pool-assets
feat: add new assets
- Loading branch information
Showing
11 changed files
with
527 additions
and
137 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pub mod v2_1_0; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
use cosmwasm_schema::cw_serde; | ||
use cosmwasm_std::{ensure_eq, DepsMut, Response}; | ||
|
||
use crate::{ | ||
contract::{CONTRACT_NAME, CONTRACT_VERSION}, | ||
ContractError, | ||
}; | ||
|
||
const FROM_VERSION: &str = "2.0.0"; | ||
const TO_VERSION: &str = "2.1.0"; | ||
|
||
#[cw_serde] | ||
pub struct MigrateMsg {} | ||
|
||
pub fn execute_migration(deps: DepsMut, _msg: MigrateMsg) -> Result<Response, ContractError> { | ||
// Assert that the stored contract version matches the expected version before migration | ||
cw2::assert_contract_version(deps.storage, CONTRACT_NAME, FROM_VERSION)?; | ||
|
||
// Ensure that the current contract version matches the target version to prevent migration to an incorrect version | ||
ensure_eq!( | ||
CONTRACT_VERSION, | ||
TO_VERSION, | ||
cw2::VersionError::WrongVersion { | ||
expected: TO_VERSION.to_string(), | ||
found: CONTRACT_VERSION.to_string() | ||
} | ||
); | ||
|
||
// Set the contract version to the target version after successful migration | ||
cw2::set_contract_version(deps.storage, CONTRACT_NAME, TO_VERSION)?; | ||
|
||
// Return a response with an attribute indicating the method that was executed | ||
Ok(Response::new().add_attribute("method", "v2_1_0/execute_migraiton")) | ||
} |
97 changes: 97 additions & 0 deletions
97
contracts/transmuter/src/test/cases/units/add_new_assets.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
use cosmwasm_std::Coin; | ||
use osmosis_test_tube::OsmosisTestApp; | ||
|
||
use crate::{ | ||
contract::{GetShareDenomResponse, GetTotalPoolLiquidityResponse, InstantiateMsg}, | ||
test::test_env::{assert_contract_err, TestEnvBuilder}, | ||
ContractError, | ||
}; | ||
|
||
#[test] | ||
fn test_add_new_assets() { | ||
let app = OsmosisTestApp::new(); | ||
|
||
// create denom | ||
app.init_account(&[ | ||
Coin::new(1, "denom1"), | ||
Coin::new(1, "denom2"), | ||
Coin::new(1, "denom3"), | ||
Coin::new(1, "denom4"), | ||
]) | ||
.unwrap(); | ||
|
||
let t = TestEnvBuilder::new() | ||
.with_account("admin", vec![]) | ||
.with_account("non_admin", vec![]) | ||
.with_instantiate_msg(InstantiateMsg { | ||
pool_asset_denoms: vec!["denom1".to_string(), "denom2".to_string()], | ||
admin: None, // override by admin account set above | ||
alloyed_asset_subdenom: "denomx".to_string(), | ||
moderator: None, | ||
}) | ||
.build(&app); | ||
|
||
// add new asset | ||
let denoms = vec!["denom3".to_string(), "denom4".to_string()]; | ||
|
||
let err = t | ||
.contract | ||
.execute( | ||
&crate::contract::ExecMsg::AddNewAssets { | ||
denoms: denoms.clone(), | ||
}, | ||
&[], | ||
&t.accounts["non_admin"], | ||
) | ||
.unwrap_err(); | ||
|
||
assert_contract_err(ContractError::Unauthorized {}, err); | ||
|
||
t.contract | ||
.execute( | ||
&crate::contract::ExecMsg::AddNewAssets { denoms }, | ||
&[], | ||
&t.accounts["admin"], | ||
) | ||
.unwrap(); | ||
|
||
// Get total pool liquidity | ||
let GetTotalPoolLiquidityResponse { | ||
total_pool_liquidity, | ||
} = t | ||
.contract | ||
.query(&crate::contract::QueryMsg::GetTotalPoolLiquidity {}) | ||
.unwrap(); | ||
|
||
assert_eq!( | ||
total_pool_liquidity, | ||
vec![ | ||
Coin::new(0, "denom1"), | ||
Coin::new(0, "denom2"), | ||
Coin::new(0, "denom3"), | ||
Coin::new(0, "denom4"), | ||
] | ||
); | ||
|
||
// Get alloyed denom | ||
let GetShareDenomResponse { | ||
share_denom: alloyed_denom, | ||
} = t | ||
.contract | ||
.query(&crate::contract::QueryMsg::GetShareDenom {}) | ||
.unwrap(); | ||
|
||
// Attempt to add alloyed_denom as asset, should error | ||
let err = t | ||
.contract | ||
.execute( | ||
&crate::contract::ExecMsg::AddNewAssets { | ||
denoms: vec![alloyed_denom.clone()], | ||
}, | ||
&[], | ||
&t.accounts["admin"], | ||
) | ||
.unwrap_err(); | ||
|
||
assert_contract_err(ContractError::ShareDenomNotAllowedAsPoolAsset {}, err); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,5 @@ mod spot_price; | |
mod swap; | ||
|
||
mod create_pool; | ||
|
||
mod add_new_assets; |
Oops, something went wrong.