Merge branch 'main' into feat/muxed_keys

stellar · Jan 21, 2025 · 688de1c · 688de1c
2 parents 5391d3d + 1160470
commit 688de1c
Show file tree

Hide file tree

Showing 24 changed files with 2,970 additions and 13 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,10 +9,9 @@ defaults:
     shell: bash
 
 jobs:
-
   publish:
     uses: stellar/actions/.github/workflows/rust-publish.yml@main
     with:
-      additional-deb-packages: libudev-dev
+      additional-deb-packages: libudev-dev libdbus-1-dev
     secrets:
       CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -112,7 +112,7 @@ jobs:
         #- os: ubuntu-latest-16-cores
         #  target: aarch64-unknown-linux-gnu
         #  cargo-hack-feature-options: --feature-powerset
-        #  additional-deb-packages: libudev-dev libssl-dev
+        #  additional-deb-packages: libudev-dev libssl-dev libdbus-1-dev
         - os: macos-latest
           target: x86_64-apple-darwin
           cargo-hack-feature-options: --feature-powerset

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -73,7 +73,7 @@ should initially look like this.
    > origin  https://github.com/YOUR_USERNAME/stellar-cli.git (push)
    ```
 
-* Set the `stellar/stellar-cli` repo as new remote upstream repository that will
+* Set the `stellar/stellar-cli` repo as the remote upstream repository that will
 sync with your fork. 
   ```
   git remote add upstream https://github.com/stellar/stellar-cli.git

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ default-members = [
 exclude = [
     "cmd/crates/soroban-test/tests/fixtures/hello",
     "cmd/crates/soroban-test/tests/fixtures/bye",
+    "cmd/crates/soroban-test/tests/fixtures/eth_abi",
 ]
 
 [workspace.package]

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
@@ -55,6 +55,7 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c
 * `completion` — Print shell completion code for the specified shell
 * `cache` — Cache for transactions and contract specs
 * `version` — Print version information
+* `licenses` — Show dependency licenses
 
 ###### **Options:**
 
@@ -2443,3 +2444,15 @@ Print version information
 
 
 
+## `stellar licenses`
+
+Show dependency licenses
+
+**Usage:** `stellar licenses [OPTIONS]`
+
+###### **Options:**
+
+* `-v`, `--verbose` — Display the license text
+
+
+
diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
@@ -32,6 +32,7 @@ assert_fs = "1.0.7"
 predicates = { workspace = true }
 fs_extra = "1.3.0"
 toml = { workspace = true }
+home = "0.5.9"
 
 [dev-dependencies]
 serde_json = "1.0.93"

diff --git a/cmd/crates/soroban-test/README.md b/cmd/crates/soroban-test/README.md
@@ -53,7 +53,7 @@ fn invoke() {
 }
 ```
 
-Itegration tests in Crate
+Integration tests in Crate
 ==============
 
-Currently all tests that require an RPC server are hidden behind a `it` feature, [found here](./tests/it/integration). To allow Rust-Analyzer to see the tests in vscode, `.vscode/settings.json`. Without RA, you can't follow through definitions and more importantly see errors before running tests tests.
+Currently all tests that require an RPC server are hidden behind a `it` feature, [found here](./tests/it/integration). To allow Rust-Analyzer to see the tests in vscode, `.vscode/settings.json`. Without RA, you can't follow through definitions and more importantly see errors before running tests.