Skip to content

Commit

Permalink
contract build: fix when used in sub-directories of crates (#1451)
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch authored Jul 15, 2024
1 parent 440788e commit 60dbc37
Show file tree
Hide file tree
Showing 20 changed files with 1,772 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

[workspace.package]
version = "21.1.1"
rust-version = "1.74.0"
rust-version = "1.79.0"

[workspace.dependencies.soroban-env-host]
version = "=21.1.2"
Expand Down
14 changes: 8 additions & 6 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c

* `--global` — Use global config
* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
* `-f`, `--filter-logs <FILTER_LOGS>` — Filter logs output. To turn on "stellar_cli::log::footprint=debug" or off "=off". Can also use env var `RUST_LOG`
* `-f`, `--filter-logs <FILTER_LOGS>` — Filter logs output. To turn on `stellar_cli::log::footprint=debug` or off `=off`. Can also use env var `RUST_LOG`
* `-q`, `--quiet` — Do not write logs to stderr including `INFO`
* `-v`, `--verbose` — Log DEBUG events
* `--very-verbose` — Log DEBUG and TRACE events
Expand Down Expand Up @@ -233,6 +233,8 @@ Build a contract from source

Builds all crates that are referenced by the cargo manifest (Cargo.toml) that have cdylib as their crate-type. Crates are built for the wasm32 target. Unless configured otherwise, crates are built with their default features and with their release profile.

In workspaces builds all crates unless a package name is specified, or the command is executed from the sub-directory of a workspace crate.

To view the commands that will be executed, without executing them, use the --print-commands-only option.

**Usage:** `stellar contract build [OPTIONS]`
Expand Down Expand Up @@ -627,7 +629,7 @@ Watch the network for contract events

###### **Options:**

* `--start-ledger <START_LEDGER>` — The first ledger sequence number in the range to pull events https://developers.stellar.org/docs/encyclopedia/ledger-headers#ledger-sequence
* `--start-ledger <START_LEDGER>` — The first ledger sequence number in the range to pull events <https://developers.stellar.org/docs/encyclopedia/ledger-headers#ledger-sequence>
* `--cursor <CURSOR>` — The cursor corresponding to the start of the event range
* `--output <OUTPUT>` — Output formatting options for event stream

Expand All @@ -639,7 +641,7 @@ Watch the network for contract events
- `plain`:
Human-oriented console output without colors
- `json`:
JSONified console output
JSON formatted console output

* `-c`, `--count <COUNT>` — The maximum number of events to display (defer to the server-defined limit)

Expand Down Expand Up @@ -698,8 +700,8 @@ Add a new identity (keypair, ledger, macOS keychain)

###### **Options:**

* `--secret-key` — Add using secret_key Can provide with SOROBAN_SECRET_KEY
* `--seed-phrase` — Add using 12 word seed phrase to generate secret_key
* `--secret-key` — Add using `secret_key` Can provide with `SOROBAN_SECRET_KEY`
* `--seed-phrase` — Add using 12 word seed phrase to generate `secret_key`
* `--global` — Use global config
* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."

Expand Down Expand Up @@ -761,7 +763,7 @@ Generate a new identity with a seed phrase, currently 12 words
* `-s`, `--as-secret` — Output the generated identity as a secret key
* `--global` — Use global config
* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
* `--hd-path <HD_PATH>` — When generating a secret key, which hd_path should be used from the original seed_phrase
* `--hd-path <HD_PATH>` — When generating a secret key, which `hd_path` should be used from the original `seed_phrase`
* `-d`, `--default-seed` — Generate the default seed phrase. Useful for testing. Equivalent to --seed 0000000000000000
* `--rpc-url <RPC_URL>` — RPC server endpoint
* `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
Expand Down
5 changes: 5 additions & 0 deletions cmd/crates/soroban-test/tests/fixtures/workspace/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Rust's output directory
target

# Local Soroban settings
.soroban
Loading

0 comments on commit 60dbc37

Please sign in to comment.