Skip to content

Commit

Permalink
Pure wasmi 036 (#1442)
Browse files Browse the repository at this point in the history
This is a _much_ simpler alternative to #1434 -- though it cribs some
code from there -- focused on the cruder strategy of "just ship two
sorobans in core", with soroban 22 not being able to replay soroban 21
contracts precisely, but soroban 21 being linked-in to core to handle
such replay.

This makes the task here dramatically simpler -- just adapt to API
changes in wasmi and recalibrate -- with a certain amount more work to
do on the core side, but not a ton.
  • Loading branch information
graydon authored Aug 20, 2024
1 parent a54d997 commit 81a4239
Show file tree
Hide file tree
Showing 338 changed files with 66,332 additions and 66,130 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
rust: [msrv, latest]
test-protocol: [20, 21]
test-protocol: [22]
sys:
- os: ubuntu-latest
target: wasm32-unknown-unknown
Expand Down
115 changes: 91 additions & 24 deletions Cargo.lock

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

19 changes: 10 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ exclude = ["soroban-test-wasms/wasm-workspace"]
# NB: When bumping the major version make sure to clean up the
# code guarded by `unstable-*` features to make it enabled
# unconditionally.
version = "21.2.0"
rust-version = "1.74.0"
version = "22.0.0"
rust-version = "1.79.0"

[workspace.dependencies]
soroban-env-common = { version = "=21.2.0", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "=21.2.0", path = "soroban-env-guest" }
soroban-env-host = { version = "=21.2.0", path = "soroban-env-host" }
soroban-env-macros = { version = "=21.2.0", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "=21.2.0", path = "soroban-builtin-sdk-macros" }
soroban-env-common = { version = "=22.0.0", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "=22.0.0", path = "soroban-env-guest" }
soroban-env-host = { version = "=22.0.0", path = "soroban-env-host" }
soroban-env-macros = { version = "=22.0.0", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "=22.0.0", path = "soroban-builtin-sdk-macros" }
# NB: this must match the wasmparser version wasmi is using
wasmparser = "=0.116.1"

Expand All @@ -41,9 +41,10 @@ default-features = false

[workspace.dependencies.wasmi]
package = "soroban-wasmi"
version = "=0.31.1-soroban.20.0.1"
version = "=0.36.0-soroban.22.0.0"
git = "https://github.com/stellar/wasmi"
rev = "0ed3f3dee30dc41ebe21972399e0a73a41944aa0"
rev = "122a74a7c491929e5ac9de876099154ef7c06d06"
features = ["no-hash-maps"]

# [patch."https://github.com/stellar/rs-stellar-xdr"]
# stellar-xdr = { path = "../rs-stellar-xdr/" }
Expand Down
Loading

0 comments on commit 81a4239

Please sign in to comment.