Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bridge-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bridge-cli"
version = "0.3.36"
version = "0.3.37"
edition = "2021"
repository = "https://github.com/Near-One/bridge-sdk-rs"
rust-version = "1.88.0"
Expand Down
13 changes: 13 additions & 0 deletions bridge-cli/src/omni_connector_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,13 @@ pub enum InternalSubCommand {
#[command(flatten)]
config_cli: CliConfig,
},
#[clap(about = "Get Solana token vault (locker) PDA")]
SolanaGetTokenVault {
#[clap(short, long, help = "Token mint address")]
token: String,
#[command(flatten)]
config_cli: CliConfig,
},
}

#[allow(clippy::too_many_lines)]
Expand Down Expand Up @@ -1249,6 +1256,12 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {

tracing::info!("Near Tx Hash: {tx_hash}");
}
InternalSubCommand::SolanaGetTokenVault { token, config_cli } => {
omni_connector(network, config_cli)
.solana_get_token_vault(token.parse().unwrap())
.await
.unwrap();
}
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion bridge-sdk/bridge-clients/solana-bridge-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-bridge-client"
version = "0.2.7"
version = "0.2.8"
edition = "2021"

[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,12 @@ impl SolanaBridgeClient {
Ok(mint_account.owner)
}

pub fn get_token_vault(&self, token: Pubkey) -> Result<Pubkey, SolanaBridgeClientError> {
let program_id = self.program_id()?;
let (vault, _) = Pubkey::find_program_address(&[b"vault", token.as_ref()], program_id);
Ok(vault)
}

pub fn client(&self) -> Result<&RpcClient, SolanaBridgeClientError> {
self.client
.as_ref()
Expand Down
2 changes: 1 addition & 1 deletion bridge-sdk/connectors/omni-connector/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "omni-connector"
version = "0.3.4"
version = "0.3.5"
edition = "2021"
rust-version = "1.88.0"

Expand Down
13 changes: 13 additions & 0 deletions bridge-sdk/connectors/omni-connector/src/omni_connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,19 @@ impl OmniConnector {
Ok(version)
}

pub async fn solana_get_token_vault(&self, token: Pubkey) -> Result<Pubkey> {
let solana_bridge_client = self.solana_bridge_client()?;
let vault = solana_bridge_client.get_token_vault(token)?;

tracing::info!(
token = token.to_string(),
vault = vault.to_string(),
"Derived Solana token vault"
);

Ok(vault)
}

pub async fn solana_log_metadata(&self, token: Pubkey) -> Result<Signature> {
let solana_bridge_client = self.solana_bridge_client()?;

Expand Down
Loading