refactor: merged views

Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies]
- core-mx-liveliness-stake = {path="/Users/bucurdavid/dev/itheum/core-mx-liveliness-stake"}
+ core-mx-liveliness-stake = {git ="https://github.com/Itheum/core-mx-liveliness-stake.git",branch = "main"}
 
 [dependencies.multiversx-sc]
 version = "0.51.0"

src/life_bonding_sc_proxy.rs

@@ -189,6 +189,24 @@ where
             .original_result()
     }
 
+    pub fn top_up_address_vault<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+    >(
+        self,
+        address: Arg0,
+        token_identifier: Arg1,
+        nonce: Arg2,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("topUpAddressVault")
+            .argument(&address)
+            .argument(&token_identifier)
+            .argument(&nonce)
+            .original_result()
+    }
+
     pub fn stake_rewards<
         Arg0: ProxyArg<ManagedAddress<Env::Api>>,
         Arg1: ProxyArg<TokenIdentifier<Env::Api>>,
@@ -409,6 +427,19 @@ where
             .original_result()
     }
 
+    pub fn get_address_bonds_info<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, (BigUint<Env::Api>, BigUint<Env::Api>, BigUint<Env::Api>)> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getAddressBondsInfo")
+            .argument(&address)
+            .original_result()
+    }
+
     pub fn get_all_bonds(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, Bond<Env::Api>>> {
@@ -713,6 +744,19 @@ where
             .original_result()
     }
 
+    pub fn set_top_up_administrator<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        address: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("setTopUpAdministrator")
+            .argument(&address)
+            .original_result()
+    }
+
     pub fn set_administrator<
         Arg0: ProxyArg<ManagedAddress<Env::Api>>,
     >(
@@ -744,6 +788,15 @@ where
             .original_result()
     }
 
+    pub fn top_up_administrator(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getTopUpAdministrator")
+            .original_result()
+    }
+
     pub fn accepted_callers(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {

src/views.rs

@@ -176,14 +176,27 @@ pub trait ViewsModule:
     }
 
     #[view(getAddressBondsTotalValue)]
-    fn get_address_bonds_total_value(&self, address: ManagedAddress<Self::Api>) -> BigUint {
-        self.address_bonds(&address)
+    fn get_address_bonds_total_value(&self, address: &ManagedAddress<Self::Api>) -> BigUint {
+        self.address_bonds(address)
             .into_iter()
             .fold(BigUint::zero(), |acc, bond_id| {
                 acc + self.remaining_amount(bond_id).get()
             })
     }
 
+    #[view(getAddressBondsInfo)]
+    fn get_address_bonds_info(&self, address: ManagedAddress) -> (BigUint, BigUint, BigUint) {
+        let address_bonds_value = self.get_address_bonds_total_value(&address);
+        let address_bonds_avg_score = self.get_address_bonds_avg_score(address);
+        let total_bond_amount = self.total_bond_amount().get();
+
+        (
+            total_bond_amount,
+            address_bonds_value,
+            address_bonds_avg_score,
+        )
+    }
+
     #[view(getAllBonds)]
     fn get_all_bonds(&self) -> ManagedVec<Bond<Self::Api>> {
         self.bonds()

wasm/src/lib.rs

@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           59
+// Endpoints:                           60
 // Async Callback (empty):               1
-// Total number of exported functions:  62
+// Total number of exported functions:  63
 
 #![no_std]
 
@@ -44,6 +44,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         getAddressBonds => get_address_bonds
         getAddressBondsAvgScore => get_address_bonds_avg_score
         getAddressBondsTotalValue => get_address_bonds_total_value
+        getAddressBondsInfo => get_address_bonds_info
         getAllBonds => get_all_bonds
         getPagedBonds => get_paged_bonds
         getBondsLen => get_bonds_len