Skip to content

Commit

Permalink
feat(revive): include pallet-revive (#2)
Browse files Browse the repository at this point in the history 
* feat(revive): include initial version of pallet-revive

* chore(contracts-node): bring back pallet-contracts
  • Loading branch information
@al3mart
al3mart authored Nov 21, 2024
1 parent 3c68e54 commit 052bfaa
Show file tree
Hide file tree
Showing 8 changed files with 420 additions and 203 deletions.
26 changes: 13 additions & 13 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ repository = "https://github.com/paritytech/substrate-contracts-node"

[workspace]
resolver = "2"
members = [
"node",
"runtime",
"parachain-runtime",
]
members = ["node", "runtime", "parachain-runtime"]

[profile.release]
panic = 'unwind'

[workspace.dependencies]
clap = { version = "4.5.10", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
"derive",
] }
futures = "0.3.30"
hex-literal = { version = "0.4.1"}
hex-literal = { version = "0.4.1" }
jsonrpsee = { version = "0.24.3", features = ["server"] }
log = { version = "0.4.22", default-features = false }
serde = { version = "1.0.209", features = ["derive"] }
serde_json = "1.0.127"
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.11.1", default-features = false, features = [
"derive",
] }
smallvec = "1.11.0"
color-print = "0.3.4"
wasmtime="8.0.1"
wasmtime = "8.0.1"

# Substrate
frame-benchmarking = { version = "38.0.0", default-features = false }
Expand All @@ -44,6 +44,7 @@ frame-try-runtime = { version = "0.44.0", default-features = false }
pallet-aura = { version = "37.0.0", default-features = false }
pallet-authorship = { version = "38.0.0", default-features = false }
pallet-balances = { version = "39.0.0", default-features = false }
pallet-contracts = { version = "38.0.0", default-features = false }
pallet-session = { version = "38.0.0", default-features = false }
pallet-sudo = { version = "38.0.0", default-features = false }
pallet-timestamp = { version = "37.0.0", default-features = false }
Expand Down Expand Up @@ -98,10 +99,10 @@ sp-storage = { version = "21.0.0", default-features = false }
sc-consensus-aura = { version = "0.45.0", default-features = false }
sc-consensus-manual-seal = { version = "0.46.0", default-features = false }

# extra deps for setting up pallet-contracts
pallet-contracts = { version = "38.0.0", default-features = false }
pallet-insecure-randomness-collective-flip = { version = "26.0.0", default-features = false }
# extra deps for setting up pallet-revive
pallet-assets = { version = "40.0.0", default-features = false }
pallet-insecure-randomness-collective-flip = { version = "26.0.0", default-features = false }
pallet-revive = { version = "0.2.0", default-features = false }
pallet-utility = { version = "38.0.0", default-features = false }

# Polkadot
Expand Down Expand Up @@ -136,4 +137,3 @@ cumulus-relay-chain-interface = { version = "0.18.0" }
pallet-collator-selection = { version = "19.0.0", default-features = false }
parachain-info = { version = "0.17.0", package = "staging-parachain-info", default-features = false }
parachains-common = { version = "18.0.0", default-features = false }

16 changes: 9 additions & 7 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "contracts-node"
version.workspace = true
authors.workspace = true
description = "Substrate node configured for smart contracts via `pallet-contracts`."
description = "Substrate node configured for smart contracts via `pallet-contracts` and `pallet-revive`."
edition.workspace = true
license.workspace = true
build = "build.rs"
Expand All @@ -27,8 +27,10 @@ serde_json = { workspace = true }
wasmtime = { workspace = true }

# Local
contracts-parachain-runtime = { path = "../parachain-runtime", features = ["parachain"], version = "0.42.0" }
contracts-node-runtime = { path = "../runtime", version = "0.42.0" }
contracts-parachain-runtime = { path = "../parachain-runtime", features = [
"parachain",
], version = "0.42.0" }
contracts-node-runtime = { path = "../runtime", version = "0.42.0" }

# Substrate
frame-benchmarking = { workspace = true }
Expand Down Expand Up @@ -93,10 +95,10 @@ substrate-build-script-utils = { workspace = true }
[features]
default = []
runtime-benchmarks = [
"contracts-parachain-runtime/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
"contracts-parachain-runtime/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
]
try-runtime = [
"try-runtime-cli/try-runtime",
"contracts-parachain-runtime/try-runtime"
"try-runtime-cli/try-runtime",
"contracts-parachain-runtime/try-runtime",
]
198 changes: 99 additions & 99 deletions parachain-runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@ name = "contracts-parachain-runtime"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "Parachain Runtime configured for smart contracts via `pallet-contracts`."
description = "Parachain Runtime configured for smart contracts via `pallet-contracts` and `pallet-revive`."
license.workspace = true
homepage.workspace = true
repository.workspace = true

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[build-dependencies]
substrate-wasm-builder = {workspace = true, optional = true }
substrate-wasm-builder = { workspace = true, optional = true }

[dependencies]
codec = { features = [
"derive",
], workspace = true }
codec = { features = ["derive"], workspace = true }
hex-literal = { version = "0.4.1", optional = true }
log = { version = "0.4.21", default-features = false }
scale-info = { workspace = true }
Expand All @@ -27,9 +25,9 @@ frame-benchmarking = { workspace = true, optional = true }
frame-executive = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
frame-system-benchmarking = {workspace = true, optional = true}
frame-system-benchmarking = { workspace = true, optional = true }
frame-system-rpc-runtime-api = { workspace = true }
frame-try-runtime = { workspace = true, optional = true}
frame-try-runtime = { workspace = true, optional = true }
pallet-aura = { workspace = true }
pallet-authorship = { workspace = true }
pallet-balances = { workspace = true }
Expand Down Expand Up @@ -75,111 +73,113 @@ pallet-collator-selection = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }

# extra deps for setting up pallet-contracts
# extra deps for setting up pallet-contracts and pallet-revive
pallet-contracts = { workspace = true }
pallet-revive = { workspace = true }
pallet-utility = { workspace = true }
pallet-insecure-randomness-collective-flip = { workspace = true }
pallet-assets = { workspace = true }

[features]
default = [
"std",
]
default = ["std"]
std = [
"codec/std",
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
"cumulus-primitives-aura/std",
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"frame-executive/std",
"frame-support/std",
"frame-system-rpc-runtime-api/std",
"frame-system/std",
"log/std",
"pallet-assets/std",
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
"pallet-contracts/std",
"pallet-insecure-randomness-collective-flip/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-xcm/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"pallet-xcm/std",
"parachain-info/std",
"polkadot-parachain-primitives/std",
"polkadot-runtime-common/std",
"scale-info/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-inherents/std",
"sp-offchain/std",
"sp-runtime/std",
"sp-session/std",
"sp-std/std",
"sp-transaction-pool/std",
"sp-version/std",
"substrate-wasm-builder",
"xcm-builder/std",
"xcm-executor/std",
"xcm/std",
"codec/std",
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
"cumulus-primitives-aura/std",
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"frame-executive/std",
"frame-support/std",
"frame-system-rpc-runtime-api/std",
"frame-system/std",
"log/std",
"pallet-assets/std",
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
"pallet-contracts/std",
"pallet-revive/std",
"pallet-insecure-randomness-collective-flip/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-xcm/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"pallet-xcm/std",
"parachain-info/std",
"polkadot-parachain-primitives/std",
"polkadot-runtime-common/std",
"scale-info/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-inherents/std",
"sp-offchain/std",
"sp-runtime/std",
"sp-session/std",
"sp-std/std",
"sp-transaction-pool/std",
"sp-version/std",
"substrate-wasm-builder",
"xcm-builder/std",
"xcm-executor/std",
"xcm/std",
]

runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
"polkadot-parachain-primitives/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-sudo/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
"polkadot-parachain-primitives/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-sudo/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
]

try-runtime = [
"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
"frame-executive/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-aura/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"polkadot-runtime-common/try-runtime",
"sp-runtime/try-runtime",
"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
"frame-executive/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-aura/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
"pallet-contracts/try-runtime",
"pallet-revive/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"polkadot-runtime-common/try-runtime",
"sp-runtime/try-runtime",
]

parachain = []
Loading

0 comments on commit 052bfaa

Please sign in to comment.