Add query endpoints for bridge merkle proofs

apps/src/lib/node/ledger/protocol/mod.rs

@@ -12,8 +12,9 @@ use namada::ledger::ibc::vp::{Ibc, IbcToken};
 use namada::ledger::native_vp::{self, NativeVp};
 use namada::ledger::parameters::{self, ParametersVp};
 use namada::ledger::pos::{self, PosVP};
+use namada::ledger::storage::traits::StorageHasher;
 use namada::ledger::storage::write_log::WriteLog;
-use namada::ledger::storage::{DBIter, Storage, StorageHasher, DB};
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::ledger::treasury::TreasuryVp;
 use namada::proto::{self, Tx};
 use namada::types::address::{Address, InternalAddress};

apps/src/lib/node/ledger/protocol/transactions/ethereum_events/events.rs

@@ -4,7 +4,8 @@ use std::collections::BTreeSet;
 
 use eyre::Result;
 use namada::ledger::eth_bridge::storage::wrapped_erc20s;
-use namada::ledger::storage::{DBIter, Storage, StorageHasher, DB};
+use namada::ledger::storage::traits::StorageHasher;
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::types::ethereum_events::{EthereumEvent, TransferToNamada};
 use namada::types::storage::Key;
 

apps/src/lib/node/ledger/protocol/transactions/ethereum_events/mod.rs

@@ -14,7 +14,8 @@ use eth_msgs::{EthMsg, EthMsgUpdate};
 use eyre::{eyre, Result};
 use namada::ledger::eth_bridge::storage::eth_msgs::Keys;
 use namada::ledger::pos::types::WeightedValidator;
-use namada::ledger::storage::{DBIter, Storage, StorageHasher, DB};
+use namada::ledger::storage::traits::StorageHasher;
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::types::address::Address;
 use namada::types::ethereum_events::EthereumEvent;
 use namada::types::storage::{self, BlockHeight};
@@ -305,7 +306,7 @@ mod tests {
     use namada::ledger::pos::types::ValidatorSet;
     use namada::ledger::storage::mockdb::MockDB;
     use namada::ledger::storage::testing::TestStorage;
-    use namada::ledger::storage::Sha256Hasher;
+    use namada::ledger::storage::traits::Sha256Hasher;
     use namada::types::address;
     use namada::types::ethereum_events::testing::{
         arbitrary_amount, arbitrary_eth_address, arbitrary_nonce,

apps/src/lib/node/ledger/protocol/transactions/ethereum_events/read.rs

@@ -1,7 +1,8 @@
 //! Helpers for reading from storage
 use borsh::BorshDeserialize;
 use eyre::{eyre, Result};
-use namada::ledger::storage::{DBIter, Storage, StorageHasher, DB};
+use namada::ledger::storage::traits::StorageHasher;
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::types::storage;
 use namada::types::token::Amount;
 

apps/src/lib/node/ledger/protocol/transactions/ethereum_events/update.rs

@@ -1,7 +1,8 @@
 //! Helpers for writing to storage
 use borsh::{BorshDeserialize, BorshSerialize};
 use eyre::Result;
-use namada::ledger::storage::{DBIter, Storage, StorageHasher, DB};
+use namada::ledger::storage::traits::StorageHasher;
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::types::storage;
 use namada::types::token::Amount;
 

apps/src/lib/node/ledger/rpc.rs

@@ -16,6 +16,9 @@ pub enum Path {
     DryRunTx,
     /// Epoch of the last committed block
     Epoch,
+    /// The pool of transfers waiting to be
+    /// relayed to Ethereum.
+    EthereumBridgePool(BridgePoolSubpath),
     /// Read a storage value with exact storage key
     Value(storage::Key),
     /// Read a range of storage values with a matching key prefix
@@ -24,6 +27,16 @@ pub enum Path {
     HasKey(storage::Key),
 }
 
+#[derive(Debug, Clone)]
+pub enum BridgePoolSubpath {
+    /// For queries that wish to see the contents of the
+    /// Ethereum bridge pool.
+    Contents,
+    /// For queries that want to get a merkle proof of
+    /// inclusion of transfers in the Ethereum bridge pool.
+    Proof,
+}
+
 #[derive(Debug, Clone)]
 pub struct BalanceQuery {
     #[allow(dead_code)]
@@ -34,6 +47,9 @@ pub struct BalanceQuery {
 
 const DRY_RUN_TX_PATH: &str = "dry_run_tx";
 const EPOCH_PATH: &str = "epoch";
+const ETH_BRIDGE_POOL_PATH: &str = "eth_bridge_pool";
+const EBP_INFO_SUBPATH: &str = "contents";
+const EBP_PROOF_SUBPATH: &str = "proof";
 const VALUE_PREFIX: &str = "value";
 const PREFIX_PREFIX: &str = "prefix";
 const HAS_KEY_PREFIX: &str = "has_key";
@@ -52,6 +68,13 @@ impl Display for Path {
             Path::HasKey(storage_key) => {
                 write!(f, "{}/{}", HAS_KEY_PREFIX, storage_key)
             }
+            Path::EthereumBridgePool(subpath) => {
+                let subpath = match subpath {
+                    BridgePoolSubpath::Contents => EBP_INFO_SUBPATH,
+                    BridgePoolSubpath::Proof => EBP_PROOF_SUBPATH,
+                };
+                write!(f, "{}/{}", ETH_BRIDGE_POOL_PATH, subpath)
+            }
         }
     }
 }
@@ -64,6 +87,12 @@ impl FromStr for Path {
             DRY_RUN_TX_PATH => Ok(Self::DryRunTx),
             EPOCH_PATH => Ok(Self::Epoch),
             _ => match s.split_once('/') {
+                Some((ETH_BRIDGE_POOL_PATH, EBP_INFO_SUBPATH)) => {
+                    Ok(Self::EthereumBridgePool(BridgePoolSubpath::Contents))
+                }
+                Some((ETH_BRIDGE_POOL_PATH, EBP_PROOF_SUBPATH)) => {
+                    Ok(Self::EthereumBridgePool(BridgePoolSubpath::Proof))
+                }
                 Some((VALUE_PREFIX, storage_key)) => {
                     let key = storage::Key::parse(storage_key)
                         .map_err(PathParseError::InvalidStorageKey)?;

apps/src/lib/node/ledger/shell/mod.rs

@@ -26,10 +26,9 @@ use namada::ledger::pos::namada_proof_of_stake::types::{
     ActiveValidator, ValidatorSetUpdate,
 };
 use namada::ledger::pos::namada_proof_of_stake::PosBase;
+use namada::ledger::storage::traits::{Sha256Hasher, StorageHasher};
 use namada::ledger::storage::write_log::WriteLog;
-use namada::ledger::storage::{
-    DBIter, Sha256Hasher, Storage, StorageHasher, DB,
-};
+use namada::ledger::storage::{DBIter, Storage, DB};
 use namada::ledger::{ibc, parameters, pos};
 use namada::proto::{self, Tx};
 use namada::types::chain::ChainId;
@@ -780,7 +779,8 @@ mod test_utils {
     #[cfg(not(feature = "abcipp"))]
     use namada::ledger::pos::namada_proof_of_stake::types::VotingPower;
     use namada::ledger::storage::mockdb::MockDB;
-    use namada::ledger::storage::{BlockStateWrite, MerkleTree, Sha256Hasher};
+    use namada::ledger::storage::traits::Sha256Hasher;
+    use namada::ledger::storage::{BlockStateWrite, MerkleTree};
     use namada::types::address::{xan, EstablishedAddressGen};
     use namada::types::chain::ChainId;
     use namada::types::hash::Hash;
@@ -857,10 +857,19 @@ mod test_utils {
                 sig_bytes[0] = sig_bytes[0].wrapping_add(1);
                 common::Signature::Ed25519(ed25519::Signature(sig_bytes.into()))
             }
-            common::Signature::Secp256k1(secp256k1::Signature(ref sig)) => {
+            common::Signature::Secp256k1(secp256k1::Signature(
+                ref sig,
+                ref recovery_id,
+            )) => {
                 let mut sig_bytes = sig.serialize();
+                let recovery_id_bytes = recovery_id.serialize();
                 sig_bytes[0] = sig_bytes[0].wrapping_add(1);
-                common::Signature::Secp256k1((&sig_bytes).try_into().unwrap())
+                let bytes: [u8; 65] =
+                    [sig_bytes.as_slice(), [recovery_id_bytes].as_slice()]
+                        .concat()
+                        .try_into()
+                        .unwrap();
+                common::Signature::Secp256k1((&bytes).try_into().unwrap())
             }
         }
     }

apps/src/lib/node/ledger/shell/prepare_proposal.rs

@@ -1,6 +1,7 @@
 //! Implementation of the [`RequestPrepareProposal`] ABCI++ method for the Shell
 
-use namada::ledger::storage::{DBIter, StorageHasher, DB};
+use namada::ledger::storage::traits::StorageHasher;
+use namada::ledger::storage::{DBIter, DB};
 use namada::proto::Tx;
 use namada::types::storage::BlockHeight;
 use namada::types::transaction::tx_types::TxType;