release: 2.2.0 (#94)

Author: vasyafromrussia

Cargo.lock

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

contract/Cargo.toml

@@ -9,8 +9,12 @@ use sweat_jar_model::{
 };
 
 use crate::{
-    common::Timestamp,
+    common::{
+        gas_data::{GAS_FOR_AFTER_CLAIM, GAS_FOR_FT_TRANSFER},
+        Timestamp,
+    },
     event::{emit, ClaimEventItem, EventKind},
+    internal::assert_gas,
     jar::model::Jar,
     Contract, ContractExt, JarsStorage,
 };
@@ -135,6 +139,11 @@ impl Contract {
         now: Timestamp,
     ) -> PromiseOrValue<ClaimedAmountView> {
         use crate::ft_interface::FungibleTokenInterface;
+
+        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())
+        });
+
         self.ft_contract()
             .ft_transfer(account_id, claimed_amount.get_total().0, "claim", &None)
             .then(after_claim_call(claimed_amount, jars_before_transfer, event, now))

contract/src/claim/api.rs

@@ -193,7 +193,7 @@ mod test {
     fn test_contract_version() {
         let admin = admin();
         let context = Context::new(admin);
-        assert_eq!(context.contract().contract_version(), "sweat_jar-2.1.0");
+        assert_eq!(context.contract().contract_version(), "sweat_jar-2.2.0");
     }
 
     #[test]
@@ -206,7 +206,7 @@ mod test {
             .to_json_event_string(),
             r#"EVENT_JSON:{
   "standard": "sweat_jar",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "event": "top_up",
   "data": {
     "id": 10,
@@ -234,7 +234,7 @@ mod test {
             .to_json_event_string(),
             r#"EVENT_JSON:{
   "standard": "sweat_jar",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "event": "create_jar",
   "data": {
     "id": 555,

contract/src/event.rs

@@ -191,4 +191,17 @@ impl JarApi for Contract {
 
         result
     }
+
+    fn unlock_jars_for_account(&mut self, account_id: AccountId) {
+        self.assert_manager();
+
+        let jars = self
+            .account_jars
+            .get_mut(&account_id)
+            .expect("Account doesn't have jars");
+
+        for jar in &mut jars.jars {
+            jar.is_pending_withdraw = false;
+        }
+    }
 }

contract/src/jar/api.rs

@@ -13,6 +13,7 @@ impl From<Jar> for JarView {
             principal: U128(value.principal),
             claimed_balance: U128(value.claimed_balance),
             is_penalty_applied: value.is_penalty_applied,
+            is_pending_withdraw: value.is_pending_withdraw,
         }
     }
 }
@@ -27,6 +28,7 @@ impl From<&Jar> for JarView {
             principal: U128(value.principal),
             claimed_balance: U128(value.claimed_balance),
             is_penalty_applied: value.is_penalty_applied,
+            is_pending_withdraw: value.is_pending_withdraw,
         }
     }
 }

contract/src/jar/view.rs

@@ -388,6 +388,58 @@ fn get_interest_after_withdraw() {
     assert_eq!(12_000_000, interest.amount.total.0);
 }
 
+#[test]
+#[should_panic(expected = "Can be performed only by admin")]
+fn unlock_not_by_manager() {
+    let alice = alice();
+    let admin = admin();
+
+    let reference_product = generate_product();
+
+    let mut reference_jar = Jar::generate(0, &alice, &reference_product.id).principal(100);
+    reference_jar.is_pending_withdraw = true;
+    let jars = &[reference_jar];
+
+    let mut context = Context::new(admin).with_products(&[reference_product]).with_jars(jars);
+
+    context.switch_account(&alice);
+    context.contract().unlock_jars_for_account(alice);
+}
+
+#[test]
+fn unlock_by_manager() {
+    let alice = alice();
+    let admin = admin();
+
+    let reference_product = generate_product();
+
+    let reference_jar_id = 0;
+    let mut reference_jar = Jar::generate(reference_jar_id, &alice, &reference_product.id).principal(100);
+    reference_jar.is_pending_withdraw = true;
+    let jars = &[reference_jar];
+
+    let mut context = Context::new(admin.clone())
+        .with_products(&[reference_product])
+        .with_jars(jars);
+
+    assert!(
+        context
+            .contract()
+            .get_jar(alice.clone(), reference_jar_id.into())
+            .is_pending_withdraw
+    );
+
+    context.switch_account(&admin);
+    context.contract().unlock_jars_for_account(alice.clone());
+
+    assert!(
+        !context
+            .contract()
+            .get_jar(alice.clone(), reference_jar_id.into())
+            .is_pending_withdraw
+    );
+}
+
 #[test]
 fn test_u32() {
     let n = U32(12345678);

contract/src/tests.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sweat-jar-model"
-version = "2.1.0"
+version = "2.2.0"
 publish = false
 edition = "2021"
 

model/Cargo.toml

@@ -162,6 +162,8 @@ pub trait JarApi {
     fn restake(&mut self, jar_id: JarIdView) -> JarView;
 
     fn restake_all(&mut self) -> Vec<JarView>;
+
+    fn unlock_jars_for_account(&mut self, account_id: AccountId);
 }
 
 #[make_integration_version]

model/src/api.rs

@@ -23,6 +23,7 @@ pub struct JarView {
     pub principal: U128,
     pub claimed_balance: U128,
     pub is_penalty_applied: bool,
+    pub is_pending_withdraw: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]