Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/add_stellar_ledger
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal committed Dec 3, 2024
2 parents 567e2ab + c940386 commit dd1d079
Show file tree
Hide file tree
Showing 29 changed files with 259 additions and 116 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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ changes quickly.

## Setting up development environment

There are 2 ways to being developing stellar-cli:
There are 2 ways to begin developing stellar-cli:

### Installing all required dependencies

Expand Down
70 changes: 35 additions & 35 deletions Cargo.lock

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

12 changes: 6 additions & 6 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 Expand Up @@ -66,7 +66,7 @@ package = "stellar-rpc-client"
version = "=22.0.0-rc.1"

[workspace.dependencies.stellar-ledger]
version = "=22.0.0"
version = "=22.0.1"
path = "cmd/crates/stellar-ledger"

# Dependencies from elsewhere shared by crates:
Expand Down
17 changes: 13 additions & 4 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 @@ -1625,7 +1634,7 @@ Creates, updates, or deletes a trustline Learn more about trustlines https://dev
* `--line <LINE>`
* `--limit <LIMIT>` — Limit for the trust line, 0 to remove the trust line

Default value: `18446744073709551615`
Default value: `9223372036854775807`



Expand Down Expand Up @@ -1655,7 +1664,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 All @@ -1682,7 +1691,7 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
* `--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 @@ -1714,7 +1723,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 README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Stellar CLI (stellar-cli)

![Apache 2.0 licensed](https://img.shields.io/badge/license-apache%202.0-blue.svg)
[![Apache 2.0 licensed](https://img.shields.io/badge/license-apache%202.0-blue.svg)](LICENSE)
[![Crates.io Version](https://img.shields.io/crates/v/stellar-cli?label=version&amp;color=04ac5b)](https://crates.io/crates/stellar-cli)

This repo is home to the Stellar CLI, the command-line multi-tool for running and deploying Stellar contracts on the Stellar network.
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
Loading

0 comments on commit dd1d079

Please sign in to comment.