Skip to content

Commit

Permalink
Merge branch 'main' into feat/tx_add_op
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal authored Dec 3, 2024
2 parents 0f41acd + c940386 commit fe4f6a1
Show file tree
Hide file tree
Showing 22 changed files with 134 additions and 60 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,13 @@ jobs:
$Env:Path += ";C:\Users\$Env:UserName\AppData\Local\Programs\Inno Setup 6"
$Env:STELLAR_CLI_VERSION = "${{ env.VERSION }}"
ISCC.exe installer.iss
mv Output/stellar-installer.exe ${{ env.STELLAR_CLI_INSTALLER }}
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.STELLAR_CLI_INSTALLER }}
path: Output/stellar-installer.exe
path: ${{ env.STELLAR_CLI_INSTALLER }}

- name: Build provenance for attestation (release only)
if: github.event_name == 'release'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
check: [advisories, bans, licenses, sources]
continue-on-error: ${{ matrix.check == 'advisories' || matrix.check == 'bans' || matrix.check == 'licenses' }}
continue-on-error: ${{ matrix.check == 'advisories' }}
steps:
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@b01e7a8cfb1f496c52d77361e84c1840d8246393
Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ exclude = [
]

[workspace.package]
version = "22.0.0"
version = "22.0.1"
rust-version = "1.81.0"

# Dependencies located in this repo:
[workspace.dependencies.soroban-cli]
version = "=22.0.0"
version = "=22.0.1"
path = "cmd/soroban-cli"

[workspace.dependencies.soroban-spec-json]
version = "=22.0.0"
version = "=22.0.1"
path = "./cmd/crates/soroban-spec-json"

[workspace.dependencies.soroban-spec-typescript]
version = "22.0.0"
version = "22.0.1"
path = "./cmd/crates/soroban-spec-typescript"

[workspace.dependencies.soroban-spec-tools]
version = "22.0.0"
version = "22.0.1"
path = "./cmd/crates/soroban-spec-tools"

# Dependencies from the rs-stellar-xdr repo:
Expand Down
15 changes: 12 additions & 3 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ Generate code client bindings for a contract
* `json` — Generate Json Bindings
* `rust` — Generate Rust bindings
* `typescript` — Generate a TypeScript / JavaScript package
* `python` — Generate Python bindings



Expand Down Expand Up @@ -306,6 +307,14 @@ Generate a TypeScript / JavaScript package



## `stellar contract bindings python`

Generate Python bindings

**Usage:** `stellar contract bindings python`



## `stellar contract build`

Build a contract from source
Expand Down Expand Up @@ -1615,7 +1624,7 @@ Creates and funds a new account with the specified starting balance
* `--destination <DESTINATION>` — Account Id to create, e.g. `GBX...`
* `--starting-balance <STARTING_BALANCE>` — Initial balance in stroops of the account, default 1 XLM

Default value: `10000000`
Default value: `10_000_000`



Expand Down Expand Up @@ -1644,7 +1653,7 @@ https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/a
* `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
* `--global` — Use global config
* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
* `--data-name <DATA_NAME>`Line to change, either 4 or 12 alphanumeric characters, or "native" if not specified
* `--data-name <DATA_NAME>`String up to 64 bytes long. If this is a new Name it will add the given name/value pair to the account. If this Name is already present then the associated value will be modified
* `--data-value <DATA_VALUE>` — Up to 64 bytes long hex string If not present then the existing Name will be deleted. If present then this value will be set in the `DataEntry`


Expand Down Expand Up @@ -1676,7 +1685,7 @@ Sends an amount in a specific asset to a destination account
* `--asset <ASSET>` — Asset to send, default native, e.i. XLM

Default value: `native`
* `--amount <AMOUNT>` — Amount of the aforementioned asset to send
* `--amount <AMOUNT>` — Amount of the aforementioned asset to send. e.g. `10_000_000` (1 XLM)



Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stellar-bye"
version = "0.0.0"
version = "22.0.1"
edition = "2021"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soroban-hello"
version = "0.0.0"
version = "22.0.1"
edition = "2021"
publish = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_constructor"
version = "0.0.0"
version = "22.0.1"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_account"
version = "0.0.0"
version = "22.0.1"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_types"
version = "0.0.0"
version = "22.0.1"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_hello_world"
version = "0.0.0"
version = "22.0.1"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_swap"
version = "0.0.0"
version = "22.0.1"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_token"
version = "0.0.0"
version = "22.0.1"
description = "Soroban standard token contract"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ async fn payment() {
"--destination",
test1.as_str(),
"--amount",
ONE_XLM.to_string().as_str(),
"10_000_000",
])
.assert()
.success();
Expand Down
Loading

0 comments on commit fe4f6a1

Please sign in to comment.