informalsystems · romac · Jan 27, 2022 · Jan 26, 2022 · Jan 26, 2022 · Jan 26, 2022
diff --git a/.changelog/unreleased/breaking-changes/1817-remove-filter-option.md b/.changelog/unreleased/breaking-changes/1817-remove-filter-option.md
@@ -0,0 +1,2 @@
+- Remove `mode.packets.filter` config option and enable filtering by default
+  ([#1817](https://github.com/informalsystems/ibc-rs/issues/1817))
diff --git a/ci/simple_config.toml b/ci/simple_config.toml
@@ -18,7 +18,6 @@ enabled = false
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [telemetry]
@@ -58,4 +57,4 @@ max_tx_size = 2097152
 gas_price = { price = 0.001, denom = 'stake' }
 clock_drift = '5s'
 trusting_period = '14days'
-trust_threshold = { numerator = '1', denominator = '3' }
+trust_threshold = { numerator = '1', denominator = '3' }
diff --git a/config.toml b/config.toml
@@ -50,18 +50,6 @@ clear_interval = 100
 # Whether or not to clear packets on start. [Default: false]
 clear_on_start = true
 
-# Enable or disable the filtering mechanism.
-# Valid options are 'true', 'false'.
-# Currently Hermes supports two filters:
-# 1. Packet filtering on a per-chain basis; see the chain-specific
-#   filter specification below in [chains.packet_filter].
-# 2. Filter for all activities based on client state trust threshold; this filter
-#   is parametrized with (numerator = 1, denominator = 3), so that clients with
-#   thresholds different than this will be ignored.
-# If set to 'true', both of the above filters will be enabled.
-# [Default: false]
-filter = false
-
 # Toggle the transaction confirmation mechanism.
 # The tx confirmation mechanism periodically queries the `/tx_search` RPC
 # endpoint to check that previously-submitted transactions
@@ -207,9 +195,9 @@ trust_threshold = { numerator = '1', denominator = '3' }
 memo_prefix = ''
 
 # This section specifies the filters for policy based relaying.
-# Default: no policy/ filters
-# The section is ignored if the global 'filter' option is set to 'false'.
-# If the global 'filter' option is set to 'true' and this section is missing then no filtering is performed for this chain.
+#
+# Default: no policy / filters, allow all packets on all channels.
+#
 # Only packet filtering based on channel identifier can be specified.
 # A channel filter has two fields:
 # 1. `policy` - one of two types are supported:

diff --git a/docs/architecture/adr-002-ibc-relayer.md b/docs/architecture/adr-002-ibc-relayer.md
@@ -136,7 +136,6 @@ enabled = false
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [[chains]]

diff --git a/guide/src/config.md b/guide/src/config.md
@@ -68,7 +68,6 @@ enabled = false
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [rest]

diff --git a/guide/src/tutorials/local-chains/relay-paths/multiple-paths.md b/guide/src/tutorials/local-chains/relay-paths/multiple-paths.md
@@ -9,25 +9,24 @@ Follow the steps below to connect three chains together and relay packets betwee
     ```toml
     [global]
     log_level = 'info'
-   
+
     [mode]
-    
+
     [mode.clients]
     enabled = true
     refresh = true
     misbehaviour = true
-    
+
     [mode.connections]
     enabled = false
-    
+
     [mode.channels]
     enabled = false
-    
+
     [mode.packets]
     enabled = true
     clear_interval = 100
     clear_on_start = true
-    filter = false
     tx_confirmation = true
 
     [[chains]]

diff --git a/relayer-cli/tests/fixtures/two_chains.toml b/relayer-cli/tests/fixtures/two_chains.toml
@@ -18,7 +18,6 @@ enabled = false
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [[chains]]

diff --git a/relayer/src/config.rs b/relayer/src/config.rs
@@ -108,10 +108,6 @@ pub mod default {
         true
     }
 
-    pub fn filter() -> bool {
-        false
-    }
-
     pub fn clear_packets_interval() -> u64 {
         100
     }
@@ -172,13 +168,9 @@ impl Config {
         port_id: &PortId,
         channel_id: &ChannelId,
     ) -> bool {
-        if !self.mode.packets.filter {
-            return true;
-        }
-
         match self.find_chain(chain_id) {
-            None => false,
             Some(chain_config) => chain_config.packet_filter.is_allowed(port_id, channel_id),
+            None => false,
         }
     }
 
@@ -219,7 +211,6 @@ impl Default for ModeConfig {
                 enabled: true,
                 clear_interval: default::clear_packets_interval(),
                 clear_on_start: true,
-                filter: false,
                 tx_confirmation: true,
             },
         }
@@ -256,8 +247,6 @@ pub struct Packets {
     pub clear_interval: u64,
     #[serde(default)]
     pub clear_on_start: bool,
-    #[serde(default = "default::filter")]
-    pub filter: bool,
     #[serde(default = "default::tx_confirmation")]
     pub tx_confirmation: bool,
 }
@@ -268,7 +257,6 @@ impl Default for Packets {
             enabled: false,
             clear_interval: default::clear_packets_interval(),
             clear_on_start: false,
-            filter: default::filter(),
             tx_confirmation: default::tx_confirmation(),
         }
     }

diff --git a/relayer/src/supervisor.rs b/relayer/src/supervisor.rs
@@ -285,16 +285,17 @@ pub fn spawn_rest_worker<Chain: ChainHandle>(
 /// Returns `true` if the relayer should filter based on
 /// client state attributes, e.g., trust threshold.
 /// Returns `false` otherwise.
-fn client_filter_enabled(config: &Config) -> bool {
-    // Currently just a wrapper over the global filter.
-    config.mode.packets.filter
+fn client_filter_enabled(_config: &Config) -> bool {
+    // we currently always enable the client filter
+    true
 }
 
 /// Returns `true` if the relayer should filter based on
 /// channel identifiers.
 /// Returns `false` otherwise.
-fn channel_filter_enabled(config: &Config) -> bool {
-    config.mode.packets.filter
+fn channel_filter_enabled(_config: &Config) -> bool {
+    // we currently always enable the channel filter
+    true
 }
 
 fn relay_packets_on_channel(

diff --git a/relayer/src/supervisor/scan.rs b/relayer/src/supervisor/scan.rs
@@ -499,7 +499,8 @@ impl<'a, Chain: ChainHandle> ChainScanner<'a, Chain> {
     }
 
     fn filtering_enabled(&self) -> bool {
-        self.config.mode.packets.filter
+        // filtering is always enabled
+        true
     }
 
     fn use_allow_list<'b>(&self, chain_config: &'b ChainConfig) -> Option<&'b ChannelsSpec> {

diff --git a/relayer/tests/config/fixtures/relayer_conf_example.toml b/relayer/tests/config/fixtures/relayer_conf_example.toml
@@ -18,7 +18,6 @@ enabled = false
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [[chains]]

diff --git a/scripts/gm/bin/lib-gm b/scripts/gm/bin/lib-gm
@@ -967,7 +967,6 @@ enabled = true
 enabled = true
 clear_interval = 100
 clear_on_start = true
-filter = false
 tx_confirmation = true
 
 [telemetry]

diff --git a/tools/integration-test/src/tests/client_expiration.rs b/tools/integration-test/src/tests/client_expiration.rs
@@ -114,7 +114,6 @@ impl TestOverrides for ExpirationTestOverrides {
                 enabled: true,
                 clear_interval: 10,
                 clear_on_start: true,
-                filter: false,
                 tx_confirmation: true,
             },
         };

diff --git a/tools/integration-test/src/tests/supervisor.rs b/tools/integration-test/src/tests/supervisor.rs
@@ -26,7 +26,6 @@ impl TestOverrides for SupervisorTest {
                 enabled: true,
                 clear_interval: 10,
                 clear_on_start: true,
-                filter: false,
                 tx_confirmation: true,
             },
         };