contracts: Replace sp-sandbox and wasmi-validation by newest wasmi (#12501)

* Replace sp-sandbox and wasmi-validation by just wasmi

* ".git/.scripts/bench-bot.sh" pallet dev pallet_contracts

* Re-check original code on re-instrumentation

* Fix clippy

* ".git/.scripts/bench-bot.sh" pallet dev pallet_contracts

* Apply suggestions from code review

Co-authored-by: Robin Freyler <robin.freyler@gmail.com>

* Replace wasmi by ::wasmi

* Bump wasmi to 0.20

* Add explanation for `unreachable`

* Change proof

* Fixup master merge

* ".git/.scripts/bench-bot.sh" pallet dev pallet_contracts

* Fixup naming inconsistencies introduced by reentrancy PR

* Fix `scan_imports` docs

* Apply suggestions from code review

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Fixup suggestions

* Remove unnecessary &mut

* Fix test

* ".git/.scripts/bench-bot.sh" pallet dev pallet_contracts

* Fix benchmark merge fail

* ".git/.scripts/bench-bot.sh" pallet dev pallet_contracts

* Fix docs as suggested by code review

* Improve docs for `CodeRejected`

* Apply suggestions from code review

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

* Fix logic bug when setting `deterministic_only`

* Don't panic when module fails to compile

* Apply suggestions from code review

Co-authored-by: Robin Freyler <robin.freyler@gmail.com>

Co-authored-by: command-bot <>
Co-authored-by: Robin Freyler <robin.freyler@gmail.com>
Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>
This commit is contained in:
Alexander Theißen
2022-11-24 23:51:36 +01:00
committed by GitHub
parent e69c3649b5
commit 08657f14b7
23 changed files with 1909 additions and 1634 deletions
+60 -10
View File
@@ -3099,6 +3099,12 @@ dependencies = [
"serde",
]
[[package]]
name = "indexmap-nostd"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
[[package]]
name = "instant"
version = "0.1.12"
@@ -5317,10 +5323,10 @@ dependencies = [
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-sandbox",
"sp-std",
"wasm-instrument",
"wasmi-validation",
"wasmi 0.20.0",
"wasmparser-nostd",
"wat",
]
@@ -7320,7 +7326,7 @@ dependencies = [
"cc",
"libc",
"once_cell",
"spin",
"spin 0.5.2",
"untrusted",
"web-sys",
"winapi",
@@ -8008,7 +8014,7 @@ dependencies = [
"tempfile",
"tracing",
"tracing-subscriber",
"wasmi",
"wasmi 0.13.0",
"wat",
]
@@ -8025,7 +8031,7 @@ dependencies = [
"thiserror",
"wasm-instrument",
"wasmer",
"wasmi",
"wasmi 0.13.0",
]
[[package]]
@@ -8039,7 +8045,7 @@ dependencies = [
"sp-runtime-interface",
"sp-sandbox",
"sp-wasm-interface",
"wasmi",
"wasmi 0.13.0",
]
[[package]]
@@ -9564,7 +9570,7 @@ dependencies = [
"substrate-bip39",
"thiserror",
"tiny-bip39",
"wasmi",
"wasmi 0.13.0",
"zeroize",
]
@@ -9895,7 +9901,7 @@ dependencies = [
"sp-io",
"sp-std",
"sp-wasm-interface",
"wasmi",
"wasmi 0.13.0",
"wat",
]
@@ -10095,7 +10101,7 @@ dependencies = [
"log",
"parity-scale-codec",
"sp-std",
"wasmi",
"wasmi 0.13.0",
"wasmtime",
]
@@ -10120,6 +10126,12 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
[[package]]
name = "spki"
version = "0.6.0"
@@ -11624,7 +11636,19 @@ checksum = "fc13b3c219ca9aafeec59150d80d89851df02e0061bc357b4d66fc55a8d38787"
dependencies = [
"parity-wasm",
"wasmi-validation",
"wasmi_core",
"wasmi_core 0.2.0",
]
[[package]]
name = "wasmi"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01bf50edb2ea9d922aa75a7bf3c15e26a6c9e2d18c56e862b49737a582901729"
dependencies = [
"spin 0.9.4",
"wasmi_arena",
"wasmi_core 0.5.0",
"wasmparser-nostd",
]
[[package]]
@@ -11636,6 +11660,12 @@ dependencies = [
"parity-wasm",
]
[[package]]
name = "wasmi_arena"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ea379cbb0b41f3a9f0bf7b47036d036aae7f43383d8cc487d4deccf40dee0a"
[[package]]
name = "wasmi_core"
version = "0.2.0"
@@ -11649,6 +11679,17 @@ dependencies = [
"num-traits",
]
[[package]]
name = "wasmi_core"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5bf998ab792be85e20e771fe14182b4295571ad1d4f89d3da521c1bef5f597a"
dependencies = [
"downcast-rs",
"libm",
"num-traits",
]
[[package]]
name = "wasmparser"
version = "0.78.2"
@@ -11664,6 +11705,15 @@ dependencies = [
"indexmap",
]
[[package]]
name = "wasmparser-nostd"
version = "0.91.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c37f310b5a62bfd5ae7c0f1d8e6f98af16a5d6d84ba764e9c36439ec14e318b"
dependencies = [
"indexmap-nostd",
]
[[package]]
name = "wasmtime"
version = "1.0.0"