feat: update storage access to use persistent storage and extend TTL for escrow data

Author: armandocodecr

contracts/escrow/src/contract.rs

@@ -6,7 +6,7 @@ use crate::events::handler::{
     ChgEsc, DisEsc, DisputeResolved, EscrowDisputed, ExtTtlEvt, FundEsc, InitEsc,
     MilestoneApproved, MilestoneStatusChanged, WithdrawEvt,
 };
-use crate::storage::types::{AddressBalance, Escrow, MilestoneUpdate};
+use crate::storage::types::{AddressBalance, DataKey, Escrow, MilestoneUpdate};
 
 #[contract]
 pub struct EscrowContract;
@@ -131,10 +131,10 @@ impl EscrowContract {
             return Err(ContractError::OnlyPlatformAddressExecuteThisFunction);
         }
 
-        let min_ledgers = 1u32;
+        let min_ledgers = 17280u32;
         e.storage()
-            .instance()
-            .extend_ttl(min_ledgers, ledgers_to_extend);
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, min_ledgers, ledgers_to_extend);
 
         ExtTtlEvt {
             platform: platform_address,

contracts/escrow/src/core/dispute.rs

@@ -86,7 +86,10 @@ impl DisputeManager {
             }
         }
 
-        e.storage().instance().set(&DataKey::Escrow, &escrow);
+        e.storage().persistent().set(&DataKey::Escrow, &escrow);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
         Ok(escrow)
     }
@@ -175,7 +178,10 @@ impl DisputeManager {
         );
         escrow.milestones = updated_milestones;
 
-        e.storage().instance().set(&DataKey::Escrow, &escrow);
+        e.storage().persistent().set(&DataKey::Escrow, &escrow);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
         Ok(escrow)
     }
@@ -200,7 +206,10 @@ impl DisputeManager {
             .ok_or(ContractError::InvalidMileStoneIndex)?;
         target.flags.disputed = true;
         escrow.milestones.set(idx, target);
-        e.storage().instance().set(&DataKey::Escrow, &escrow);
+        e.storage().persistent().set(&DataKey::Escrow, &escrow);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
         Ok(escrow)
     }

contracts/escrow/src/core/escrow.rs

@@ -22,8 +22,11 @@ impl EscrowManager {
         let escrow_balance = token_client.balance(&e.current_contract_address());
         validate_initialize_escrow_conditions(e, escrow_properties.clone(), escrow_balance)?;
         e.storage()
-            .instance()
+            .persistent()
             .set(&DataKey::Escrow, &escrow_properties);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
         Ok(escrow_properties)
     }
 
@@ -61,7 +64,10 @@ impl EscrowManager {
             to_update.flags.released = true;
             escrow.milestones.set(milestone_index, to_update);
 
-            e.storage().instance().set(&DataKey::Escrow, &escrow);
+            e.storage().persistent().set(&DataKey::Escrow, &escrow);
+            e.storage()
+                .persistent()
+                .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
             let contract_address = e.current_contract_address();
             let token_client = TokenClient::new(&e, &escrow.trustline.address);
@@ -121,8 +127,11 @@ impl EscrowManager {
         )?;
 
         e.storage()
-            .instance()
+            .persistent()
             .set(&DataKey::Escrow, &escrow_properties);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
         Ok(escrow_properties)
     }
 
@@ -163,7 +172,7 @@ impl EscrowManager {
 
     pub fn get_escrow(e: &Env) -> Result<Escrow, ContractError> {
         e.storage()
-            .instance()
+            .persistent()
             .get(&DataKey::Escrow)
             .ok_or(ContractError::EscrowNotFound)?
     }

contracts/escrow/src/core/milestone.rs

@@ -48,7 +48,10 @@ impl MilestoneManager {
                 .set(idx, milestone_to_update);
         }
 
-        e.storage().instance().set(&DataKey::Escrow, &existing_escrow);
+        e.storage().persistent().set(&DataKey::Escrow, &existing_escrow);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
         Ok(existing_escrow)
     }
@@ -76,7 +79,10 @@ impl MilestoneManager {
         existing_escrow
             .milestones
             .set(milestone_index, milestone_to_update);
-        e.storage().instance().set(&DataKey::Escrow, &existing_escrow);
+        e.storage().persistent().set(&DataKey::Escrow, &existing_escrow);
+        e.storage()
+            .persistent()
+            .extend_ttl(&DataKey::Escrow, 17280, 31536000);
 
         Ok(existing_escrow)
     }

contracts/escrow/src/core/validators/escrow.rs

@@ -160,7 +160,7 @@ pub fn validate_initialize_escrow_conditions(
     escrow_properties: Escrow,
     escrow_balance: i128,
 ) -> Result<(), ContractError> {
-    if e.storage().instance().has(&DataKey::Escrow) {
+    if e.storage().persistent().has(&DataKey::Escrow) {
         return Err(ContractError::EscrowAlreadyInitialized);
     }