diff --git a/packages/revenue/terp-fee/src/lib.rs b/packages/revenue/terp-fee/src/lib.rs index 9300488..66fe112 100644 --- a/packages/revenue/terp-fee/src/lib.rs +++ b/packages/revenue/terp-fee/src/lib.rs @@ -1,6 +1,6 @@ use cosmwasm_std::{coin, coins, Addr, BankMsg, Coin, Decimal, Event, MessageInfo, Uint128}; use cw_utils::{may_pay, PaymentError}; -use terp_sdk::{create_fund_community_pool_msg, Response, SubMsg, NATIVE_FEE_DENOM}; +use terp_sdk::{create_fund_community_pool_msg, Response, SubMsg, NATIVE_DENOM}; use thiserror::Error; // governance parameters @@ -15,7 +15,7 @@ pub fn checked_fair_burn( res: &mut Response, ) -> Result<(), FeeError> { // Use may_pay because fees could be 0. Add check to avoid transferring 0 funds - let payment = may_pay(info, NATIVE_FEE_DENOM)?; + let payment = may_pay(info, NATIVE_DENOM)?; if payment.u128() < fee { return Err(FeeError::InsufficientFee(fee, payment.u128())); }; @@ -76,7 +76,7 @@ pub fn fair_burn(fee: u128, developer: Option, res: &mut Response) { // calculate the fair burn fee let burn_fee = (Uint128::from(fee) * Decimal::percent(FEE_BURN_PERCENT)).u128(); - let burn_coin = coins(burn_fee, NATIVE_FEE_DENOM); + let burn_coin = coins(burn_fee, NATIVE_DENOM); res.messages .push(SubMsg::new(BankMsg::Burn { amount: burn_coin })); event = event.add_attribute("burn_amount", Uint128::from(burn_fee).to_string()); @@ -87,7 +87,7 @@ pub fn fair_burn(fee: u128, developer: Option, res: &mut Response) { if let Some(dev) = developer { res.messages.push(SubMsg::new(BankMsg::Send { to_address: dev.to_string(), - amount: coins(remainder, NATIVE_FEE_DENOM), + amount: coins(remainder, NATIVE_DENOM), })); event = event.add_attribute("dev", dev.to_string()); event = event.add_attribute("dev_amount", Uint128::from(remainder).to_string()); @@ -95,7 +95,7 @@ pub fn fair_burn(fee: u128, developer: Option, res: &mut Response) { res.messages .push(SubMsg::new(create_fund_community_pool_msg(coins( remainder, - NATIVE_FEE_DENOM, + NATIVE_DENOM, )))); event = event.add_attribute("dist_amount", Uint128::from(remainder).to_string()); } @@ -115,7 +115,7 @@ pub enum FeeError { #[cfg(test)] mod tests { use cosmwasm_std::{coins, Addr, BankMsg}; - use terp_sdk::{create_fund_community_pool_msg, Response, NATIVE_FEE_DENOM}; + use terp_sdk::{create_fund_community_pool_msg, Response, NATIVE_DENOM}; use crate::{fair_burn, SubMsg}; @@ -127,7 +127,7 @@ mod tests { let burn_msg = SubMsg::new(BankMsg::Burn { amount: coins(4, "uthiol".to_string()), }); - let dist_msg = SubMsg::new(create_fund_community_pool_msg(coins(5, NATIVE_FEE_DENOM))); + let dist_msg = SubMsg::new(create_fund_community_pool_msg(coins(5, NATIVE_DENOM))); assert_eq!(res.messages.len(), 2); assert_eq!(res.messages[0], burn_msg); assert_eq!(res.messages[1], dist_msg); @@ -140,10 +140,10 @@ mod tests { fair_burn(9u128, Some(Addr::unchecked("jeret")), &mut res); let bank_msg = SubMsg::new(BankMsg::Send { to_address: "jeret".to_string(), - amount: coins(5, NATIVE_FEE_DENOM), + amount: coins(5, NATIVE_DENOM), }); let burn_msg = SubMsg::new(BankMsg::Burn { - amount: coins(4, NATIVE_FEE_DENOM), + amount: coins(4, NATIVE_DENOM), }); assert_eq!(res.messages.len(), 2); assert_eq!(res.messages[0], burn_msg); @@ -157,10 +157,10 @@ mod tests { fair_burn(1420u128, Some(Addr::unchecked("eret")), &mut res); let bank_msg = SubMsg::new(BankMsg::Send { to_address: "eret".to_string(), - amount: coins(710, NATIVE_FEE_DENOM), + amount: coins(710, NATIVE_DENOM), }); let burn_msg = SubMsg::new(BankMsg::Burn { - amount: coins(710, NATIVE_FEE_DENOM), + amount: coins(710, NATIVE_DENOM), }); assert_eq!(res.messages.len(), 2); assert_eq!(res.messages[0], burn_msg); diff --git a/packages/utils/terp-sdk/src/lib.rs b/packages/utils/terp-sdk/src/lib.rs index cf3e5c2..ba26b4b 100644 --- a/packages/utils/terp-sdk/src/lib.rs +++ b/packages/utils/terp-sdk/src/lib.rs @@ -4,13 +4,8 @@ mod route; pub const NATIVE_DENOM: &str = "uterp"; - -pub const NATIVE_BOND_DENOM: &str = "uterp"; -pub const NATIVE_FEE_DENOM: &str = "uthiol"; - pub const TEST_BOND_DENOM: &str = "uterpx"; pub const TEST_FEE_DENOM: &str = "uthiolx"; - pub const GENESIS_MINT_START_TIME: u64 = 1647032400000000000; @@ -34,10 +29,10 @@ pub use route::TerpRoute; // extern "C" fn requires_terpnetwork() {} pub fn terps(amount: impl Into) -> Vec { - coins(amount.into(), NATIVE_BOND_DENOM) + coins(amount.into(), NATIVE_DENOM) } pub fn thiols(amount: impl Into) -> Vec { - coins(amount.into(), NATIVE_FEE_DENOM) + coins(amount.into(), NATIVE_DENOM) } pub fn test_terps(amount: impl Into) -> Vec { @@ -48,19 +43,19 @@ pub fn test_thiols(amount: impl Into) -> Vec { } pub fn terp(amount: impl Into) -> Coin { - coin(amount.into(), NATIVE_BOND_DENOM) + coin(amount.into(), NATIVE_DENOM) } pub fn thiol(amount: impl Into) -> Coin { - coin(amount.into(), NATIVE_FEE_DENOM) + coin(amount.into(), NATIVE_DENOM) } pub fn test_terp(amount: impl Into) -> Coin { - coin(amount.into(), NATIVE_BOND_DENOM) + coin(amount.into(), NATIVE_DENOM) } pub fn test_thiol(amount: impl Into) -> Coin { - coin(amount.into(), NATIVE_FEE_DENOM) + coin(amount.into(), NATIVE_DENOM) } pub fn send_terps_msg(to_address: &Addr, amount: impl Into) -> BankMsg { diff --git a/scripts/nft/flex/01-init-factory.sh b/scripts/nft/flex/01-init-factory.sh index 6664805..a2b946a 100755 --- a/scripts/nft/flex/01-init-factory.sh +++ b/scripts/nft/flex/01-init-factory.sh @@ -1,21 +1,23 @@ # KEY=$(terpd keys show $ADMIN | jq -r .name) +FACTORY_CODE_ID=121 +MINTER_CODE_ID=122 MSG=$(cat < unsignedTx.json -# terpd tx sign unsignedTx.json \ -# --multisig=$ADMIN --from $USER --output-document=$KEY.json \ -# --chain-id $CHAIN_ID + if [ -n "$response" ]; then + txhash=$(echo "$response" | jq -r '.txhash') + echo 'waiting for tx to process' + sleep 6; + tx_response=$(terpd q tx $txhash -o json) -# terpd tx multisign unsignedTx.json $MULTISIG_NAME $1 $2 $3 > signedTx.json - -# terpd tx broadcast signedTx.json \ No newline at end of file + contract_address=$(echo "$tx_response" | jq -r '.logs[].events[] | select(.type == "instantiate") | .attributes[] | select(.key == "_contract_address") | .value') + echo "Contract Address: $contract_address" + else + echo "Error: Empty response" + fi + \ No newline at end of file diff --git a/scripts/nft/terp721-updatable/01-init-factory.sh b/scripts/nft/terp721-updatable/01-init-factory.sh index 89d292a..93e2dfb 100755 --- a/scripts/nft/terp721-updatable/01-init-factory.sh +++ b/scripts/nft/terp721-updatable/01-init-factory.sh @@ -12,16 +12,16 @@ MSG=$(cat <