Skip to content

Commit

Permalink
Merge branch 'main' into consistent-builds
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch authored Feb 28, 2024
2 parents 3f90d28 + c27f114 commit 5cec2d7
Show file tree
Hide file tree
Showing 16 changed files with 2,186 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:

uses: stellar/actions/.github/workflows/rust-publish-dry-run-v2.yml@3b400304af2619a33730493eef07fa1071aa8485
with:
crates: soroban-spec-json soroban-spec-typescript soroban-test soroban-cli
crates: soroban-spec-tools soroban-spec-json soroban-spec-typescript soroban-test soroban-cli
runs-on: ${{ matrix.os }}
target: ${{ matrix.target }}
cargo-hack-feature-options: ${{ matrix.cargo-hack-feature-options }}
25 changes: 22 additions & 3 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 @@ -6,7 +6,7 @@ members = [
"cmd/crates/soroban-test/tests/fixtures/test-wasms/*",
"cmd/crates/soroban-test/tests/fixtures/hello",
]
default-members = ["cmd/soroban-cli", "cmd/crates/soroban-test"]
default-members = ["cmd/soroban-cli", "cmd/crates/soroban-spec-tools", "cmd/crates/soroban-test"]
exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

[workspace.package]
Expand Down Expand Up @@ -45,6 +45,10 @@ path = "./cmd/crates/soroban-spec-json"
version = "20.3.1"
path = "./cmd/crates/soroban-spec-typescript"

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

[workspace.dependencies.soroban-sdk]
version = "=20.3.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
Expand All @@ -68,10 +72,6 @@ path = "cmd/soroban-cli"
version = "=20.3.3"
# git = "https://github.com/stellar/soroban-rpc"

[workspace.dependencies.soroban-spec-tools]
version = "=20.3.3"
# git = "https://github.com/stellar/soroban-rpc"

[workspace.dependencies.stellar-xdr]
version = "=20.1.0"
default-features = true
Expand Down
39 changes: 39 additions & 0 deletions cmd/crates/soroban-spec-tools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[package]
name = "soroban-spec-tools"
description = "Tools for using a contract's XDR spec"
homepage = "https://github.com/stellar/soroban-tools"
repository = "https://github.com/stellar/soroban-tools"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version.workspace = true
edition = "2021"
rust-version.workspace = true
autobins = false


[lib]
crate-type = ["rlib"]


[dependencies]
soroban-spec = { workspace = true }
stellar-strkey = { workspace = true }
stellar-xdr = { workspace = true, features = ["curr", "std", "serde"] }
soroban-env-host = { workspace = true }

serde_json = { workspace = true }
itertools = { workspace = true }
ethnum = { workspace = true }
hex = { workspace = true }
wasmparser = { workspace = true }
base64 = { workspace = true }
thiserror = "1.0.31"
# soroban-ledger-snapshot = { workspace = true }
# soroban-sdk = { workspace = true }
# sep5 = { workspace = true }


[dev-dependencies]
which = { workspace = true }
tokio = "1.28.1"
3 changes: 3 additions & 0 deletions cmd/crates/soroban-spec-tools/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# soroban-spec-tools

Tools and utilities for soroban specification / interface.
Loading

0 comments on commit 5cec2d7

Please sign in to comment.