Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update xdr to success result #461

Merged
merged 3 commits into from
Sep 21, 2022
+7 −3
Merged

Update xdr to success result #461

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bc161f
Add commented-out soroban-sdk patches for local-sdk usecases
graydon Sep 21, 2022
8f0317d
Bump rs-stellar-xdr to absorb upstream change (no actual effect on env)
graydon Sep 21, 2022
0663f35
Merge branch 'main' into update-xdr-to-success-result
graydon Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@ soroban-env-common = { path = "soroban-env-common" }
soroban-env-host = { path = "soroban-env-host" }
soroban-env-macros = { path = "soroban-env-macros" }
soroban-native-sdk-macros = { path = "soroban-native-sdk-macros" }
stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "fb78a6b8" }
stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "c026149" }
wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "a61b6df" }
6 changes: 5 additions & 1 deletion soroban-test-wasms/wasm-workspace/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ soroban-native-sdk-macros = { path = "../../soroban-native-sdk-macros" }

# You should update this rev to the XDR rev used by the outer workspace
# anytime you're going to recompile this workspace.
stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "fb78a6b8" }
stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "c026149" }

# You should actually be able to set this to be any existing version of wasmi because we are
# not building the SDK in host mode, so the "vm" feature is off.
@@ -97,6 +97,10 @@ soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "8c3544
soroban-sdk-macros = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "8c35444b52ce5b59edde69415ff4cb7f9127b983" }
soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "8c35444b52ce5b59edde69415ff4cb7f9127b983" }

# soroban-sdk = { path = "../../../rs-soroban-sdk/soroban-sdk" }
# soroban-sdk-macros = { path = "../../../rs-soroban-sdk/soroban-sdk-macros"}
# soroban-spec = { path = "../../../rs-soroban-sdk/soroban-spec" }

# soroban-auth is currently not-used by these examples, but is in the SDK repo
# and must be patched in lock-step with the others if it's ever used here.
# soroban-auth = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "8c35444b52ce5b59edde69415ff4cb7f9127b983" }