Skip to content

Commit

Permalink
Auth Next changes in SDK (#848)
Browse files Browse the repository at this point in the history
Co-authored-by: Graydon Hoare <[email protected]>
Co-authored-by: Leigh McCulloch <[email protected]>
  • Loading branch information
3 people authored Feb 4, 2023
1 parent 6f90f5d commit d801de5
Show file tree
Hide file tree
Showing 32 changed files with 578 additions and 1,549 deletions.
42 changes: 24 additions & 18 deletions Cargo.lock

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

13 changes: 6 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
resolver = "2"

members = [
"soroban-sdk",
"soroban-auth",
"soroban-sdk",
"soroban-sdk-macros",
"soroban-spec",
"soroban-ledger-snapshot",
Expand Down Expand Up @@ -37,27 +37,26 @@ soroban-token-spec = { version = "0.4.3", path = "soroban-token-spec" }
[workspace.dependencies.soroban-env-common]
version = "0.0.12"
git = "https://github.com/stellar/rs-soroban-env"
rev = "96ea6dcbb2a57208b2ba1dc202490b92d4ba537e"
rev = "fc611e5cdd50bcc3113ff1ccb4a09d3ad0dc68f4"

[workspace.dependencies.soroban-env-guest]
version = "0.0.12"
git = "https://github.com/stellar/rs-soroban-env"
rev = "96ea6dcbb2a57208b2ba1dc202490b92d4ba537e"
rev = "fc611e5cdd50bcc3113ff1ccb4a09d3ad0dc68f4"

[workspace.dependencies.soroban-env-host]
version = "0.0.12"
git = "https://github.com/stellar/rs-soroban-env"
rev = "96ea6dcbb2a57208b2ba1dc202490b92d4ba537e"
rev = "fc611e5cdd50bcc3113ff1ccb4a09d3ad0dc68f4"

[workspace.dependencies.stellar-strkey]
version = "0.0.6"
version = "0.0.7"
git = "https://github.com/stellar/rs-stellar-strkey"
rev = "5e582a8b"

[workspace.dependencies.stellar-xdr]
version = "0.0.12"
git = "https://github.com/stellar/rs-stellar-xdr"
rev = "154e07e"
rev = "763b104d0eb0147c0be94620254c223677fd4b7b"
default-features = false

# [patch."https://github.com/stellar/rs-soroban-env"]
Expand Down
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ CARGO_TEST_SUBCOMMAND:=$(shell type -p cargo-nextest >/dev/null && echo nextest
CARGO_DOC_ARGS?=--open

doc: fmt
cargo test --doc -p soroban-sdk -p soroban-sdk-macros -p soroban-auth --features testutils
cargo +nightly doc -p soroban-sdk -p soroban-auth --no-deps --features docs,testutils $(CARGO_DOC_ARGS)
cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils
cargo +nightly doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS)

test: fmt build
cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs $(CARGO_TEST_SUBCOMMAND)
Expand All @@ -29,11 +29,6 @@ readme:
&& cat ../target/doc/soroban_sdk.json \
| jq -r '.index[.root].docs' \
> README.md
cd soroban-auth \
&& cargo +nightly rustdoc -- -Zunstable-options -wjson \
&& cat ../target/doc/soroban_auth.json \
| jq -r '.index[.root].docs' \
> README.md

watch:
cargo watch --clear --watch-when-idle --shell '$(MAKE)'
Expand Down
18 changes: 2 additions & 16 deletions soroban-auth/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "soroban-auth"
description = "Soroban authorization sdk"
description = "Soroban auth SDK."
homepage = "https://github.com/stellar/rs-soroban-sdk"
repository = "https://github.com/stellar/rs-soroban-sdk"
authors = ["Stellar Development Foundation <[email protected]>"]
readme = "README.md"
readme = "../README.md"
license = "Apache-2.0"
version.workspace = true
edition = "2021"
Expand All @@ -13,22 +13,8 @@ rust-version = "1.67"
[lib]
doctest = false

[features]
testutils = ["soroban-sdk/testutils", "dep:ed25519-dalek", "dep:rand"]
docs = []

[dependencies]
soroban-sdk = { workspace = true }

[target.'cfg(not(target_family="wasm"))'.dependencies]
ed25519-dalek = { version = "1.0.1", optional = true }
rand = { version = "0.7.3", optional = true }

[dev_dependencies]
soroban-sdk = { workspace = true, features = ["testutils"] }
stellar-strkey = { workspace = true }
ed25519-dalek = { version = "1.0.1" }
rand = { version = "0.7.3" }

[package.metadata.docs.rs]
all-features = true
15 changes: 0 additions & 15 deletions soroban-auth/README.md

This file was deleted.

Loading

0 comments on commit d801de5

Please sign in to comment.