Merge pull request #59 from step-finance/dev

Dev -> Live
step-finance · Aug 12, 2024 · 521c32e · 521c32e
2 parents d0df182 + aa09623
commit 521c32e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/crates/plugin/compose_config.json b/crates/plugin/compose_config.json
@@ -14,8 +14,7 @@
   },
   "transactions": {
     "programs": {
-      "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA": "defi",
-      "11111111111111111111111111111111": "defi"
+      "*": "defi"
     },
     "pubkeys": {}
   },

diff --git a/crates/plugin/local_config.json b/crates/plugin/local_config.json
@@ -14,8 +14,7 @@
   },
   "transactions": {
     "programs": {
-      "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA": "defi",
-      "11111111111111111111111111111111": "defi"
+      "*": "defi"
     },
     "pubkeys": {}
   },

diff --git a/crates/plugin/src/selectors.rs b/crates/plugin/src/selectors.rs
@@ -34,9 +34,8 @@ impl TransactionSelector {
 
         let programs = programs
             .into_iter()
-            .map(|s| s.0.parse().map(|a| (a, Self::make_routing_key(&s.1))))
-            .collect::<Result<_, _>>()
-            .context("Failed to parse tx program keys")?;
+            .filter_map(|s| s.0.parse().map(|a| (a, Self::make_routing_key(&s.1))).ok())
+            .collect::<HashMap<_, _>>();
 
         let pubkeys = pubkeys
             .into_iter()
@@ -54,7 +53,7 @@ impl TransactionSelector {
 
     #[inline]
     pub fn is_empty(&self) -> bool {
-        self.programs.is_empty() && self.pubkeys.is_empty()
+        self.programs.is_empty() && self.pubkeys.is_empty() && self.allows_all_programs.is_empty()
     }
 
     #[inline]