Skip to content

Commit

Permalink
Feature/wasmtime (paritytech#229)
Browse files Browse the repository at this point in the history
* update orml to newest version

* add wasmtime support
  • Loading branch information
atenjin authored Sep 10, 2020
1 parent 74ed065 commit 7c9878e
Show file tree
Hide file tree
Showing 8 changed files with 544 additions and 19 deletions.
532 changes: 521 additions & 11 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ pallet-transaction-payment = { path = "./frame/transaction-payment" }
[dependencies]
cli = { package = "chainx-cli", path = "cli" }

[target.'cfg(target_arch="x86_64")'.dependencies]
cli = { package = "chainx-cli", path = "cli", features = [ "wasmtime" ] }

[workspace]
members = [
"cli",
Expand Down
10 changes: 7 additions & 3 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sc-chain-spec = { version = "2.0.0-rc6" }

sc-cli = { version = "0.8.0-rc6", optional = true }
sc-service = { version = "0.8.0-rc6", optional = true }
frame-benchmarking-cli = { version = "2.0.0-rc6", optional = true }
frame-benchmarking-cli = { version = "2.0.0-rc6" }

# Substrate primitives
sp-core = { version = "2.0.0-rc6" }
Expand Down Expand Up @@ -61,11 +61,15 @@ substrate-build-script-utils = { version = "2.0.0-rc6" }
[features]
default = ["cli"]
cli = [
"frame-benchmarking-cli",
"sc-cli",
"sc-service",
"chainx-executor/wasmi-errno",
]
wasmtime = [
"sc-cli/wasmtime",
"sc-service/wasmtime",
"chainx-executor/wasmtime",
]
runtime-benchmarks = [
"chainx-runtime/runtime-benchmarks",
"frame-benchmarking-cli",
]
8 changes: 8 additions & 0 deletions executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@ frame-benchmarking = { version = "2.0.0-rc6" }
sc-executor = { version = "0.8.0-rc6" }
chainx-runtime = { path = "../runtime" }
xp-io = { path = "../primitives/io" }

[features]
wasmtime = [
"sc-executor/wasmtime",
]
wasmi-errno = [
"sc-executor/wasmi-errno",
]
4 changes: 2 additions & 2 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ frame-system-benchmarking = { version = "2.0.0-rc6", default-features = false, o
frame-benchmarking = { version = "2.0.0-rc6", default-features = false, optional = true }

# orml
orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "27d55f6a8e74b989578ccfb7c44616c3016dcb2a", default-features = false }
orml-currencies = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "27d55f6a8e74b989578ccfb7c44616c3016dcb2a", default-features = false }
orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "46708eacd6418810d3e64f0cd9a242d4fcb6ebec", default-features = false }
orml-currencies = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "46708eacd6418810d3e64f0cd9a242d4fcb6ebec", default-features = false }

# ChainX primitives
chainx-primitives = { path = "../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion xpallets/assets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ frame-system = { version = "2.0.0-rc6", default-features = false }
frame-benchmarking = { version = "2.0.0-rc6", default-features = false, optional = true }

# orml
orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "27d55f6a8e74b989578ccfb7c44616c3016dcb2a", default-features = false }
orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "46708eacd6418810d3e64f0cd9a242d4fcb6ebec", default-features = false }

# ChainX primitives
chainx-primitives = { path = "../../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion xpallets/gateway/bitcoin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ frame-benchmarking = { version = "2.0.0-rc6", default-features = false, optional
pallet-timestamp = { version = "2.0.0-rc6", default-features = false }

# orml
orml-utilities = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "27d55f6a8e74b989578ccfb7c44616c3016dcb2a", default-features = false }
orml-utilities = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "46708eacd6418810d3e64f0cd9a242d4fcb6ebec", default-features = false }

# ChainX primitives
chainx-primitives = { path = "../../../primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion xpallets/gateway/records/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ frame-system = { version = "2.0.0-rc6", default-features = false }
frame-benchmarking = { version = "2.0.0-rc6", default-features = false, optional = true }

# orml
orml-utilities = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "27d55f6a8e74b989578ccfb7c44616c3016dcb2a", default-features = false }
orml-utilities = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "46708eacd6418810d3e64f0cd9a242d4fcb6ebec", default-features = false }

# ChainX
chainx-primitives = { path = "../../../primitives", default-features = false }
Expand Down

0 comments on commit 7c9878e

Please sign in to comment.