Skip to content

Commit fb34eaa

Browse files
authoredFeb 5, 2025··
Merge pull request #713 from public-awesome/serkan/mint-fee-recipient-update
Update recipient address for mint fees
2 parents 3cd9137 + 548f8d7 commit fb34eaa

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed
 

‎packages/sg1/src/lib.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,15 @@ pub fn distribute_mint_fees(
105105
let liquidity_dao_fee =
106106
(remaining_coin.amount.mul_ceil(liquidity_dao_percentage)).u128();
107107
let liquidity_dao_coin = coin(liquidity_dao_fee, fee.denom.to_string());
108-
let foundation_coin = coin(remaining_coin.amount.u128() - liquidity_dao_fee, fee.denom);
108+
let launchpad_dao_coin =
109+
coin(remaining_coin.amount.u128() - liquidity_dao_fee, fee.denom);
109110

110111
event = event.add_attribute("dev_addr", developer.to_string());
111112
event = event.add_attribute("dev_coin", dev_coin.to_string());
112113
event = event.add_attribute("liquidity_DAO_addr", LIQUIDITY_DAO_ADDRESS.to_string());
113114
event = event.add_attribute("liquidity_DAO_coin", liquidity_dao_coin.to_string());
114-
event = event.add_attribute("foundation_addr", FOUNDATION.to_string());
115-
event = event.add_attribute("foundation_coin", foundation_coin.to_string());
115+
event = event.add_attribute("launchpad_DAO_addr", LAUNCHPAD_DAO_ADDRESS.to_string());
116+
event = event.add_attribute("launchpad_DAO_coin", launchpad_dao_coin.to_string());
116117

117118
res.messages.push(SubMsg::new(BankMsg::Send {
118119
to_address: developer.to_string(),
@@ -123,27 +124,27 @@ pub fn distribute_mint_fees(
123124
amount: vec![liquidity_dao_coin],
124125
}));
125126
res.messages.push(SubMsg::new(BankMsg::Send {
126-
to_address: FOUNDATION.to_string(),
127-
amount: vec![foundation_coin],
127+
to_address: LAUNCHPAD_DAO_ADDRESS.to_string(),
128+
amount: vec![launchpad_dao_coin],
128129
}));
129130
}
130131
None => {
131132
let liquidity_dao_fee = fee.amount.mul_ceil(liquidity_dao_percentage).u128();
132133
let liquidity_dao_coin = coin(liquidity_dao_fee, fee.denom.to_string());
133-
let foundation_coin = coin(fee.amount.u128() - liquidity_dao_fee, fee.denom);
134+
let launchpad_dao_coin = coin(fee.amount.u128() - liquidity_dao_fee, fee.denom);
134135

135136
event = event.add_attribute("liquidity_DAO_addr", LIQUIDITY_DAO_ADDRESS.to_string());
136137
event = event.add_attribute("liquidity_DAO_coin", liquidity_dao_coin.to_string());
137-
event = event.add_attribute("foundation_addr", FOUNDATION.to_string());
138-
event = event.add_attribute("foundation_coin", foundation_coin.to_string());
138+
event = event.add_attribute("launchpad_DAO_addr", LAUNCHPAD_DAO_ADDRESS.to_string());
139+
event = event.add_attribute("launchpad_DAO_coin", launchpad_dao_coin.to_string());
139140

140141
res.messages.push(SubMsg::new(BankMsg::Send {
141142
to_address: LIQUIDITY_DAO_ADDRESS.to_string(),
142143
amount: vec![liquidity_dao_coin],
143144
}));
144145
res.messages.push(SubMsg::new(BankMsg::Send {
145-
to_address: FOUNDATION.to_string(),
146-
amount: vec![foundation_coin],
146+
to_address: LAUNCHPAD_DAO_ADDRESS.to_string(),
147+
amount: vec![launchpad_dao_coin],
147148
}));
148149
}
149150
}

‎test-suite/src/common_setup/setup_minter/common/constants.rs

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ pub const MIN_MINT_PRICE_OPEN_EDITION: u128 = 100_000_000;
1515
pub const FOUNDATION: &str = "stars1xqz6xujjyz0r9uzn7srasle5uynmpa0zkjr5l8";
1616
pub const LIQUIDITY_DAO_ADDRESS: &str =
1717
"stars12he2ldxl950wfypvelqwkac4mdul7clzgd8wdlnmjvll8z2cc47qsatvl2";
18+
pub const LAUNCHPAD_DAO_ADDRESS: &str =
19+
"stars1huqk6ha02jgrm69lxh8xfgl6wch9wlg7s65ujxydwdr725cxvuus423tj0";

‎test-suite/src/open_edition_minter/tests/ibc_asset_mint.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ use open_edition_factory::state::{OpenEditionMinterParams, ParamsExtension};
44
use open_edition_minter::msg::ExecuteMsg;
55
use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM};
66

7-
use crate::common_setup::setup_minter::common::constants::LIQUIDITY_DAO_ADDRESS;
7+
use crate::common_setup::setup_minter::common::constants::{
8+
LAUNCHPAD_DAO_ADDRESS, LIQUIDITY_DAO_ADDRESS,
9+
};
810
use crate::common_setup::{
911
setup_accounts_and_block::setup_block_time,
1012
setup_minter::{
1113
common::constants::{
12-
CREATION_FEE, DEV_ADDRESS, FOUNDATION, MINT_FEE_FAIR_BURN, MIN_MINT_PRICE_OPEN_EDITION,
14+
CREATION_FEE, DEV_ADDRESS, MINT_FEE_FAIR_BURN, MIN_MINT_PRICE_OPEN_EDITION,
1315
},
1416
open_edition_minter::minter_params::{default_nft_data, init_msg},
1517
},
@@ -171,7 +173,7 @@ fn one_hundred_percent_burned_ibc_minter() {
171173
// "community_pool" address from packages/sg-multi-test/src/multi.rs
172174
let balance = router
173175
.wrap()
174-
.query_balance(Addr::unchecked(FOUNDATION), denom)
176+
.query_balance(Addr::unchecked(LAUNCHPAD_DAO_ADDRESS), denom)
175177
.unwrap();
176178
assert_eq!(balance.amount, mint_price.amount * Decimal::percent(40));
177179

‎test-suite/src/vending_minter/tests/ibc_asset_mint.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use crate::common_setup::{
2-
setup_collection_whitelist::WHITELIST_AMOUNT, setup_minter::common::constants::FOUNDATION,
3-
};
1+
use crate::common_setup::setup_collection_whitelist::WHITELIST_AMOUNT;
42
use cosmwasm_std::{coin, coins, Addr, Decimal, Uint128};
53
use cw_multi_test::{BankSudo, Executor, SudoMsg};
64
use sg2::{msg::Sg2ExecuteMsg, tests::mock_collection_params};
@@ -24,7 +22,9 @@ use crate::common_setup::{
2422
templates::{vending_minter_template, vending_minter_with_ibc_asset},
2523
};
2624

27-
use crate::common_setup::setup_minter::common::constants::{CREATION_FEE, LIQUIDITY_DAO_ADDRESS};
25+
use crate::common_setup::setup_minter::common::constants::{
26+
CREATION_FEE, LAUNCHPAD_DAO_ADDRESS, LIQUIDITY_DAO_ADDRESS,
27+
};
2828
use crate::common_setup::setup_minter::vending_minter::mock_params::mock_params;
2929

3030
#[test]
@@ -257,7 +257,7 @@ fn wl_denom_mint() {
257257
assert_eq!(balance.amount, wl_mint_price.amount * Decimal::percent(90));
258258
let balance = app
259259
.wrap()
260-
.query_balance(Addr::unchecked(FOUNDATION), denom)
260+
.query_balance(Addr::unchecked(LAUNCHPAD_DAO_ADDRESS), denom)
261261
.unwrap();
262262
assert_eq!(balance.amount, wl_mint_price.amount * Decimal::percent(8));
263263
let balance = app

0 commit comments

Comments
 (0)
Please sign in to comment.