Skip to content

Commit 31fbcbb

Browse files
committed
Merge remote-tracking branch 'origin' into remove-auth-entry-source-signer
2 parents 355f897 + aef2923 commit 31fbcbb

49 files changed

Lines changed: 1876 additions & 957 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[alias] # command aliases
44
f = "fmt"
5-
md-gen = "run --package doc-gen"
65
s = "run --quiet --"
76
# b = "build"
87
# c = "check"

.github/workflows/binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
if:
206206
github.event_name == 'release' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.head_ref, 'release/')
207207
id: stm-setup
208-
uses: digicert/code-signing-software-trust-action@v1.0.1
208+
uses: digicert/code-signing-software-trust-action@v1.1.0
209209
with:
210210
simple-signing-mode: true
211211
keypair-alias: key_1412258126

.github/workflows/test-install.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Test Install
2+
3+
on:
4+
push:
5+
branches: [main, release/**]
6+
paths:
7+
- install.sh
8+
- test_install.rb
9+
pull_request:
10+
paths:
11+
- install.sh
12+
- test_install.rb
13+
14+
concurrency:
15+
group:
16+
${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha ||
17+
github.ref }}
18+
cancel-in-progress: true
19+
20+
defaults:
21+
run:
22+
shell: bash
23+
24+
jobs:
25+
test-install:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
- uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
30+
with:
31+
ruby-version: ruby
32+
- name: Run install tests
33+
run: ruby test_install.rb

Cargo.lock

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ rust-version = "1.89.0"
2828
[workspace.dependencies.soroban-cli]
2929
version = "=25.1.0"
3030
path = "cmd/soroban-cli"
31-
32-
[workspace.dependencies.soroban-spec-json]
33-
version = "=25.1.0"
34-
path = "./cmd/crates/soroban-spec-json"
31+
default-features = false
3532

3633
[workspace.dependencies.soroban-spec-typescript]
3734
version = "25.1.0"

FULL_HELP_DOCS.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ Generate code client bindings for a contract
274274

275275
###### **Subcommands:**
276276

277-
- `json` — Generate Json Bindings
278277
- `rust` — Generate Rust bindings
279278
- `typescript` — Generate a TypeScript / JavaScript package
280279
- `python` — Generate Python bindings
@@ -283,16 +282,6 @@ Generate code client bindings for a contract
283282
- `swift` — Generate Swift bindings
284283
- `php` — Generate PHP bindings
285284

286-
## `stellar contract bindings json`
287-
288-
Generate Json Bindings
289-
290-
**Usage:** `stellar contract bindings json --wasm <WASM>`
291-
292-
###### **Options:**
293-
294-
- `--wasm <WASM>` — Path to wasm binary
295-
296285
## `stellar contract bindings rust`
297286

298287
Generate Rust bindings

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ build-test-wasms:
4444
build-test: build-test-wasms install
4545

4646
docs:
47-
cargo run --package doc-gen
47+
cargo run --package doc-gen --features additional-libs
4848
./node_modules/.bin/prettier --write --log-level warn FULL_HELP_DOCS.md
4949

5050
test: build-test

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ For installation options, run the script with `--help`:
3737
curl -fsSL https://github.com/stellar/stellar-cli/raw/main/install.sh | sh -s -- --help
3838
```
3939

40+
Install with dependency setup (`--install-deps`) to attempt installing:
41+
42+
- Linux development dependencies (`libdbus`/`libudev` development packages; Linux only, not required on macOS)
43+
- Rust toolchain and `wasm32v1-none` target (for contract build workflows)
44+
45+
```sh
46+
curl -fsSL https://github.com/stellar/stellar-cli/raw/main/install.sh | sh -s -- --install-deps
47+
```
48+
4049
Install with Homebrew (macOS, Linux):
4150

4251
```sh

cmd/crates/soroban-spec-json/Cargo.toml

Lines changed: 0 additions & 26 deletions
This file was deleted.

cmd/crates/soroban-spec-json/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)