certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Solitaire: use "client" as superset of "no-entrypoint", logging 

Change-Id: Ie846b9abd783fe041f2cfa9aeda962003ffe1441
This commit is contained in:
Stan Drozd 2021-06-25 17:36:29 +02:00
parent 60a1acf351
commit 79d82d1226
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solana/bridge/client/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.40" anyhow = "1.0.40"
borsh = "0.8.1" borsh = "0.8.1"
bridge = { path = "../program", features = ["no-idl", "no-entrypoint", "client"] } bridge = { path = "../program", features = ["client"] }
clap = "2.33.0" clap = "2.33.0"
rand = "0.7.3" rand = "0.7.3"
shellexpand = "2.1.0" shellexpand = "2.1.0"

4
solana/modules/token_bridge/client/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.40" anyhow = "1.0.40"
borsh = "0.8.1" borsh = "0.8.1"
bridge = { path = "../../../bridge/program", features = ["no-idl", "no-entrypoint", "client"] } bridge = { path = "../../../bridge/program", features = ["client"] }
clap = "3.0.0-beta.2" clap = "3.0.0-beta.2"
rand = "0.7.3" rand = "0.7.3"
shellexpand = "2.1.0" shellexpand = "2.1.0"
@ -17,4 +17,4 @@ solana-sdk = "=1.7.0"
spl-token = { version = "=3.1.0", features = ["no-entrypoint"] } spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
solitaire = { path = "../../../solitaire/program" } solitaire = { path = "../../../solitaire/program" }
solitaire-client = { path = "../../../solitaire/client" } solitaire-client = { path = "../../../solitaire/client" }
token-bridge = { path = "../program", features = ["no-idl", "no-entrypoint", "client"] } token-bridge = { path = "../program", features = ["client"] }

2
solana/solitaire/program/src/macros.rs
View File

@ -55,7 +55,7 @@ macro_rules! solitaire {
} }
pub fn solitaire<'a, 'b: 'a>(p: &Pubkey, a: &'a [AccountInfo<'b>], d: &[u8]) -> ProgramResult { pub fn solitaire<'a, 'b: 'a>(p: &Pubkey, a: &'a [AccountInfo<'b>], d: &[u8]) -> ProgramResult {
solana_program::msg!(solitaire::PKG_NAME_VERSION); solana_program::msg!(&format!("{} {} built with {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), solitaire::PKG_NAME_VERSION));
if let Err(err) = dispatch(p, a, d) { if let Err(err) = dispatch(p, a, d) {
solana_program::msg!("Error: {:?}", err); solana_program::msg!("Error: {:?}", err);
return Err(err.into()); return Err(err.into());