feat: Multiple Rates

contracts/data-storage/andromeda-primitive/src/execute.rs

@@ -30,14 +30,17 @@ pub fn handle_execute(mut ctx: ExecuteContext, msg: ExecuteMsg) -> Result<Respon
         ExecuteMsg::SetValue { key, value } => set_value(ctx, key, value, action),
         ExecuteMsg::DeleteValue { key } => delete_value(ctx, key),
         ExecuteMsg::Rates(rates_message) => match rates_message {
-            RatesMessage::SetRate { rate, .. } => match rate {
-                Rate::Local(local_rate) => {
-                    // Percent rates aren't applicable in this case, so we enforce Flat rates
-                    ensure!(local_rate.value.is_flat(), ContractError::InvalidRate {});
-                    ADOContract::default().execute(ctx, msg)
+            RatesMessage::SetRate { rates, .. } => {
+                for rate in rates {
+                    match rate {
+                        Rate::Local(local_rate) => {
+                            ensure!(local_rate.value.is_flat(), ContractError::InvalidRate {});
+                        }
+                        Rate::Contract(_) => (),
+                    }
                 }
-                Rate::Contract(_) => ADOContract::default().execute(ctx, msg),
-            },
+                ADOContract::default().execute(ctx, msg)
+            }
             RatesMessage::RemoveRate { .. } => ADOContract::default().execute(ctx, msg),
         },
         _ => ADOContract::default().execute(ctx, msg),

contracts/data-storage/andromeda-primitive/src/mock.rs

@@ -61,9 +61,9 @@ impl MockPrimitive {
         app: &mut MockApp,
         sender: Addr,
         action: String,
-        rate: Rate,
+        rates: Vec<Rate>,
     ) -> ExecuteResult {
-        self.execute(app, &mock_set_rate_msg(action, rate), sender, &[])
+        self.execute(app, &mock_set_rate_msg(action, rates), sender, &[])
     }
 
     pub fn query_value(&self, app: &mut MockApp, key: Option<String>) -> GetValueResponse {
@@ -109,8 +109,8 @@ pub fn mock_store_address_msgs(key: String, address: Addr) -> ExecuteMsg {
     }
 }
 
-pub fn mock_set_rate_msg(action: String, rate: Rate) -> ExecuteMsg {
-    ExecuteMsg::Rates(RatesMessage::SetRate { action, rate })
+pub fn mock_set_rate_msg(action: String, rates: Vec<Rate>) -> ExecuteMsg {
+    ExecuteMsg::Rates(RatesMessage::SetRate { action, rates })
 }
 
 pub fn mock_primitive_get_value(key: Option<String>) -> QueryMsg {

contracts/data-storage/andromeda-primitive/src/testing/tests.rs

@@ -70,14 +70,14 @@ fn test_set_value_with_tax() {
     // Set percent rates
     let set_percent_rate_msg = ExecuteMsg::Rates(RatesMessage::SetRate {
         action: "PrimitiveSetValue".to_string(),
-        rate: Rate::Local(LocalRate {
+        rates: vec![Rate::Local(LocalRate {
             rate_type: LocalRateType::Additive,
             recipients: vec![],
             value: LocalRateValue::Percent(PercentRate {
                 percent: Decimal::one(),
             }),
             description: None,
-        }),
+        })],
     });
 
     let err = execute(
@@ -91,16 +91,16 @@ fn test_set_value_with_tax() {
     assert_eq!(err, ContractError::InvalidRate {});
 
     // Make sure sender is set as recipient when the recipients vector is empty
-    let rate: Rate = Rate::Local(LocalRate {
+    let rates = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![],
         value: LocalRateValue::Flat(coin(20_u128, "uandr")),
         description: None,
-    });
+    })];
 
     let msg = ExecuteMsg::Rates(RatesMessage::SetRate {
         action: "SetValue".to_string(),
-        rate,
+        rates,
     });
     execute(deps.as_mut(), mock_env(), info.clone(), msg).unwrap();
 
@@ -109,15 +109,15 @@ fn test_set_value_with_tax() {
         .unwrap();
     assert_eq!(
         queried_rates.unwrap(),
-        Rate::Local(LocalRate {
+        vec![Rate::Local(LocalRate {
             rate_type: LocalRateType::Additive,
             recipients: vec![Recipient::new(AndrAddr::from_string("creator"), None)],
             value: LocalRateValue::Flat(coin(20_u128, "uandr")),
             description: None,
-        })
+        })]
     );
 
-    let rate: Rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string(tax_recipient.to_string()),
@@ -126,7 +126,7 @@ fn test_set_value_with_tax() {
         }],
         value: LocalRateValue::Flat(coin(20_u128, "uandr")),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()

contracts/fungible-tokens/andromeda-cw20/src/mock.rs

@@ -123,9 +123,9 @@ impl MockCW20 {
         app: &mut MockApp,
         sender: Addr,
         action: String,
-        rate: Rate,
+        rates: Vec<Rate>,
     ) -> ExecuteResult {
-        self.execute(app, &mock_set_rate_msg(action, rate), sender, &[])
+        self.execute(app, &mock_set_rate_msg(action, rates), sender, &[])
     }
 
     pub fn query_balance(&self, app: &MockApp, address: impl Into<String>) -> Uint128 {
@@ -220,6 +220,6 @@ pub fn mock_cw20_increase_allowance(spender: String, amount: Uint128) -> Execute
     }
 }
 
-pub fn mock_set_rate_msg(action: String, rate: Rate) -> ExecuteMsg {
-    ExecuteMsg::Rates(RatesMessage::SetRate { action, rate })
+pub fn mock_set_rate_msg(action: String, rates: Vec<Rate>) -> ExecuteMsg {
+    ExecuteMsg::Rates(RatesMessage::SetRate { action, rates })
 }

contracts/fungible-tokens/andromeda-cw20/src/testing/tests.rs

@@ -87,7 +87,7 @@ fn test_transfer() {
     };
 
     // Set a royalty of 10% to be paid to royalty_recipient
-    let rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Deductive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string("royalty_recipient".to_string()),
@@ -98,7 +98,7 @@ fn test_transfer() {
             percent: Decimal::percent(10),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()
@@ -193,7 +193,7 @@ fn test_send() {
             .unwrap()
     );
 
-    let rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string("rates_recipient".to_string()),
@@ -204,7 +204,7 @@ fn test_send() {
             percent: Decimal::percent(10),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()

contracts/non-fungible-tokens/andromeda-auction/src/mock.rs

@@ -107,9 +107,9 @@ impl MockAuction {
         app: &mut MockApp,
         sender: Addr,
         action: String,
-        rate: Rate,
+        rates: Vec<Rate>,
     ) -> ExecuteResult {
-        self.execute(app, &mock_set_rate_msg(action, rate), sender, &[])
+        self.execute(app, &mock_set_rate_msg(action, rates), sender, &[])
     }
 
     pub fn execute_set_permission(
@@ -229,8 +229,8 @@ pub fn mock_update_auction(
     }
 }
 
-pub fn mock_set_rate_msg(action: String, rate: Rate) -> ExecuteMsg {
-    ExecuteMsg::Rates(RatesMessage::SetRate { action, rate })
+pub fn mock_set_rate_msg(action: String, rates: Vec<Rate>) -> ExecuteMsg {
+    ExecuteMsg::Rates(RatesMessage::SetRate { action, rates })
 }
 
 pub fn mock_set_permission(actor: AndrAddr, action: String, permission: Permission) -> ExecuteMsg {

contracts/non-fungible-tokens/andromeda-auction/src/testing/tests.rs

@@ -1238,7 +1238,7 @@ fn execute_claim_with_tax() {
     let _res = init(deps.as_mut());
     let tax_recipient = "tax_recipient";
 
-    let rate: Rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string(tax_recipient.to_string()),
@@ -1247,7 +1247,7 @@ fn execute_claim_with_tax() {
         }],
         value: LocalRateValue::Flat(coin(20_u128, "uusd")),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()
@@ -1325,7 +1325,7 @@ fn execute_claim_with_royalty() {
     let _res = init(deps.as_mut());
     let royalty_recipient = "royalty_recipient";
 
-    let rate: Rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Deductive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string(royalty_recipient.to_string()),
@@ -1334,7 +1334,7 @@ fn execute_claim_with_royalty() {
         }],
         value: LocalRateValue::Flat(coin(20_u128, "uusd")),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()
@@ -1487,7 +1487,7 @@ fn execute_claim_cw20_with_tax() {
     let mut env = mock_env();
     let _res = init_cw20(deps.as_mut(), None);
     let tax_recipient = "tax_recipient";
-    let rate: Rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string(tax_recipient.to_string()),
@@ -1498,7 +1498,7 @@ fn execute_claim_cw20_with_tax() {
             percent: Decimal::percent(20),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()

contracts/non-fungible-tokens/andromeda-marketplace/src/mock.rs

@@ -65,9 +65,9 @@ impl MockMarketplace {
         app: &mut MockApp,
         sender: Addr,
         action: impl Into<String>,
-        rate: Rate,
+        rates: Vec<Rate>,
     ) -> ExecuteResult {
-        self.execute(app, &mock_set_rates(action, rate), sender, &[])
+        self.execute(app, &mock_set_rates(action, rates), sender, &[])
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -162,10 +162,10 @@ pub fn mock_buy_token(token_address: impl Into<String>, token_id: impl Into<Stri
     }
 }
 
-pub fn mock_set_rates(action: impl Into<String>, rate: Rate) -> ExecuteMsg {
+pub fn mock_set_rates(action: impl Into<String>, rates: Vec<Rate>) -> ExecuteMsg {
     ExecuteMsg::Rates(RatesMessage::SetRate {
         action: action.into(),
-        rate,
+        rates,
     })
 }
 

contracts/non-fungible-tokens/andromeda-marketplace/src/testing/tests.rs

@@ -655,7 +655,7 @@ fn test_execute_buy_with_tax_and_royalty_insufficient_funds() {
     start_sale(deps.as_mut(), Asset::NativeToken("uusd".to_string()));
     assert_sale_created(deps.as_ref(), mock_env(), "uusd".to_string(), false);
 
-    let rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string("tax_recipient".to_string()),
@@ -666,7 +666,7 @@ fn test_execute_buy_with_tax_and_royalty_insufficient_funds() {
             percent: Decimal::percent(50),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()
@@ -710,7 +710,7 @@ fn test_execute_buy_with_tax_and_royalty_insufficient_funds_cw20() {
         uses_cw20,
     );
 
-    let rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string("tax_recipient".to_string()),
@@ -721,7 +721,7 @@ fn test_execute_buy_with_tax_and_royalty_insufficient_funds_cw20() {
             percent: Decimal::percent(50),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()
@@ -787,7 +787,7 @@ fn test_execute_buy_with_tax_and_royalty_works() {
         token_address: MOCK_TOKEN_ADDR.to_string(),
     };
 
-    let rate = Rate::Local(LocalRate {
+    let rate = vec![Rate::Local(LocalRate {
         rate_type: LocalRateType::Additive,
         recipients: vec![Recipient {
             address: AndrAddr::from_string("tax_recipient".to_string()),
@@ -798,7 +798,7 @@ fn test_execute_buy_with_tax_and_royalty_works() {
             percent: Decimal::percent(50),
         }),
         description: None,
-    });
+    })];
 
     // Set rates
     ADOContract::default()

packages/std/src/ado_base/rates.rs

@@ -28,7 +28,7 @@ impl Default for RatesResponse {
 
 #[cw_serde]
 pub enum RatesMessage {
-    SetRate { action: String, rate: Rate },
+    SetRate { action: String, rates: Vec<Rate> },
     RemoveRate { action: String },
 }
 
@@ -248,5 +248,5 @@ pub fn calculate_fee(fee_rate: LocalRateValue, payment: &Coin) -> Result<Coin, C
 
 #[cw_serde]
 pub struct AllRatesResponse {
-    pub all_rates: Vec<(String, Rate)>,
+    pub all_rates: Vec<(String, Vec<Rate>)>,
 }

packages/std/src/ado_contract/execute.rs

@@ -1,3 +1,4 @@
+use crate::ado_base::rates::RatesMessage;
 use crate::ado_contract::ADOContract;
 use crate::amp::addresses::AndrAddr;
 use crate::amp::messages::AMPPkt;
@@ -100,7 +101,12 @@ impl<'a> ADOContract<'a> {
                     self.execute_update_app_contract(ctx.deps, ctx.info, address, None)
                 }
                 #[cfg(feature = "rates")]
-                AndromedaMsg::Rates(rates_message) => self.execute_rates(ctx, rates_message),
+                AndromedaMsg::Rates(rates_message) => match rates_message {
+                    RatesMessage::SetRate { action, rates } => {
+                        self.execute_set_rates(ctx, action, rates)
+                    }
+                    RatesMessage::RemoveRate { action } => self.execute_remove_rates(ctx, action),
+                },
                 AndromedaMsg::UpdateKernelAddress { address } => {
                     self.update_kernel_address(ctx.deps, ctx.info, address)
                 }