Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: stellar contract info * commands require network when network no… #1676

Merged
merged 12 commits into from
Nov 5, 2024
Merged

Fix: stellar contract info * commands require network when network no… #1676

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ab3dd8f
Fix: stellar contract info * commands require network when network no…
Dhanraj30 Oct 15, 2024
21e45f1
Added wasm field to Args struct and updated Cmd::run logic
Dhanraj30 Oct 22, 2024
824e43a
fix: prevent network resolution when local wasm is provided in fetch_…
Dhanraj30 Oct 23, 2024
e3e2301
Merge branch 'main' into fix-contract-info-network
willemneal Oct 24, 2024
b838367
Update cmd/soroban-cli/src/commands/global.rs
Dhanraj30 Oct 24, 2024
2107c74
Update cmd/soroban-cli/src/commands/network/mod.rs
Dhanraj30 Oct 24, 2024
7e8fffd
Update cmd/soroban-cli/src/commands/global.rs
Dhanraj30 Oct 24, 2024
6db64c4
Update cmd/soroban-cli/src/commands/contract/info/shared.rs
Dhanraj30 Oct 24, 2024
8ddce4f
Merge branch 'main' into fix-contract-info-network
janewang Oct 29, 2024
1156ace
Merge remote-tracking branch 'origin/main' into fix-contract-info-net…
willemneal Nov 1, 2024
32ced65
fix: make network args optional and postpone error until resolution
willemneal Nov 1, 2024
bd08f00
Merge branch 'main' into fix-contract-info-network
janewang Nov 5, 2024
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
13 changes: 9 additions & 4 deletions cmd/soroban-cli/src/commands/contract/info/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,16 @@ pub enum Error {
}

pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
let network = &args.network.get(&args.locator)?;
// Check if a local WASM file path is provided
if let Some(path) = &args.wasm {
// Read the WASM file and return its contents
let wasm_bytes = wasm::Args { wasm: path.clone() }.read()?;
return Ok(Some(wasm_bytes));
}

let wasm = if let Some(path) = &args.wasm {
wasm::Args { wasm: path.clone() }.read()?
} else if let Some(wasm_hash) = &args.wasm_hash {
// If no local wasm, then check for wasm_hash and fetch from the network
let network = &args.network.get(&args.locator)?;
let wasm = if let Some(wasm_hash) = &args.wasm_hash {
let hash = hex::decode(wasm_hash)
.map_err(|_| InvalidWasmHash(wasm_hash.clone()))?
.try_into()
Expand Down
Loading