Merge branch 'main' into dan/cosmos-gas-price-config

.github/workflows/test.yml

@@ -219,7 +219,7 @@ jobs:
         working-directory: ./rust
 
       - name: agent tests with CosmWasm
-        run: RUST_BACKTRACE=1 cargo test --package run-locally --bin run-locally -- cosmos::test --nocapture
+        run: RUST_BACKTRACE=1 cargo test --package run-locally --bin run-locally --features cosmos -- cosmos::test --nocapture
         working-directory: ./rust
 
       - name: agent tests excluding CosmWasm

rust/Cargo.toml

@@ -78,7 +78,7 @@ derive_builder = "0.12"
 derive_more = "0.99"
 ed25519-dalek = "~1.0"
 enum_dispatch = "0.3"
-eyre = "0.6"
+eyre = "=0.6.8"
 fixed-hash = "0.8.0"
 fuels = "0.38"
 fuels-code-gen = "0.38"
@@ -94,6 +94,7 @@ hpl-interface = "=0.0.6-rc3"
 hyper = "0.14"
 hyper-tls = "0.5.0"
 itertools = "0.11.0"
+jobserver = "=0.1.26"
 jsonrpc-core = "18.0"
 k256 = { version = "0.13.1", features = ["std", "ecdsa"] }
 log = "0.4"

rust/agents/scraper/src/db/message.rs

@@ -79,7 +79,7 @@ impl ScraperDb {
         {
             Ok(Some(HyperlaneMessage {
                 // We do not write version to the DB.
-                version: 0,
+                version: 3,
                 origin: message.origin as u32,
                 destination: message.destination as u32,
                 nonce: message.nonce as u32,

rust/chains/hyperlane-cosmos/Cargo.toml

@@ -1,3 +1,5 @@
+cargo-features = ["workspace-inheritance"]
+
 [package]
 name = "hyperlane-cosmos"
 documentation = { workspace = true }

rust/chains/hyperlane-cosmos/src/libs/address.rs

@@ -22,7 +22,7 @@ pub struct CosmosAddress {
 
 impl CosmosAddress {
     /// Returns a Bitcoin style address: RIPEMD160(SHA256(pubkey))
-    /// Source: https://github.com/cosmos/cosmos-sdk/blob/177e7f45959215b0b4e85babb7c8264eaceae052/crypto/keys/secp256k1/secp256k1.go#L154
+    /// Source: `<https://github.com/cosmos/cosmos-sdk/blob/177e7f45959215b0b4e85babb7c8264eaceae052/crypto/keys/secp256k1/secp256k1.go#L154>`
     pub fn from_pubkey(pubkey: PublicKey, prefix: &str) -> ChainResult<Self> {
         // Get the inner type
         let tendermint_pubkey = TendermintPublicKey::from(pubkey);

rust/chains/hyperlane-cosmos/src/providers/grpc.rs

@@ -88,7 +88,7 @@ pub struct WasmGrpcProvider {
     /// Signer for transactions.
     signer: Option<Signer>,
     /// GRPC Channel that can be cheaply cloned.
-    /// See https://docs.rs/tonic/latest/tonic/transport/struct.Channel.html#multiplexing-requests
+    /// See `<https://docs.rs/tonic/latest/tonic/transport/struct.Channel.html#multiplexing-requests>`
     channel: Channel,
     gas_price: CosmosAmount,
 }

rust/chains/hyperlane-ethereum/tests/signer_output.rs

@@ -22,7 +22,7 @@ use hyperlane_core::{
 pub fn output_message() {
     let hyperlane_message = HyperlaneMessage {
         nonce: 0,
-        version: 0,
+        version: 3,
         origin: 1000,
         sender: H256::from(H160::from_str("0x1111111111111111111111111111111111111111").unwrap()),
         destination: 2000,

rust/chains/hyperlane-sealevel/src/mailbox.rs

@@ -633,7 +633,7 @@ impl SealevelMailboxIndexer {
 impl SequenceIndexer<HyperlaneMessage> for SealevelMailboxIndexer {
     #[instrument(err, skip(self))]
     async fn sequence_and_tip(&self) -> ChainResult<(Option<u32>, u32)> {
-        let tip = Indexer::<HyperlaneMessage>::get_finalized_block_number(self as _).await?;
+        let tip = Indexer::<HyperlaneMessage>::get_finalized_block_number(self).await?;
         // TODO: need to make sure the call and tip are at the same height?
         let count = Mailbox::count(&self.mailbox, None).await?;
         Ok((Some(count), tip))

rust/chains/hyperlane-sealevel/src/merkle_tree_hook.rs

@@ -4,13 +4,14 @@ use async_trait::async_trait;
 use derive_new::new;
 use hyperlane_core::{
     accumulator::incremental::IncrementalMerkle, ChainCommunicationError, ChainResult, Checkpoint,
-    HyperlaneChain, Indexer, LogMeta, MerkleTreeHook, MerkleTreeInsertion, SequenceIndexer,
+    HyperlaneChain, HyperlaneMessage, Indexer, LogMeta, MerkleTreeHook, MerkleTreeInsertion,
+    SequenceIndexer,
 };
 use hyperlane_sealevel_mailbox::accounts::OutboxAccount;
 use solana_sdk::commitment_config::CommitmentConfig;
 use tracing::instrument;
 
-use crate::SealevelMailbox;
+use crate::{SealevelMailbox, SealevelMailboxIndexer};
 
 #[async_trait]
 impl MerkleTreeHook for SealevelMailbox {
@@ -76,26 +77,38 @@ impl MerkleTreeHook for SealevelMailbox {
 }
 
 /// Struct that retrieves event data for a Sealevel merkle tree hook contract
+/// For now it's just a wrapper around the SealevelMailboxIndexer
 #[derive(Debug, new)]
-pub struct SealevelMerkleTreeHookIndexer {}
+pub struct SealevelMerkleTreeHookIndexer(SealevelMailboxIndexer);
 
 #[async_trait]
 impl Indexer<MerkleTreeInsertion> for SealevelMerkleTreeHookIndexer {
     async fn fetch_logs(
         &self,
-        _range: RangeInclusive<u32>,
+        range: RangeInclusive<u32>,
     ) -> ChainResult<Vec<(MerkleTreeInsertion, LogMeta)>> {
-        Ok(vec![])
+        let messages = Indexer::<HyperlaneMessage>::fetch_logs(&self.0, range).await?;
+        let merkle_tree_insertions = messages
+            .into_iter()
+            .map(|(m, meta)| (message_to_merkle_tree_insertion(&m), meta))
+            .collect();
+        Ok(merkle_tree_insertions)
     }
 
     async fn get_finalized_block_number(&self) -> ChainResult<u32> {
-        Ok(0)
+        Indexer::<HyperlaneMessage>::get_finalized_block_number(&self.0).await
     }
 }
 
 #[async_trait]
 impl SequenceIndexer<MerkleTreeInsertion> for SealevelMerkleTreeHookIndexer {
     async fn sequence_and_tip(&self) -> ChainResult<(Option<u32>, u32)> {
-        Ok((None, 0))
+        SequenceIndexer::<HyperlaneMessage>::sequence_and_tip(&self.0).await
     }
 }
+
+fn message_to_merkle_tree_insertion(message: &HyperlaneMessage) -> MerkleTreeInsertion {
+    let leaf_index = message.nonce;
+    let message_id = message.id();
+    MerkleTreeInsertion::new(leaf_index, message_id)
+}

rust/config/test-sealevel-keys/test_deployer-account.json

@@ -0,0 +1,13 @@
+{
+    "pubkey": "E9VrvAdGRvCguN2XgXsgu9PNmMM3vZsU8LSUrM68j8ty",
+    "account": {
+      "lamports": 500000000000000000,
+      "data": [
+        "",
+        "base64"
+      ],
+      "owner": "11111111111111111111111111111111",
+      "executable": false,
+      "rentEpoch": 0
+    }
+  }

rust/config/test-sealevel-keys/test_deployer-keypair.json

@@ -0,0 +1 @@
+[137,43,246,148,154,244,35,62,98,248,84,203,54,24,188,26,62,227,52,29,199,26,218,8,196,213,222,202,35,154,207,79,195,85,53,151,7,182,83,94,59,5,131,252,40,75,87,11,243,118,71,59,195,222,212,148,179,233,253,121,97,210,114,98]