From 4484a433972c8afd9fae7c283e5183da031ffe3b Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Fri, 10 Nov 2023 11:45:22 +0100
Subject: [PATCH 1/2] runtime-sdk: Add test for common pool and fee accumulator
 addresses

---
 runtime-sdk/src/modules/accounts/test.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/runtime-sdk/src/modules/accounts/test.rs b/runtime-sdk/src/modules/accounts/test.rs
index 6e6b82384a..f9cf911f87 100644
--- a/runtime-sdk/src/modules/accounts/test.rs
+++ b/runtime-sdk/src/modules/accounts/test.rs
@@ -1457,3 +1457,16 @@ fn test_fee_refund_subcall() {
     assert_eq!(events.len(), 1);
     assert_eq!(events[0].amount, 11_000);
 }
+
+#[test]
+fn test_pool_addresses() {
+    assert_eq!(
+        ADDRESS_COMMON_POOL.to_bech32(),
+        "oasis1qz78phkdan64g040cvqvqpwkplfqf6tj6uwcsh30"
+    );
+
+    assert_eq!(
+        ADDRESS_FEE_ACCUMULATOR.to_bech32(),
+        "oasis1qp3r8hgsnphajmfzfuaa8fhjag7e0yt35cjxq0u4"
+    );
+}

From 63f89de945b847e69791bf165c67e83f808bad78 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Fri, 10 Nov 2023 11:45:30 +0100
Subject: [PATCH 2/2] runtime-sdk: Don't emit events for zero fee remainder
 transfers

---
 runtime-sdk/src/modules/accounts/mod.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime-sdk/src/modules/accounts/mod.rs b/runtime-sdk/src/modules/accounts/mod.rs
index a27f7f8f34..37a6fd86de 100644
--- a/runtime-sdk/src/modules/accounts/mod.rs
+++ b/runtime-sdk/src/modules/accounts/mod.rs
@@ -1056,6 +1056,10 @@ impl module::BlockHandler for Module {
 
         // Transfer remainder to a common pool account.
         for (denom, remainder) in previous_fees.into_iter() {
+            if remainder.is_zero() {
+                continue;
+            }
+
             let amount = token::BaseUnits::new(remainder, denom);
             Self::add_amount(*ADDRESS_COMMON_POOL, &amount)
                 .expect("add_amount must succeed for transfer to common pool");