Shiden - burn only fee, not the tip (#817)

* Shiden - burn only fee, not the tip * Remove double burn * Adjust Astar & Shibuya
AstarNetwork · Jan 9, 2023 · 55e4148 · 55e4148
1 parent 5422c87
commit 55e4148
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -619,7 +619,7 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
             let (to_burn, collators) = fees.ration(20, 80);
 
             // burn part of fees
-            let _ = Balances::burn(to_burn.peek());
+            drop(to_burn);
 
             // pay fees to collators
             <ToStakingPot as OnUnbalanced<_>>::on_unbalanced(collators);

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -716,7 +716,7 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
             let (to_burn, collators) = fees.ration(20, 80);
 
             // burn part of fees
-            let _ = Balances::burn(to_burn.peek());
+            drop(to_burn);
 
             // pay fees to collators
             <ToStakingPot as OnUnbalanced<_>>::on_unbalanced(collators);

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -656,8 +656,16 @@ impl WeightToFeePolynomial for WeightToFee {
 
 pub struct BurnFees;
 impl OnUnbalanced<NegativeImbalance> for BurnFees {
-    fn on_unbalanceds<B>(_: impl Iterator<Item = NegativeImbalance>) {
-        // burns the fees
+    /// Payout tips but burn all the fees
+    fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {
+        if let Some(fees_to_burn) = fees_then_tips.next() {
+            if let Some(tips) = fees_then_tips.next() {
+                <ToStakingPot as OnUnbalanced<_>>::on_unbalanced(tips);
+            }
+
+            // burn fees
+            drop(fees_to_burn);
+        }
     }
 }