fast-bridge: Add fast bridge contract

Anchor.toml

@@ -1,27 +1,28 @@
+[toolchain]
+
 [features]
 seeds = false
 skip-lint = false
 
 [programs.devnet]
-restaking = "8n3FHwYxFgQCQc2FNFkwDUf9mcqupxXcCvgfHbApMLv3"
-solana_ibc = "2HLLVco5HvwWriNbUhmVwA2pCetRkpgrqwnjcsZdyTKT"
+bridge-escrow = "A5ygmioT2hWFnxpPapY3XyDjwwfMDhnSP1Yxoynd5hs4"
+restaking = "JEG7nDQFRPFjjFgWVXaA25EkcXGVjma2Cy56C976sXhk"
+solana_ibc = "EUiJni1BZFL3BhaWcS7NTJmqWyh8NwRLjBzrcGBvxKU4"
 
 [programs.localnet]
-restaking = "8n3FHwYxFgQCQc2FNFkwDUf9mcqupxXcCvgfHbApMLv3"
-solana_ibc = "2HLLVco5HvwWriNbUhmVwA2pCetRkpgrqwnjcsZdyTKT"
+bridge-escrow = "A5ygmioT2hWFnxpPapY3XyDjwwfMDhnSP1Yxoynd5hs4"
+restaking = "JEG7nDQFRPFjjFgWVXaA25EkcXGVjma2Cy56C976sXhk"
+solana_ibc = "EUiJni1BZFL3BhaWcS7NTJmqWyh8NwRLjBzrcGBvxKU4"
 
 [registry]
 url = "https://api.apr.dev"
 
 [provider]
-cluster = "localnet"
+cluster = "Localnet"
 wallet = "~/.config/solana/id.json"
 
 [workspace]
-members = [
-  "solana/restaking/programs/restaking",
-  "solana/solana-ibc/programs/solana-ibc"
-]
+members = ["solana/bridge-escrow/programs/bridge-escrow", "solana/restaking/programs/restaking", "solana/solana-ibc/programs/solana-ibc"]
 
 [scripts]
 test = "./solana-test.sh"

Cargo.toml

@@ -8,6 +8,7 @@ rust-version = "1.71.0"
 members = [
     "common/*",
     "solana/allocator",
+    "solana/bridge-escrow/programs/*",
     "solana/restaking/programs/*",
     "solana/signature-verifier",
     "solana/solana-ibc/programs/*",

common/cf-guest/src/client/impls.rs

@@ -237,7 +237,6 @@ impl<PK: PubKey> ibc::ClientStateCommon for ClientState<PK> {
     }
 }
 
-
 impl From<proof::VerifyError> for ibc::ClientError {
     fn from(err: proof::VerifyError) -> Self {
         use ibc::CommitmentError::EncodingFailure;
@@ -396,7 +395,6 @@ where
     }
 }
 
-
 impl<PK: PubKey> ClientState<PK> {
     pub fn do_update_state(
         &self,
@@ -641,12 +639,10 @@ impl<PK: PubKey> ClientState<PK> {
     }
 }
 
-
 fn error(msg: impl ToString) -> ibc::ClientError {
     ibc::ClientError::Other { description: msg.to_string() }
 }
 
-
 /// Checks client id’s client type is what’s expected and then parses the id as
 /// `ClientIdx`.
 ///
@@ -666,7 +662,6 @@ fn parse_client_id(client_id: &ibc::ClientId) -> Result<trie_ids::ClientIdx> {
     Err(ibc::ClientError::ClientSpecific { description })
 }
 
-
 #[test]
 fn test_verify_client_type() {
     use core::str::FromStr;

common/cf-guest/src/client/tests.rs

@@ -131,7 +131,6 @@ fn test_header_misbehaviour() {
     add_block(&mut ctx, Some(&bad_block_2), 25 * HOUR, 2, Ok(true), None);
 }
 
-
 /// Tests Misbehaviour client messages.
 ///
 /// Only verification and checking for misbehaviour are tested.  No state
@@ -302,7 +301,6 @@ impl TestContext {
     }
 }
 
-
 impl guestchain::Verifier<MockPubKey> for TestContext {
     fn verify(
         &self,

common/cf-guest/src/header.rs

@@ -169,7 +169,6 @@ impl<PK: PubKey> Header<PK> {
     }
 }
 
-
 proto_utils::define_wrapper! {
     proto: proto::Header,
     wrapper: Header<PK> where

common/cf-guest/src/message.rs

@@ -15,7 +15,6 @@ pub enum ClientMessage<PK: PubKey> {
     Misbehaviour(Misbehaviour<PK>),
 }
 
-
 // Conversions directly to and from the Message enum.
 
 impl<PK: guestchain::PubKey> From<ClientMessage<PK>> for Message {
@@ -48,7 +47,6 @@ impl<PK: guestchain::PubKey> TryFrom<&Message> for ClientMessage<PK> {
     }
 }
 
-
 // Conversions directly into the Message enum from variant types.
 
 impl<PK: guestchain::PubKey> From<Header<PK>> for Message {
@@ -67,7 +65,6 @@ impl<PK: guestchain::PubKey> From<&Misbehaviour<PK>> for Message {
     fn from(msg: &Misbehaviour<PK>) -> Self { Self::Misbehaviour(msg.into()) }
 }
 
-
 // Conversion into ClientMessage proto from variant types.
 
 impl<PK: guestchain::PubKey> From<Header<PK>> for proto::ClientMessage {
@@ -90,7 +87,6 @@ impl<PK: guestchain::PubKey> From<&Misbehaviour<PK>> for proto::ClientMessage {
     }
 }
 
-
 // And finally, conversions between proto and Rust type
 
 impl<PK: guestchain::PubKey> From<ClientMessage<PK>> for proto::ClientMessage {
@@ -125,7 +121,6 @@ impl<PK: guestchain::PubKey> TryFrom<&proto::ClientMessage>
     }
 }
 
-
 proto_utils::define_wrapper! {
     proto: proto::ClientMessage,
     wrapper: ClientMessage<PK> where

common/cf-guest/src/proof.rs

@@ -34,7 +34,6 @@ impl IbcProof {
     }
 }
 
-
 #[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
 pub enum GenerateError {
     /// State root in block header and root of trie don’t match.
@@ -104,7 +103,6 @@ pub fn generate<A: sealable_trie::Allocator>(
     Ok(IbcProof { proof, root, value })
 }
 
-
 #[derive(
     Clone, Debug, PartialEq, Eq, derive_more::From, derive_more::Display,
 )]
@@ -253,7 +251,6 @@ pub fn verify(
     }
 }
 
-
 #[test]
 fn test_proofs() {
     use core::str::FromStr;

common/lib/src/hash.rs

@@ -241,7 +241,6 @@ mod imp {
     }
 }
 
-
 /// Builder for the cryptographic hash.
 ///
 /// The builder calculates the digest of bytes that it’s fed using the

common/proto-utils/src/lib.rs

@@ -35,7 +35,6 @@ pub trait AnyConvert: Sized {
     fn try_from_any(type_url: &str, value: &[u8]) -> Result<Self, DecodeError>;
 }
 
-
 /// Error during decoding of a protocol message.
 #[derive(Clone, PartialEq, Eq, derive_more::From)]
 pub enum DecodeError {
@@ -106,7 +105,6 @@ impl From<BadMessage> for ibc_core_client_context::types::error::ClientError {
     }
 }
 
-
 /// Defines common associated symbols and conversions for a proto message type.
 #[macro_export]
 macro_rules! define_message {
@@ -230,7 +228,6 @@ macro_rules! define_message {
     };
 }
 
-
 /// Implements conversion between given type and Any message.
 ///
 /// Specified type must implement [`AnyConvert`].
@@ -281,7 +278,6 @@ macro_rules! impl_from_to_any {
     };
 }
 
-
 /// Defines a wrapper type for a raw protocol message type.
 // TODO(mina86): Add definition of tests.
 #[macro_export]

common/sealable-trie/src/bits.rs

@@ -762,8 +762,6 @@ impl core::cmp::PartialEq<Owned> for Slice<'_> {
     fn eq(&self, other: &Owned) -> bool { self == &other.as_slice() }
 }
 
-
-
 impl TryFrom<Slice<'_>> for Vec<u8> {
     type Error = MisalignedSlice;
     #[inline]
@@ -795,7 +793,6 @@ impl TryFrom<Owned> for Vec<u8> {
     }
 }
 
-
 impl fmt::Display for Slice<'_> {
     fn fmt(&self, fmtr: &mut fmt::Formatter<'_>) -> fmt::Result {
         use ascii::AsciiChar;

common/sealable-trie/src/bits/concat.rs

@@ -4,7 +4,6 @@ use lib::u3::U3;
 
 use super::{Owned, Slice};
 
-
 /// Trying to concatenate slices which result in slice whose size is too large.
 ///
 /// Slice’s length must not overflow u16.
@@ -87,14 +86,12 @@ impl From<MisalignedSlice> for Error {
     fn from(_: MisalignedSlice) -> Error { Error::Misaligned }
 }
 
-
 pub trait Concat<Rhs> {
     type Error: Into<Error>;
 
     fn concat_impl(prefix: Self, suffix: Rhs) -> Result<Owned, Self::Error>;
 }
 
-
 impl<'a> Concat<Slice<'a>> for bool {
     type Error = SliceTooLong;
 
@@ -215,7 +212,6 @@ pub(super) fn extend_impl(
     Ok(())
 }
 
-
 /// Checks that concatenating two slices produces slice whose length doesn’t
 /// overflow `u16`.
 pub(super) fn check_length(
@@ -255,7 +251,6 @@ fn check_alignment_and_length(
     Ok(check_length(pre_len, suf_len)?)
 }
 
-
 #[test]
 fn test_unshift() {
     for offset in U3::all() {

common/sealable-trie/src/bits/ext_key.rs

@@ -140,8 +140,6 @@ impl fmt::Debug for Chunks<'_> {
     }
 }
 
-
-
 impl<'a> core::iter::Iterator for Chunks<'a> {
     type Item = ExtKey<'a>;
 

common/sealable-trie/src/nodes.rs

@@ -338,7 +338,6 @@ impl<'a, S> ValueRef<'a, S> {
     }
 }
 
-
 // =============================================================================
 // PartialEq
 

common/sealable-trie/src/proof/serialisation.rs

@@ -286,7 +286,6 @@ fn invalid_data(msg: String) -> io::Error {
     io::Error::new(io::ErrorKind::InvalidData, msg)
 }
 
-
 #[test]
 fn test_item_borsh() {
     #[track_caller]

common/sealable-trie/src/trie.rs

@@ -381,7 +381,6 @@ impl<A: memory::Allocator<Value = Value>> Trie<A> {
     }
 }
 
-
 #[cfg(test)]
 impl Trie<memory::test_utils::TestAllocator<Value>> {
     /// Creates a test trie using a TestAllocator with given capacity.

common/sealable-trie/src/trie/tests.rs

@@ -309,7 +309,6 @@ impl<'a> KeyGen<'a> for RandKeys<'a> {
     fn count(&self) -> Option<usize> { Some(self.count) }
 }
 
-
 #[test]
 fn stress_test() {
     let count = lib::test_utils::get_iteration_count(500);
@@ -444,7 +443,6 @@ impl core::fmt::Debug for Key {
     }
 }
 
-
 trait KeyGen<'a> {
     fn next(&mut self, known: &HashMap<Key, CryptoHash>) -> Option<&'a [u8]>;
     fn count(&self) -> Option<usize>;
@@ -470,7 +468,6 @@ impl<'a, I: Iterator<Item = &'a [u8]>> KeyGen<'a> for IterKeyGen<I> {
     fn count(&self) -> Option<usize> { self.0.size_hint().1 }
 }
 
-
 struct TestTrie {
     trie: super::Trie<TestAllocator<super::Value>>,
     mapping: HashMap<Key, CryptoHash>,

common/trie-ids/src/path_info.rs

@@ -227,7 +227,6 @@ impl PathInfo {
     }
 }
 
-
 #[test]
 fn test_try_from_path() {
     use std::str::FromStr;