feat: support for wormhole shim (#179)

* feat: support for wormhole shim

* fix: removed `authority` account from `init_transfer_sol` call

* chore: made `get_proof_for_event` public

Relayer need this method to check that eth light client block number is greater than in tx hash to submit `claim_fee`

Author: frolvanya

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bridge-cli"
-version = "0.3.6"
+version = "0.3.7"
 edition = "2021"
 repository = "https://github.com/Near-One/bridge-sdk-rs"
 

bridge-cli/Cargo.toml

@@ -29,6 +29,10 @@ pub const BNB_WORMHOLE_ADDRESS_MAINNET: &str = "0x98f3c9e6E3fAce36bAAd05FE09d375
 pub const SOLANA_RPC_MAINNET: &str = "https://api.mainnet-beta.solana.com";
 pub const SOLANA_BRIDGE_ADDRESS_MAINNET: &str = "dahPEoZGXfyV58JqqH85okdHmpN8U2q8owgPUXSCPxe";
 pub const SOLANA_WORMHOLE_ADDRESS_MAINNET: &str = "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_MAINNET: &str =
+    "EtZMZM22ViKMo4r5y4Anovs3wKQ2owUmDpjygnMMcdEX";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_MAINNET: &str =
+    "HQS31aApX3DDkuXgSpV9XyDUNtFgQ31pUn5BNWHG2PSp";
 
 pub const WORMHOLE_API_MAINNET: &str = "https://api.wormholescan.io";
 pub const BTC_ENDPOINT_MAINNET: &str = "https://bitcoin-rpc.publicnode.com";
@@ -67,6 +71,10 @@ pub const BNB_WORMHOLE_ADDRESS_TESTNET: &str = "0x68605AD7b15c732a30b1BbC62BE8F2
 pub const SOLANA_RPC_TESTNET: &str = "https://api.devnet.solana.com";
 pub const SOLANA_BRIDGE_ADDRESS_TESTNET: &str = "862HdJV59Vp83PbcubUnvuXc4EAXP8CDDs6LTxFpunTe";
 pub const SOLANA_WORMHOLE_ADDRESS_TESTNET: &str = "3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_TESTNET: &str =
+    "EtZMZM22ViKMo4r5y4Anovs3wKQ2owUmDpjygnMMcdEX";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_TESTNET: &str =
+    "HQS31aApX3DDkuXgSpV9XyDUNtFgQ31pUn5BNWHG2PSp";
 
 pub const WORMHOLE_API_TESTNET: &str = "https://api.testnet.wormholescan.io";
 pub const BTC_ENDPOINT_TESTNET: &str = "https://bitcoin-testnet-rpc.publicnode.com";
@@ -105,6 +113,10 @@ pub const BNB_WORMHOLE_ADDRESS_DEVNET: &str = "0x68605AD7b15c732a30b1BbC62BE8F2A
 pub const SOLANA_RPC_DEVNET: &str = "https://api.devnet.solana.com";
 pub const SOLANA_BRIDGE_ADDRESS_DEVNET: &str = "Gy1XPwYZURfBzHiGAxnw3SYC33SfqsEpGSS5zeBge28p";
 pub const SOLANA_WORMHOLE_ADDRESS_DEVNET: &str = "3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_DEVNET: &str =
+    "EtZMZM22ViKMo4r5y4Anovs3wKQ2owUmDpjygnMMcdEX";
+pub const SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_DEVNET: &str =
+    "HQS31aApX3DDkuXgSpV9XyDUNtFgQ31pUn5BNWHG2PSp";
 
 pub const WORMHOLE_API_DEVNET: &str = "https://api.testnet.wormholescan.io";
 pub const BTC_ENDPOINT_DEVNET: &str = "https://bitcoin-testnet-rpc.publicnode.com";

bridge-cli/src/defaults.rs

@@ -70,6 +70,10 @@ struct CliConfig {
     #[arg(long)]
     solana_wormhole_address: Option<String>,
     #[arg(long)]
+    solana_wormhole_post_message_shim_program_id: Option<String>,
+    #[arg(long)]
+    solana_wormhole_post_message_shim_event_authority: Option<String>,
+    #[arg(long)]
     solana_keypair: Option<String>,
 
     #[arg(long)]
@@ -133,6 +137,12 @@ impl CliConfig {
             solana_wormhole_address: self
                 .solana_wormhole_address
                 .or(other.solana_wormhole_address),
+            solana_wormhole_post_message_shim_program_id: self
+                .solana_wormhole_post_message_shim_program_id
+                .or(other.solana_wormhole_post_message_shim_program_id),
+            solana_wormhole_post_message_shim_event_authority: self
+                .solana_wormhole_post_message_shim_event_authority
+                .or(other.solana_wormhole_post_message_shim_event_authority),
             solana_keypair: self.solana_keypair.or(other.solana_keypair),
 
             wormhole_api: self.wormhole_api.or(other.wormhole_api),
@@ -188,6 +198,14 @@ fn env_config() -> CliConfig {
         solana_rpc: env::var("SOLANA_RPC").ok(),
         solana_bridge_address: env::var("SOLANA_BRIDGE_ADDRESS").ok(),
         solana_wormhole_address: env::var("SOLANA_WORMHOLE_ADDRESS").ok(),
+        solana_wormhole_post_message_shim_program_id: env::var(
+            "SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID",
+        )
+        .ok(),
+        solana_wormhole_post_message_shim_event_authority: env::var(
+            "SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY",
+        )
+        .ok(),
         solana_keypair: env::var("SOLANA_KEYPAIR").ok(),
 
         wormhole_api: env::var("WORMHOLE_API").ok(),
@@ -245,6 +263,12 @@ fn default_config(network: Network) -> CliConfig {
             solana_rpc: Some(defaults::SOLANA_RPC_MAINNET.to_owned()),
             solana_bridge_address: Some(defaults::SOLANA_BRIDGE_ADDRESS_MAINNET.to_owned()),
             solana_wormhole_address: Some(defaults::SOLANA_WORMHOLE_ADDRESS_MAINNET.to_owned()),
+            solana_wormhole_post_message_shim_program_id: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_MAINNET.to_owned(),
+            ),
+            solana_wormhole_post_message_shim_event_authority: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_MAINNET.to_owned(),
+            ),
             solana_keypair: None,
 
             wormhole_api: Some(defaults::WORMHOLE_API_MAINNET.to_owned()),
@@ -296,6 +320,12 @@ fn default_config(network: Network) -> CliConfig {
             solana_rpc: Some(defaults::SOLANA_RPC_TESTNET.to_owned()),
             solana_bridge_address: Some(defaults::SOLANA_BRIDGE_ADDRESS_TESTNET.to_owned()),
             solana_wormhole_address: Some(defaults::SOLANA_WORMHOLE_ADDRESS_TESTNET.to_owned()),
+            solana_wormhole_post_message_shim_program_id: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_TESTNET.to_owned(),
+            ),
+            solana_wormhole_post_message_shim_event_authority: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_TESTNET.to_owned(),
+            ),
             solana_keypair: None,
 
             wormhole_api: Some(defaults::WORMHOLE_API_TESTNET.to_owned()),
@@ -347,6 +377,12 @@ fn default_config(network: Network) -> CliConfig {
             solana_rpc: Some(defaults::SOLANA_RPC_DEVNET.to_owned()),
             solana_bridge_address: Some(defaults::SOLANA_BRIDGE_ADDRESS_DEVNET.to_owned()),
             solana_wormhole_address: Some(defaults::SOLANA_WORMHOLE_ADDRESS_DEVNET.to_owned()),
+            solana_wormhole_post_message_shim_program_id: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_PROGRAM_ID_DEVNET.to_owned(),
+            ),
+            solana_wormhole_post_message_shim_event_authority: Some(
+                defaults::SOLANA_WORMHOLE_POST_MESSAGE_SHIM_EVENT_AUTHORITY_DEVNET.to_owned(),
+            ),
             solana_keypair: None,
 
             wormhole_api: Some(defaults::WORMHOLE_API_DEVNET.to_owned()),

bridge-cli/src/main.rs

@@ -863,6 +863,16 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
                 .solana_wormhole_address
                 .map(|addr| addr.parse().unwrap()),
         )
+        .wormhole_post_message_shim_program_id(
+            combined_config
+                .solana_wormhole_post_message_shim_program_id
+                .map(|addr| addr.parse().unwrap()),
+        )
+        .wormhole_post_message_shim_event_authority(
+            combined_config
+                .solana_wormhole_post_message_shim_event_authority
+                .map(|addr| addr.parse().unwrap()),
+        )
         .keypair(
             combined_config
                 .solana_keypair