release: 3.0.0 (#98)

Author: VladasZ

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sweat_jar"
-version = "2.2.0"
+version = "3.0.0"
 authors = ["Sweat Economy"]
 edition = "2021"
 

contract/Cargo.toml

@@ -1,5 +1,3 @@
-use std::cmp;
-
 use near_sdk::{env, ext_contract, is_promise_success, json_types::U128, near_bindgen, AccountId, PromiseOrValue};
 use sweat_jar_model::{
     api::ClaimApi,
@@ -9,12 +7,8 @@ use sweat_jar_model::{
 };
 
 use crate::{
-    common::{
-        gas_data::{GAS_FOR_AFTER_CLAIM, GAS_FOR_FT_TRANSFER},
-        Timestamp,
-    },
+    common::Timestamp,
     event::{emit, ClaimEventItem, EventKind},
-    internal::assert_gas,
     jar::model::Jar,
     Contract, ContractExt, JarsStorage,
 };
@@ -36,18 +30,7 @@ impl ClaimApi for Contract {
         let account_id = env::predecessor_account_id();
         self.migrate_account_jars_if_needed(account_id.clone());
         let jar_ids = self.account_jars(&account_id).iter().map(|a| U32(a.id)).collect();
-        self.claim_jars_internal(account_id, jar_ids, None, detailed)
-    }
-
-    fn claim_jars(
-        &mut self,
-        jar_ids: Vec<JarIdView>,
-        amount: Option<U128>,
-        detailed: Option<bool>,
-    ) -> PromiseOrValue<ClaimedAmountView> {
-        let account_id = env::predecessor_account_id();
-        self.migrate_account_jars_if_needed(account_id.clone());
-        self.claim_jars_internal(account_id, jar_ids, amount, detailed)
+        self.claim_jars_internal(account_id, jar_ids, detailed)
     }
 }
 
@@ -56,7 +39,6 @@ impl Contract {
         &mut self,
         account_id: AccountId,
         jar_ids: Vec<JarIdView>,
-        amount: Option<U128>,
         detailed: Option<bool>,
     ) -> PromiseOrValue<ClaimedAmountView> {
         let now = env::block_timestamp_ms();
@@ -75,23 +57,16 @@ impl Contract {
             let product = self.get_product(&jar.product_id);
             let (available_interest, remainder) = jar.get_interest(&product, now);
 
-            let interest_to_claim = amount.map_or(available_interest, |amount| {
-                cmp::min(available_interest, amount.0 - accumulator.get_total().0)
-            });
-
-            if interest_to_claim > 0 {
+            if available_interest > 0 {
                 let jar = self.get_jar_mut_internal(&jar.account_id, jar.id);
 
                 jar.claim_remainder = remainder;
 
-                jar.claim(available_interest, interest_to_claim, now).lock();
+                jar.claim(available_interest, available_interest, now).lock();
 
-                accumulator.add(jar.id, interest_to_claim);
+                accumulator.add(jar.id, available_interest);
 
-                event_data.push(ClaimEventItem {
-                    id: jar.id,
-                    interest_to_claim: U128(interest_to_claim),
-                });
+                event_data.push((jar.id, U128(available_interest)));
             }
         }
 
@@ -138,7 +113,11 @@ impl Contract {
         event: EventKind,
         now: Timestamp,
     ) -> PromiseOrValue<ClaimedAmountView> {
-        use crate::ft_interface::FungibleTokenInterface;
+        use crate::{
+            common::gas_data::{GAS_FOR_AFTER_CLAIM, GAS_FOR_FT_TRANSFER},
+            ft_interface::FungibleTokenInterface,
+            internal::assert_gas,
+        };
 
         assert_gas(GAS_FOR_FT_TRANSFER.as_gas() * 2 + GAS_FOR_AFTER_CLAIM.as_gas(), || {
             format!("claim_interest: number of jars: {}", jars_before_transfer.len())

contract/src/claim/api.rs

@@ -2,7 +2,7 @@
 
 use near_sdk::{json_types::U128, test_utils::test_env::alice, PromiseOrValue};
 use sweat_jar_model::{
-    api::{ClaimApi, JarApi, WithdrawApi},
+    api::{ClaimApi, WithdrawApi},
     claimed_amount_view::ClaimedAmountView,
     MS_IN_YEAR, U32,
 };
@@ -62,43 +62,6 @@ fn claim_total_detailed_when_having_tokens() {
     assert_eq!(jar_1_expected_interest, value.detailed.get(&U32(jar_1.id)).unwrap().0);
 }
 
-#[test]
-fn claim_partially_detailed_when_having_tokens() {
-    let alice = alice();
-    let admin = admin();
-
-    let product = generate_product();
-    let jar_0 = Jar::generate(0, &alice, &product.id).principal(100_000_000);
-    let jar_1 = Jar::generate(1, &alice, &product.id).principal(200_000_000);
-    let mut context = Context::new(admin)
-        .with_products(&[product.clone()])
-        .with_jars(&[jar_0.clone(), jar_1.clone()]);
-
-    let product_term = product.get_lockup_term().unwrap();
-    let test_duration = product_term + 100;
-
-    let jar_0_expected_interest = jar_0.get_interest(&product, test_duration).0;
-    let jar_1_expected_interest = jar_1.get_interest(&product, test_duration).0 - 1;
-
-    context.set_block_timestamp_in_ms(test_duration);
-
-    context.switch_account(&alice);
-    let result = context.contract().claim_jars(
-        vec![U32(jar_0.id), U32(jar_1.id)],
-        Some(U128(jar_0_expected_interest + jar_1_expected_interest)),
-        Some(true),
-    );
-
-    let PromiseOrValue::Value(ClaimedAmountView::Detailed(value)) = result else {
-        panic!();
-    };
-
-    assert_eq!(jar_0_expected_interest + jar_1_expected_interest, value.total.0);
-
-    assert_eq!(jar_0_expected_interest, value.detailed.get(&U32(jar_0.id)).unwrap().0);
-    assert_eq!(jar_1_expected_interest, value.detailed.get(&U32(jar_1.id)).unwrap().0);
-}
-
 #[test]
 fn claim_pending_withdraw_jar() {
     let alice = alice();
@@ -118,16 +81,11 @@ fn claim_pending_withdraw_jar() {
     let test_duration = product_term + 100;
 
     let jar_0_expected_interest = jar_0.get_interest(&product, test_duration);
-    let jar_1_expected_interest = jar_1.get_interest(&product, test_duration).0 - 1;
 
     context.set_block_timestamp_in_ms(test_duration);
 
     context.switch_account(&alice);
-    let result = context.contract().claim_jars(
-        vec![U32(jar_0.id), U32(jar_1.id)],
-        Some(U128(jar_0_expected_interest.0 + jar_1_expected_interest)),
-        Some(true),
-    );
+    let result = context.contract().claim_total(Some(true));
 
     let PromiseOrValue::Value(ClaimedAmountView::Detailed(value)) = result else {
         panic!();
@@ -139,65 +97,6 @@ fn claim_pending_withdraw_jar() {
     assert_eq!(None, value.detailed.get(&U32(jar_1.id)));
 }
 
-#[test]
-fn claim_partially_detailed_when_having_tokens_and_request_sum_of_single_deposit() {
-    let alice = alice();
-    let admin = admin();
-
-    let product = generate_product();
-    let jar_0 = Jar::generate(0, &alice, &product.id).principal(100_000_000);
-    let jar_1 = Jar::generate(1, &alice, &product.id).principal(200_000_000);
-    let mut context = Context::new(admin)
-        .with_products(&[product.clone()])
-        .with_jars(&[jar_0.clone(), jar_1.clone()]);
-
-    let product_term = product.get_lockup_term().unwrap();
-    let test_duration = product_term + 100;
-
-    let jar_0_expected_interest = jar_0.get_interest(&product, test_duration).0;
-
-    context.set_block_timestamp_in_ms(test_duration);
-
-    context.switch_account(&alice);
-    let result = context.contract().claim_jars(
-        vec![U32(jar_0.id), U32(jar_1.id)],
-        Some(U128(jar_0_expected_interest)),
-        Some(true),
-    );
-
-    let PromiseOrValue::Value(ClaimedAmountView::Detailed(value)) = result else {
-        panic!();
-    };
-
-    assert_eq!(jar_0_expected_interest, value.total.0);
-
-    assert_eq!(jar_0_expected_interest, value.detailed.get(&U32(jar_0.id)).unwrap().0);
-    assert!(!value.detailed.contains_key(&U32(jar_1.id)));
-}
-
-#[test]
-fn claim_partially_when_having_tokens_to_claim() {
-    let alice = alice();
-    let admin = admin();
-
-    let product = generate_product();
-    let jar = Jar::generate(0, &alice, &product.id).principal(100_000_000_000);
-    let mut context = Context::new(admin).with_products(&[product]).with_jars(&[jar.clone()]);
-
-    context.set_block_timestamp_in_days(365);
-
-    context.switch_account(&alice);
-    let claimed = context
-        .contract()
-        .claim_jars(vec![U32(jar.id)], Some(U128(100)), None)
-        .unwrap();
-
-    assert_eq!(claimed.get_total().0, 100);
-
-    let jar = context.contract().get_jar(alice, U32(jar.id));
-    assert_eq!(100, jar.claimed_balance.0);
-}
-
 #[test]
 fn dont_delete_jar_on_all_interest_claim() {
     let alice = alice();
@@ -210,9 +109,7 @@ fn dont_delete_jar_on_all_interest_claim() {
     context.set_block_timestamp_in_days(365);
 
     context.switch_account(&alice);
-    context
-        .contract()
-        .claim_jars(vec![U32(jar.id)], Some(U128(200_000)), None);
+    context.contract().claim_total(None);
 
     let jar = context.contract().get_jar_internal(&alice, jar.id);
     assert_eq!(200_000, jar.claimed_balance);
@@ -241,10 +138,7 @@ fn claim_all_withdraw_all_and_delete_jar() {
     context.set_block_timestamp_in_ms(product.get_lockup_term().unwrap() + 1);
 
     context.switch_account(&alice);
-    let claimed = context
-        .contract()
-        .claim_jars(vec![U32(jar_id)], Some(U128(200_000)), None)
-        .unwrap();
+    let claimed = context.contract().claim_total(None).unwrap();
 
     assert_eq!(200_000, claimed.get_total().0);
 
@@ -292,10 +186,7 @@ fn withdraw_all_claim_all_and_delete_jar() {
 
     assert_eq!(jar.principal, 0);
 
-    let claimed = context
-        .contract()
-        .claim_jars(vec![U32(jar_id)], Some(U128(200_000)), None)
-        .unwrap();
+    let claimed = context.contract().claim_total(None).unwrap();
 
     assert_eq!(claimed.get_total(), U128(200_000));
 
@@ -319,10 +210,7 @@ fn failed_future_claim() {
 
     let jar_before_claim = context.contract().get_jar_internal(&alice, jar.id).clone();
 
-    let claimed = context
-        .contract()
-        .claim_jars(vec![U32(jar.id)], Some(U128(200_000)), None)
-        .unwrap();
+    let claimed = context.contract().claim_total(None).unwrap();
 
     assert_eq!(claimed.get_total().0, 0);
 

contract/src/claim/tests.rs

@@ -76,12 +76,8 @@ struct SweatJarEvent {
     event_kind: EventKind,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(crate = "near_sdk::serde")]
-pub struct ClaimEventItem {
-    pub id: JarId,
-    pub interest_to_claim: U128,
-}
+/// `JarId` and interest to claim
+pub type ClaimEventItem = (JarId, U128);
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(crate = "near_sdk::serde")]
@@ -193,7 +189,7 @@ mod test {
     fn test_contract_version() {
         let admin = admin();
         let context = Context::new(admin);
-        assert_eq!(context.contract().contract_version(), "sweat_jar-2.2.0");
+        assert_eq!(context.contract().contract_version(), "sweat_jar-3.0.0");
     }
 
     #[test]
@@ -206,7 +202,7 @@ mod test {
             .to_json_event_string(),
             r#"EVENT_JSON:{
   "standard": "sweat_jar",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "event": "top_up",
   "data": {
     "id": 10,
@@ -234,7 +230,7 @@ mod test {
             .to_json_event_string(),
             r#"EVENT_JSON:{
   "standard": "sweat_jar",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "event": "create_jar",
   "data": {
     "id": 555,
@@ -247,6 +243,25 @@ mod test {
     "is_pending_withdraw": false,
     "is_penalty_applied": false
   }
+}"#
+        );
+
+        assert_eq!(
+            SweatJarEvent::from(EventKind::Claim(vec![(1, 1.into()), (2, 2.into())])).to_json_event_string(),
+            r#"EVENT_JSON:{
+  "standard": "sweat_jar",
+  "version": "3.0.0",
+  "event": "claim",
+  "data": [
+    [
+      1,
+      "1"
+    ],
+    [
+      2,
+      "2"
+    ]
+  ]
 }"#
         );
     }