grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update wasmi (#8452)

Browse Source
This commit is contained in:
Sergey Pepyakin 2018-04-21 12:27:39 +03:00 committed by 5chdn
parent aaae220be6
commit cca00948f0
No known key found for this signature in database
GPG Key ID: 1A40871B597F5F80
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -3435,12 +3435,20 @@ dependencies = [
"parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)",
"pwasm-utils 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"vm 0.1.0",
<<<<<<< HEAD
"wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
=======
"wasmi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
>>>>>>> 650948fee... Update wasmi (#8452)
]
[[package]]
name = "wasmi"
<<<<<<< HEAD
version = "0.1.1"
=======
version = "0.1.3"
>>>>>>> 650948fee... Update wasmi (#8452)
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3814,7 +3822,11 @@ dependencies = [
"checksum vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c3365f36c57e5df714a34be40902b27a992eeddb9996eca52d0584611cf885d"
"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
<<<<<<< HEAD
"checksum wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dedfb4cbfba1e1921b12ed05762d9d5ae99ce40e72b98bbf271561ef487e8c7"
=======
"checksum wasmi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d19da510b59247935ad5f598357b3cc739912666d75d3d28318026478d95bbdb"
>>>>>>> 650948fee... Update wasmi (#8452)
"checksum webpki 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e1622384bcb5458c6a3e3fa572f53ea8fef1cc85e535a2983dea87e9154fac2"
"checksum webpki-roots 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "155d4060e5befdf3a6076bd28c22513473d9900b763c9e4521acc6f78a75415c"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"

4
ethcore/wasm/Cargo.toml
View File

@ -5,11 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
byteorder = "1.0"
ethereum-types = "0.2"
ethereum-types = "0.3"
log = "0.3"
parity-wasm = "0.27"
libc = "0.2"
pwasm-utils = "0.1"
vm = { path = "../vm" }
wasmi = { version = "0.1", features = ["opt-in-32bit"] }
ethcore-logger = { path = "../../logger" }
wasmi = { version = "0.1.3", features = ["opt-in-32bit"] }