Merge branch 'main' into noah/merge

.changeset/brave-penguins-ring.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/cli': minor
+'@hyperlane-xyz/core': minor
+---
+
+Add CLI command to support AVS validator status check

.changeset/clean-numbers-know.md

@@ -0,0 +1,7 @@
+---
+'@hyperlane-xyz/helloworld': minor
+'@hyperlane-xyz/infra': minor
+'@hyperlane-xyz/cli': minor
+---
+
+Upgrade registry to 2.1.1

.github/workflows/monorepo-docker.yml

@@ -10,6 +10,7 @@ on:
       - 'typescript/infra/**'
       - 'Dockerfile'
       - '.dockerignore'
+      - '.github/workflows/monorepo-docker.yml'
 
 concurrency:
   group: build-push-monorepo-${{ github.ref }}
@@ -47,7 +48,7 @@ jobs:
         id: taggen
         run: |
           echo "TAG_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
-          echo "TAG_SHA=$(echo '${{ github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
+          echo "TAG_SHA=$(echo '${{ github.event.pull_request.head.sha || github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5

.github/workflows/rust-docker.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
       - 'rust/**'
+      - '.github/workflows/rust-docker.yml'
 concurrency:
   group: build-push-agents-${{ github.ref }}
   cancel-in-progress: true
@@ -40,7 +41,7 @@ jobs:
         id: taggen
         run: |
           echo "TAG_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
-          echo "TAG_SHA=$(echo '${{ github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
+          echo "TAG_SHA=$(echo '${{ github.event.pull_request.head.sha || github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5

.github/workflows/rust-skipped.yml

@@ -4,6 +4,9 @@ name: rust
 on:
   push:
     branches: [main]
+    paths-ignore:
+      - 'rust/**'
+      - .github/workflows/rust.yml
   pull_request:
     branches: [main]
     paths-ignore:

.github/workflows/rust.yml

@@ -1,6 +1,12 @@
 name: rust
 
 on:
+  push:
+    branches: [main]
+    paths:
+      - 'rust/**'
+      - .github/workflows/rust.yml
+      - '!*.md'
   pull_request:
     branches: [main]
     paths:

.github/workflows/test-skipped.yml

@@ -3,6 +3,9 @@ name: test
 on:
   push:
     branches: [main]
+    paths:
+      - '*.md'
+      - '!**/*'
   pull_request:
     branches:
       - '*'

.github/workflows/test.yml

@@ -4,6 +4,8 @@ on:
   # Triggers the workflow on pushes to main & cli-2.0 branches
   push:
     branches: [main, cli-2.0]
+    paths-ignore:
+      - '*.md'
   # Triggers on pull requests ignoring md files
   pull_request:
     branches:

rust/Cargo.toml

@@ -119,6 +119,7 @@ pretty_env_logger = "0.5.0"
 primitive-types = "=0.12.1"
 prometheus = "0.13"
 protobuf = "*"
+rand = "0.8.5"
 regex = "1.5"
 reqwest = "0.11"
 ripemd = "0.1.3"
@@ -163,8 +164,8 @@ spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "=0.5.0", features = ["no-entrypoint"] }
 spl-type-length-value = "=0.1.0"
 static_assertions = "1.1"
-strum = "0.25.0"
-strum_macros = "0.25.2"
+strum = "0.26.2"
+strum_macros = "0.26.2"
 tempfile = "3.3"
 tendermint = "0.32.2"
 tendermint-rpc = { version = "0.32.0", features = ["http-client", "tokio"] }

rust/agents/relayer/Cargo.toml

@@ -26,6 +26,7 @@ itertools.workspace = true
 num-derive.workspace = true
 num-traits.workspace = true
 prometheus.workspace = true
+rand.workspace = true
 regex.workspace = true
 reqwest = { workspace = true, features = ["json"] }
 serde.workspace = true
@@ -43,7 +44,7 @@ hyperlane-ethereum = { path = "../../chains/hyperlane-ethereum" }
 
 [dev-dependencies]
 once_cell.workspace = true
-mockall.worksapce = true
+mockall.workspace = true
 tokio-test.workspace = true
 hyperlane-test = { path = "../../hyperlane-test" }
 hyperlane-base = { path = "../../hyperlane-base", features = ["test-utils"] }

rust/agents/relayer/src/msg/blacklist.rs

@@ -0,0 +1,123 @@
+use hyperlane_core::HyperlaneMessage;
+
+#[derive(Debug, Clone, Default)]
+pub struct AddressBlacklist {
+    // A list of addresses that are blocked from being relayed.
+    // Addresses are any length to support different address types.
+    pub blacklist: Vec<Vec<u8>>,
+}
+
+impl AddressBlacklist {
+    pub fn new(blacklist: Vec<Vec<u8>>) -> Self {
+        Self { blacklist }
+    }
+
+    /// Returns true if the message is blocked by the blacklist.
+    /// At the moment, this only checks if the sender, recipient, or body of the
+    /// message contains any of the blocked addresses.
+    pub fn find_blacklisted_address(&self, message: &HyperlaneMessage) -> Option<Vec<u8>> {
+        self.blacklist.iter().find_map(|address| {
+            if is_subsequence(message.sender.as_bytes(), address)
+                || is_subsequence(message.recipient.as_bytes(), address)
+                || is_subsequence(&message.body, address)
+            {
+                // Return the blocked address that was found.
+                Some(address.clone())
+            } else {
+                None
+            }
+        })
+    }
+}
+
+/// Returns true if `needle` is a subsequence of `haystack`.
+fn is_subsequence<T: PartialEq>(mut haystack: &[T], needle: &[T]) -> bool {
+    if needle.is_empty() {
+        return true;
+    }
+
+    while !haystack.is_empty() {
+        if needle.len() > haystack.len() {
+            return false;
+        }
+        if haystack.starts_with(needle) {
+            return true;
+        }
+        haystack = &haystack[1..];
+    }
+    false
+}
+
+#[cfg(test)]
+mod test {
+    use hyperlane_core::H256;
+
+    use super::*;
+
+    #[test]
+    fn test_is_subsequence() {
+        assert!(is_subsequence(b"hello", b"hello"));
+        assert!(is_subsequence(b"hello", b"he"));
+        assert!(is_subsequence(b"hello", b"lo"));
+        assert!(is_subsequence(b"hello", b""));
+        assert!(is_subsequence(b"hello", b"o"));
+
+        assert!(!is_subsequence(b"hello", b"hello world"));
+        assert!(!is_subsequence(b"hello", b"world"));
+        assert!(!is_subsequence(b"hello", b"world hello"));
+    }
+
+    #[test]
+    fn test_is_blocked() {
+        let blocked = b"blocked";
+        let blocklist = AddressBlacklist::new(vec![blocked.to_vec()]);
+
+        let bytes_with_subsequence = |subsequence: &[u8], index: usize, len: usize| {
+            let mut bytes = vec![0; len];
+            bytes[index..index + subsequence.len()].copy_from_slice(subsequence);
+            bytes
+        };
+
+        let h256_with_subsequence = |subsequence: &[u8], index: usize| {
+            let bytes = bytes_with_subsequence(subsequence, index, H256::len_bytes());
+            H256::from_slice(&bytes)
+        };
+
+        // Blocked - sender includes the blocked address
+        let message = HyperlaneMessage {
+            sender: h256_with_subsequence(blocked, 0),
+            ..Default::default()
+        };
+        assert_eq!(
+            blocklist.find_blacklisted_address(&message),
+            Some(blocked.to_vec())
+        );
+
+        // Blocked - recipient includes the blocked address
+        let message = HyperlaneMessage {
+            recipient: h256_with_subsequence(blocked, 20),
+            ..Default::default()
+        };
+        assert_eq!(
+            blocklist.find_blacklisted_address(&message),
+            Some(blocked.to_vec())
+        );
+
+        // Blocked - body includes the blocked address
+        let message = HyperlaneMessage {
+            body: bytes_with_subsequence(blocked, 100 - blocked.len(), 100),
+            ..Default::default()
+        };
+        assert_eq!(
+            blocklist.find_blacklisted_address(&message),
+            Some(blocked.to_vec())
+        );
+
+        // Not blocked - sender, recipient, and body do not include the blocked address
+        let message = HyperlaneMessage {
+            body: vec![1; 100],
+            ..Default::default()
+        };
+        assert!(blocklist.find_blacklisted_address(&message).is_none());
+    }
+}