Fix get remaining value and available (#336)

* fix farming Manjarisoa issue * Add getter to calculate remaining and available values
Carbonable · Mar 6, 2024 · 6918221 · 6918221
1 parent bd67905
commit 6918221
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/components/farm/module.cairo b/src/components/farm/module.cairo
@@ -601,7 +601,7 @@ mod Farm {
                 );
 
                 // [Check] Absorption is not null otherwise return 0
-                assert(previous_absorption < current_absorption, 'No absorption');
+                assert(previous_absorption <= current_absorption, 'No absorption');
                 let new_absorption: u256 = current_absorption - previous_absorption;
 
                 // [Compute] Store results and update variables for the next iter

diff --git a/src/components/mint/interface.cairo b/src/components/mint/interface.cairo
@@ -12,6 +12,8 @@ trait IMint<TContractState> {
     fn get_max_value_per_tx(self: @TContractState) -> u256;
     fn get_unit_price(self: @TContractState) -> u256;
     fn get_reserved_value(self: @TContractState) -> u256;
+    fn get_remaining_value(self: @TContractState) -> u256;
+    fn get_available_value(self: @TContractState) -> u256;
     fn get_max_value(self: @TContractState) -> u256;
     fn get_whitelist_merkle_root(self: @TContractState) -> felt252;
     fn get_whitelist_allocation(

diff --git a/src/components/mint/module.cairo b/src/components/mint/module.cairo
@@ -135,6 +135,21 @@ mod Mint {
             self._mint_reserved_value.read()
         }
 
+        fn get_remaining_value(self: @ContractState) -> u256 {
+            let project_address = self._mint_carbonable_project_address.read();
+            let slot = self._mint_carbonable_project_slot.read();
+            let project = IProjectDispatcher { contract_address: project_address };
+            let total_value = project.total_value(slot);
+            let available_value = self.get_available_value();
+            available_value - total_value
+        }
+
+        fn get_available_value(self: @ContractState) -> u256 {
+            let max_value = self._mint_max_value.read();
+            let reserved_value = self._mint_reserved_value.read();
+            max_value - reserved_value
+        }
+
         fn get_max_value(self: @ContractState) -> u256 {
             self._mint_max_value.read()
         }

diff --git a/src/contracts/minter.cairo b/src/contracts/minter.cairo
@@ -136,6 +136,16 @@ mod Minter {
             Mint::MintImpl::get_reserved_value(@unsafe_state)
         }
 
+        fn get_remaining_value(self: @ContractState) -> u256 {
+            let unsafe_state = Mint::unsafe_new_contract_state();
+            Mint::MintImpl::get_remaining_value(@unsafe_state)
+        }
+
+        fn get_available_value(self: @ContractState) -> u256 {
+            let unsafe_state = Mint::unsafe_new_contract_state();
+            Mint::MintImpl::get_available_value(@unsafe_state)
+        }
+
         fn get_max_value(self: @ContractState) -> u256 {
             let unsafe_state = Mint::unsafe_new_contract_state();
             Mint::MintImpl::get_max_value(@unsafe_state)