Merge branch 'main' into permission-start-time

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Address Validation: Cross-chain recipients don't need to be registered in VFS [(#725)](https://github.com/andromedaprotocol/andromeda-core/pull/725)
 - Weighted Splitter: Replace Recipient with AndrAddr in RemoveRecipient and GetUserWeight [(#739)](https://github.com/andromedaprotocol/andromeda-core/pull/739)
 - feat: IBC packet tracking adjustments [#748](https://github.com/andromedaprotocol/andromeda-core/pull/748)
+- ref: Rename Set Amount Splitter to Fixed Amount Splitter [(#754)](https://github.com/andromedaprotocol/andromeda-core/pull/754)
 
 ### Fixed
 

contracts/finance/andromeda-set-amount-splitter/Cargo.toml → contracts/finance/andromeda-fixed-amount-splitter/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "andromeda-set-amount-splitter"
+name = "andromeda-fixed-amount-splitter"
 version = "1.2.0-b.1"
 edition = "2021"
 rust-version = "1.75.0"

contracts/finance/andromeda-set-amount-splitter/examples/schema.rs → contracts/finance/andromeda-fixed-amount-splitter/examples/schema.rs

@@ -1,4 +1,4 @@
-use andromeda_finance::splitter::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_finance::fixed_amount_splitter::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 
 fn main() {

contracts/finance/andromeda-set-amount-splitter/src/contract.rs → contracts/finance/andromeda-fixed-amount-splitter/src/contract.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use crate::state::SPLITTER;
 use andromeda_finance::{
-    set_amount_splitter::{
+    fixed_amount_splitter::{
         validate_recipient_list, AddressAmount, Cw20HookMsg, ExecuteMsg, GetSplitterConfigResponse,
         InstantiateMsg, QueryMsg, Splitter,
     },
@@ -23,7 +23,7 @@ use cw20::{Cw20Coin, Cw20ReceiveMsg};
 use cw_utils::nonpayable;
 
 // version info for migration info
-const CONTRACT_NAME: &str = "crates.io:andromeda-set-amount-splitter";
+const CONTRACT_NAME: &str = "crates.io:andromeda-fixed-amount-splitter";
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 // 1 day in seconds
 const ONE_DAY: u64 = 86_400;

contracts/finance/andromeda-fixed-amount-splitter/src/interface.rs

@@ -0,0 +1,10 @@
+use andromeda_finance::fixed_amount_splitter::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
+
+pub const CONTRACT_ID: &str = "fixed-amount-splitter";
+
+contract_interface!(
+    FixedAmountSplitterContract,
+    CONTRACT_ID,
+    "andromeda_fixed_amount_splitter.wasm"
+);

contracts/finance/andromeda-set-amount-splitter/src/lib.rs → contracts/finance/andromeda-fixed-amount-splitter/src/lib.rs

@@ -10,4 +10,4 @@ mod testing;
 #[cfg(not(target_arch = "wasm32"))]
 mod interface;
 #[cfg(not(target_arch = "wasm32"))]
-pub use crate::interface::SetAmountSplitterContract;
+pub use crate::interface::FixedAmountSplitterContract;

contracts/finance/andromeda-set-amount-splitter/src/mock.rs → contracts/finance/andromeda-fixed-amount-splitter/src/mock.rs

@@ -1,18 +1,20 @@
 #![cfg(all(not(target_arch = "wasm32"), feature = "testing"))]
 
 use crate::contract::{execute, instantiate, query, reply};
-use andromeda_finance::set_amount_splitter::{AddressAmount, ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_finance::fixed_amount_splitter::{
+    AddressAmount, ExecuteMsg, InstantiateMsg, QueryMsg,
+};
 use andromeda_std::{amp::Recipient, common::expiration::Expiry};
 use andromeda_testing::{
     mock::MockApp, mock_ado, mock_contract::ExecuteResult, MockADO, MockContract,
 };
 use cosmwasm_std::{Addr, Coin, Empty};
 use cw_multi_test::{Contract, ContractWrapper, Executor};
 
-pub struct MockSetAmountSplitter(Addr);
-mock_ado!(MockSetAmountSplitter, ExecuteMsg, QueryMsg);
+pub struct MockFixedAmountSplitter(Addr);
+mock_ado!(MockFixedAmountSplitter, ExecuteMsg, QueryMsg);
 
-impl MockSetAmountSplitter {
+impl MockFixedAmountSplitter {
     #[allow(clippy::too_many_arguments)]
     pub fn instantiate(
         app: &mut MockApp,
@@ -24,7 +26,7 @@ impl MockSetAmountSplitter {
         owner: Option<String>,
         default_recipient: Option<Recipient>,
     ) -> Self {
-        let msg = mock_set_amount_splitter_instantiate_msg(
+        let msg = mock_fixed_amount_splitter_instantiate_msg(
             recipients,
             kernel_address,
             lock_time,
@@ -43,7 +45,7 @@ impl MockSetAmountSplitter {
         funds: &[Coin],
         config: Option<Vec<AddressAmount>>,
     ) -> ExecuteResult {
-        let msg = mock_set_amount_splitter_send_msg(config);
+        let msg = mock_fixed_amount_splitter_send_msg(config);
 
         self.execute(app, &msg, sender, funds)
     }
@@ -55,18 +57,18 @@ impl MockSetAmountSplitter {
         funds: &[Coin],
         recipients: Vec<AddressAmount>,
     ) -> ExecuteResult {
-        let msg = mock_set_amount_splitter_update_recipients_msg(recipients);
+        let msg = mock_fixed_amount_splitter_update_recipients_msg(recipients);
 
         self.execute(app, &msg, sender, funds)
     }
 }
 
-pub fn mock_andromeda_set_amount_splitter() -> Box<dyn Contract<Empty>> {
+pub fn mock_andromeda_fixed_amount_splitter() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new_with_empty(execute, instantiate, query).with_reply(reply);
     Box::new(contract)
 }
 
-pub fn mock_set_amount_splitter_instantiate_msg(
+pub fn mock_fixed_amount_splitter_instantiate_msg(
     recipients: Vec<AddressAmount>,
     kernel_address: impl Into<String>,
     lock_time: Option<Expiry>,
@@ -82,11 +84,11 @@ pub fn mock_set_amount_splitter_instantiate_msg(
     }
 }
 
-pub fn mock_set_amount_splitter_send_msg(config: Option<Vec<AddressAmount>>) -> ExecuteMsg {
+pub fn mock_fixed_amount_splitter_send_msg(config: Option<Vec<AddressAmount>>) -> ExecuteMsg {
     ExecuteMsg::Send { config }
 }
 
-pub fn mock_set_amount_splitter_update_recipients_msg(
+pub fn mock_fixed_amount_splitter_update_recipients_msg(
     recipients: Vec<AddressAmount>,
 ) -> ExecuteMsg {
     ExecuteMsg::UpdateRecipients { recipients }

contracts/finance/andromeda-fixed-amount-splitter/src/state.rs

@@ -0,0 +1,4 @@
+use andromeda_finance::fixed_amount_splitter::Splitter;
+use cw_storage_plus::Item;
+
+pub const SPLITTER: Item<Splitter> = Item::new("fixed-amount-splitter");

contracts/finance/andromeda-set-amount-splitter/src/testing/tests.rs → contracts/finance/andromeda-fixed-amount-splitter/src/testing/tests.rs

@@ -21,7 +21,7 @@ use crate::{
     state::SPLITTER,
     testing::mock_querier::mock_dependencies_custom,
 };
-use andromeda_finance::set_amount_splitter::{
+use andromeda_finance::fixed_amount_splitter::{
     AddressAmount, ExecuteMsg, GetSplitterConfigResponse, InstantiateMsg, QueryMsg, Splitter,
 };
 

packages/andromeda-finance/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod conditional_splitter;
 pub mod cross_chain_swap;
+pub mod fixed_amount_splitter;
 pub mod rate_limiting_withdrawals;
-pub mod set_amount_splitter;
 pub mod splitter;
 pub mod timelock;
 pub mod validator_staking;

packages/deploy/Cargo.toml

@@ -49,7 +49,7 @@ andromeda-vesting = { path = "../../contracts/finance/andromeda-vesting" }
 andromeda-timelock = { path = "../../contracts/finance/andromeda-timelock" }
 andromeda-conditional-splitter = { path = "../../contracts/finance/andromeda-conditional-splitter" }
 andromeda-rate-limiting-withdrawals = { path = "../../contracts/finance/andromeda-rate-limiting-withdrawals" }
-andromeda-set-amount-splitter = { path = "../../contracts/finance/andromeda-set-amount-splitter" }
+andromeda-fixed-amount-splitter = { path = "../../contracts/finance/andromeda-fixed-amount-splitter" }
 andromeda-weighted-distribution-splitter = { path = "../../contracts/finance/andromeda-weighted-distribution-splitter" }
 
 # Data Storage Contracts

packages/deploy/src/contracts.rs

@@ -13,16 +13,17 @@ use andromeda_cw20_staking::CW20StakingContract;
 use andromeda_cw721::CW721Contract;
 use andromeda_distance::DistanceContract;
 use andromeda_economics::EconomicsContract;
+use andromeda_fixed_amount_splitter::FixedAmountSplitterContract;
 use andromeda_graph::GraphContract;
 use andromeda_ibc_registry::IBCRegistryContract;
 use andromeda_kernel::KernelContract;
 use andromeda_lockdrop::LockdropContract;
 use andromeda_marketplace::MarketplaceContract;
 use andromeda_merkle_airdrop::MerkleAirdropContract;
+use andromeda_point::PointContract;
 use andromeda_primitive::PrimitiveContract;
 use andromeda_rate_limiting_withdrawals::RateLimitingWithdrawalsContract;
 use andromeda_rates::RatesContract;
-use andromeda_set_amount_splitter::SetAmountSplitterContract;
 use andromeda_shunting::ShuntingContract;
 use andromeda_splitter::SplitterContract;
 use andromeda_std::deploy::ADOMetadata;
@@ -32,7 +33,6 @@ use andromeda_validator_staking::ValidatorStakingContract;
 use andromeda_vesting::VestingContract;
 use andromeda_vfs::VFSContract;
 use andromeda_weighted_distribution_splitter::WeightedDistributionSplitterContract;
-use andromeda_point::PointContract;
 
 use cw_orch::prelude::*;
 use cw_orch_daemon::{DaemonBase, Wallet};
@@ -71,7 +71,7 @@ pub fn all_contracts() -> Vec<DeployableContract> {
         deployable!(StringStorageContract),
         deployable!(ConditionalSplitterContract),
         deployable!(RateLimitingWithdrawalsContract),
-        deployable!(SetAmountSplitterContract),
+        deployable!(FixedAmountSplitterContract),
         deployable!(WeightedDistributionSplitterContract),
         deployable!(Cw20ExchangeContract),
         deployable!(LockdropContract),

tests-integration/Cargo.toml

@@ -68,7 +68,7 @@ andromeda-finance = { workspace = true }
 andromeda-splitter = { path = "../contracts/finance/andromeda-splitter", features = [
     "testing",
 ] }
-andromeda-set-amount-splitter = { path = "../contracts/finance/andromeda-set-amount-splitter", features = [
+andromeda-fixed-amount-splitter = { path = "../contracts/finance/andromeda-fixed-amount-splitter", features = [
     "testing",
 ] }
 andromeda-conditional-splitter = { path = "../contracts/finance/andromeda-conditional-splitter", features = [
@@ -177,7 +177,7 @@ rstest = { workspace = true }
 # name = "kernel"
 
 [[test]]
-name = "set_amount_splitter"
+name = "fixed_amount_splitter"
 
 [[test]]
 name = "cw20_staking"