Merge remote-tracking branch 'origin' into fix_upgrade_polkadot_1.2.0

threefoldtech · Oct 7, 2024 · d38120d · d38120d
2 parents d5a1afb + 5e76664
commit d38120d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/030_create_release.yaml b/.github/workflows/030_create_release.yaml
@@ -28,6 +28,7 @@ jobs:
           workdir: '${{ github.workspace }}/substrate-node'
           package: tfchain-runtime
           runtime_dir: runtime
+          tag: "1.77.0"
 
       - name: Summary
         run: |

diff --git a/substrate-node/pallets/pallet-tft-bridge/src/tft_bridge.rs b/substrate-node/pallets/pallet-tft-bridge/src/tft_bridge.rs
@@ -26,12 +26,12 @@ impl<T: Config> Pallet<T> {
 
         // transfer new amount to target
         let amount_as_balance = BalanceOf::<T>::saturated_from(new_amount);
-        T::Currency::deposit_creating(&tx.target, amount_as_balance);
+        let _ = T::Currency::deposit_creating(&tx.target, amount_as_balance);
         // transfer deposit fee to fee wallet
         let deposit_fee_b = BalanceOf::<T>::saturated_from(deposit_fee);
 
         if let Some(fee_account) = FeeAccount::<T>::get() {
-            T::Currency::deposit_creating(&fee_account, deposit_fee_b);
+            let _ = T::Currency::deposit_creating(&fee_account, deposit_fee_b);
         }
 
         // Remove tx from storage
@@ -78,7 +78,7 @@ impl<T: Config> Pallet<T> {
 
         // transfer withdraw fee to fee wallet
         if let Some(fee_account) = FeeAccount::<T>::get() {
-            T::Currency::deposit_creating(&fee_account, withdraw_fee_b);
+            let _ = T::Currency::deposit_creating(&fee_account, withdraw_fee_b);
         }
 
         // increment burn transaction id
@@ -240,9 +240,11 @@ impl<T: Config> Pallet<T> {
             Error::<T>::BurnTransactionAlreadyExecuted
         );
 
-        let Some(mut burn_tx) = BurnTransactions::<T>::get(tx_id) else {return Err(DispatchErrorWithPostInfo::from(
-            Error::<T>::BurnTransactionNotExists,
-        ));};
+        let Some(mut burn_tx) = BurnTransactions::<T>::get(tx_id) else {
+            return Err(DispatchErrorWithPostInfo::from(
+                Error::<T>::BurnTransactionNotExists,
+            ));
+        };
 
         ensure!(
             BurnTransactions::<T>::contains_key(tx_id),
@@ -286,9 +288,11 @@ impl<T: Config> Pallet<T> {
         stellar_pub_key: Vec<u8>,
         sequence_number: u64,
     ) -> DispatchResultWithPostInfo {
-        let Some(mut tx) = BurnTransactions::<T>::get(&tx_id) else {return Err(DispatchErrorWithPostInfo::from(
-            Error::<T>::BurnTransactionNotExists,
-        ));};
+        let Some(mut tx) = BurnTransactions::<T>::get(&tx_id) else {
+            return Err(DispatchErrorWithPostInfo::from(
+                Error::<T>::BurnTransactionNotExists,
+            ));
+        };
 
         let validators = Validators::<T>::get();
         if tx.signatures.len() == (validators.len() / 2) + 1 {
@@ -346,9 +350,11 @@ impl<T: Config> Pallet<T> {
             Error::<T>::BurnTransactionNotExists
         );
 
-        let Some(tx) = BurnTransactions::<T>::get(tx_id) else {return Err(DispatchErrorWithPostInfo::from(
-            Error::<T>::BurnTransactionNotExists,
-        ));};
+        let Some(tx) = BurnTransactions::<T>::get(tx_id) else {
+            return Err(DispatchErrorWithPostInfo::from(
+                Error::<T>::BurnTransactionNotExists,
+            ));
+        };
 
         BurnTransactions::<T>::remove(tx_id);
         ExecutedBurnTransactions::<T>::insert(tx_id, &tx);