Skip to content

Commit 052bfaa

Browse files
al3martal3mart
authored
feat(revive): include pallet-revive (#2)
* feat(revive): include initial version of pallet-revive * chore(contracts-node): bring back pallet-contracts
1 parent 3c68e54 commit 052bfaa

File tree

8 files changed

+420
-203
lines changed

8 files changed

+420
-203
lines changed

‎Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ repository = "https://github.com/paritytech/substrate-contracts-node"
88

99
[workspace]
1010
resolver = "2"
11-
members = [
12-
"node",
13-
"runtime",
14-
"parachain-runtime",
15-
]
11+
members = ["node", "runtime", "parachain-runtime"]
1612

1713
[profile.release]
1814
panic = 'unwind'
1915

2016
[workspace.dependencies]
2117
clap = { version = "4.5.10", features = ["derive"] }
22-
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
18+
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
19+
"derive",
20+
] }
2321
futures = "0.3.30"
24-
hex-literal = { version = "0.4.1"}
22+
hex-literal = { version = "0.4.1" }
2523
jsonrpsee = { version = "0.24.3", features = ["server"] }
2624
log = { version = "0.4.22", default-features = false }
2725
serde = { version = "1.0.209", features = ["derive"] }
2826
serde_json = "1.0.127"
29-
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
27+
scale-info = { version = "2.11.1", default-features = false, features = [
28+
"derive",
29+
] }
3030
smallvec = "1.11.0"
3131
color-print = "0.3.4"
32-
wasmtime="8.0.1"
32+
wasmtime = "8.0.1"
3333

3434
# Substrate
3535
frame-benchmarking = { version = "38.0.0", default-features = false }
@@ -44,6 +44,7 @@ frame-try-runtime = { version = "0.44.0", default-features = false }
4444
pallet-aura = { version = "37.0.0", default-features = false }
4545
pallet-authorship = { version = "38.0.0", default-features = false }
4646
pallet-balances = { version = "39.0.0", default-features = false }
47+
pallet-contracts = { version = "38.0.0", default-features = false }
4748
pallet-session = { version = "38.0.0", default-features = false }
4849
pallet-sudo = { version = "38.0.0", default-features = false }
4950
pallet-timestamp = { version = "37.0.0", default-features = false }
@@ -98,10 +99,10 @@ sp-storage = { version = "21.0.0", default-features = false }
9899
sc-consensus-aura = { version = "0.45.0", default-features = false }
99100
sc-consensus-manual-seal = { version = "0.46.0", default-features = false }
100101

101-
# extra deps for setting up pallet-contracts
102-
pallet-contracts = { version = "38.0.0", default-features = false }
103-
pallet-insecure-randomness-collective-flip = { version = "26.0.0", default-features = false }
102+
# extra deps for setting up pallet-revive
104103
pallet-assets = { version = "40.0.0", default-features = false }
104+
pallet-insecure-randomness-collective-flip = { version = "26.0.0", default-features = false }
105+
pallet-revive = { version = "0.2.0", default-features = false }
105106
pallet-utility = { version = "38.0.0", default-features = false }
106107

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

‎node/Cargo.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "contracts-node"
33
version.workspace = true
44
authors.workspace = true
5-
description = "Substrate node configured for smart contracts via `pallet-contracts`."
5+
description = "Substrate node configured for smart contracts via `pallet-contracts` and `pallet-revive`."
66
edition.workspace = true
77
license.workspace = true
88
build = "build.rs"
@@ -27,8 +27,10 @@ serde_json = { workspace = true }
2727
wasmtime = { workspace = true }
2828

2929
# Local
30-
contracts-parachain-runtime = { path = "../parachain-runtime", features = ["parachain"], version = "0.42.0" }
31-
contracts-node-runtime = { path = "../runtime", version = "0.42.0" }
30+
contracts-parachain-runtime = { path = "../parachain-runtime", features = [
31+
"parachain",
32+
], version = "0.42.0" }
33+
contracts-node-runtime = { path = "../runtime", version = "0.42.0" }
3234

3335
# Substrate
3436
frame-benchmarking = { workspace = true }
@@ -93,10 +95,10 @@ substrate-build-script-utils = { workspace = true }
9395
[features]
9496
default = []
9597
runtime-benchmarks = [
96-
"contracts-parachain-runtime/runtime-benchmarks",
97-
"polkadot-cli/runtime-benchmarks",
98+
"contracts-parachain-runtime/runtime-benchmarks",
99+
"polkadot-cli/runtime-benchmarks",
98100
]
99101
try-runtime = [
100-
"try-runtime-cli/try-runtime",
101-
"contracts-parachain-runtime/try-runtime"
102+
"try-runtime-cli/try-runtime",
103+
"contracts-parachain-runtime/try-runtime",
102104
]

‎parachain-runtime/Cargo.toml

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ name = "contracts-parachain-runtime"
33
version.workspace = true
44
authors.workspace = true
55
edition.workspace = true
6-
description = "Parachain Runtime configured for smart contracts via `pallet-contracts`."
6+
description = "Parachain Runtime configured for smart contracts via `pallet-contracts` and `pallet-revive`."
77
license.workspace = true
88
homepage.workspace = true
99
repository.workspace = true
1010

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

1616
[dependencies]
17-
codec = { features = [
18-
"derive",
19-
], workspace = true }
17+
codec = { features = ["derive"], workspace = true }
2018
hex-literal = { version = "0.4.1", optional = true }
2119
log = { version = "0.4.21", default-features = false }
2220
scale-info = { workspace = true }
@@ -27,9 +25,9 @@ frame-benchmarking = { workspace = true, optional = true }
2725
frame-executive = { workspace = true }
2826
frame-support = { workspace = true }
2927
frame-system = { workspace = true }
30-
frame-system-benchmarking = {workspace = true, optional = true}
28+
frame-system-benchmarking = { workspace = true, optional = true }
3129
frame-system-rpc-runtime-api = { workspace = true }
32-
frame-try-runtime = { workspace = true, optional = true}
30+
frame-try-runtime = { workspace = true, optional = true }
3331
pallet-aura = { workspace = true }
3432
pallet-authorship = { workspace = true }
3533
pallet-balances = { workspace = true }
@@ -75,111 +73,113 @@ pallet-collator-selection = { workspace = true }
7573
parachain-info = { workspace = true }
7674
parachains-common = { workspace = true }
7775

78-
# extra deps for setting up pallet-contracts
76+
# extra deps for setting up pallet-contracts and pallet-revive
7977
pallet-contracts = { workspace = true }
78+
pallet-revive = { workspace = true }
8079
pallet-utility = { workspace = true }
8180
pallet-insecure-randomness-collective-flip = { workspace = true }
8281
pallet-assets = { workspace = true }
8382

8483
[features]
85-
default = [
86-
"std",
87-
]
84+
default = ["std"]
8885
std = [
89-
"codec/std",
90-
"cumulus-pallet-aura-ext/std",
91-
"cumulus-pallet-dmp-queue/std",
92-
"cumulus-pallet-parachain-system/std",
93-
"cumulus-pallet-xcm/std",
94-
"cumulus-pallet-xcmp-queue/std",
95-
"cumulus-primitives-aura/std",
96-
"cumulus-primitives-core/std",
97-
"cumulus-primitives-timestamp/std",
98-
"cumulus-primitives-utility/std",
99-
"frame-executive/std",
100-
"frame-support/std",
101-
"frame-system-rpc-runtime-api/std",
102-
"frame-system/std",
103-
"log/std",
104-
"pallet-assets/std",
105-
"pallet-aura/std",
106-
"pallet-authorship/std",
107-
"pallet-balances/std",
108-
"pallet-collator-selection/std",
109-
"pallet-contracts/std",
110-
"pallet-insecure-randomness-collective-flip/std",
111-
"pallet-session/std",
112-
"pallet-sudo/std",
113-
"pallet-xcm/std",
114-
"pallet-timestamp/std",
115-
"pallet-transaction-payment-rpc-runtime-api/std",
116-
"pallet-transaction-payment/std",
117-
"pallet-xcm/std",
118-
"parachain-info/std",
119-
"polkadot-parachain-primitives/std",
120-
"polkadot-runtime-common/std",
121-
"scale-info/std",
122-
"scale-info/std",
123-
"sp-api/std",
124-
"sp-block-builder/std",
125-
"sp-consensus-aura/std",
126-
"sp-core/std",
127-
"sp-inherents/std",
128-
"sp-offchain/std",
129-
"sp-runtime/std",
130-
"sp-session/std",
131-
"sp-std/std",
132-
"sp-transaction-pool/std",
133-
"sp-version/std",
134-
"substrate-wasm-builder",
135-
"xcm-builder/std",
136-
"xcm-executor/std",
137-
"xcm/std",
86+
"codec/std",
87+
"cumulus-pallet-aura-ext/std",
88+
"cumulus-pallet-dmp-queue/std",
89+
"cumulus-pallet-parachain-system/std",
90+
"cumulus-pallet-xcm/std",
91+
"cumulus-pallet-xcmp-queue/std",
92+
"cumulus-primitives-aura/std",
93+
"cumulus-primitives-core/std",
94+
"cumulus-primitives-timestamp/std",
95+
"cumulus-primitives-utility/std",
96+
"frame-executive/std",
97+
"frame-support/std",
98+
"frame-system-rpc-runtime-api/std",
99+
"frame-system/std",
100+
"log/std",
101+
"pallet-assets/std",
102+
"pallet-aura/std",
103+
"pallet-authorship/std",
104+
"pallet-balances/std",
105+
"pallet-collator-selection/std",
106+
"pallet-contracts/std",
107+
"pallet-revive/std",
108+
"pallet-insecure-randomness-collective-flip/std",
109+
"pallet-session/std",
110+
"pallet-sudo/std",
111+
"pallet-xcm/std",
112+
"pallet-timestamp/std",
113+
"pallet-transaction-payment-rpc-runtime-api/std",
114+
"pallet-transaction-payment/std",
115+
"pallet-xcm/std",
116+
"parachain-info/std",
117+
"polkadot-parachain-primitives/std",
118+
"polkadot-runtime-common/std",
119+
"scale-info/std",
120+
"scale-info/std",
121+
"sp-api/std",
122+
"sp-block-builder/std",
123+
"sp-consensus-aura/std",
124+
"sp-core/std",
125+
"sp-inherents/std",
126+
"sp-offchain/std",
127+
"sp-runtime/std",
128+
"sp-session/std",
129+
"sp-std/std",
130+
"sp-transaction-pool/std",
131+
"sp-version/std",
132+
"substrate-wasm-builder",
133+
"xcm-builder/std",
134+
"xcm-executor/std",
135+
"xcm/std",
138136
]
139137

140138
runtime-benchmarks = [
141-
"cumulus-pallet-parachain-system/runtime-benchmarks",
142-
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
143-
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
144-
"frame-benchmarking/runtime-benchmarks",
145-
"frame-support/runtime-benchmarks",
146-
"frame-system-benchmarking/runtime-benchmarks",
147-
"frame-system/runtime-benchmarks",
148-
"hex-literal",
149-
"polkadot-parachain-primitives/runtime-benchmarks",
150-
"pallet-balances/runtime-benchmarks",
151-
"pallet-collator-selection/runtime-benchmarks",
152-
"pallet-sudo/runtime-benchmarks",
153-
"pallet-timestamp/runtime-benchmarks",
154-
"pallet-xcm/runtime-benchmarks",
155-
"polkadot-runtime-common/runtime-benchmarks",
156-
"sp-runtime/runtime-benchmarks",
157-
"xcm-builder/runtime-benchmarks",
158-
"xcm-executor/runtime-benchmarks",
139+
"cumulus-pallet-parachain-system/runtime-benchmarks",
140+
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
141+
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
142+
"frame-benchmarking/runtime-benchmarks",
143+
"frame-support/runtime-benchmarks",
144+
"frame-system-benchmarking/runtime-benchmarks",
145+
"frame-system/runtime-benchmarks",
146+
"hex-literal",
147+
"polkadot-parachain-primitives/runtime-benchmarks",
148+
"pallet-balances/runtime-benchmarks",
149+
"pallet-collator-selection/runtime-benchmarks",
150+
"pallet-sudo/runtime-benchmarks",
151+
"pallet-timestamp/runtime-benchmarks",
152+
"pallet-xcm/runtime-benchmarks",
153+
"polkadot-runtime-common/runtime-benchmarks",
154+
"sp-runtime/runtime-benchmarks",
155+
"xcm-builder/runtime-benchmarks",
156+
"xcm-executor/runtime-benchmarks",
159157
]
160158

161159
try-runtime = [
162-
"cumulus-pallet-aura-ext/try-runtime",
163-
"cumulus-pallet-dmp-queue/try-runtime",
164-
"cumulus-pallet-parachain-system/try-runtime",
165-
"cumulus-pallet-xcm/try-runtime",
166-
"cumulus-pallet-xcmp-queue/try-runtime",
167-
"frame-executive/try-runtime",
168-
"frame-support/try-runtime",
169-
"frame-system/try-runtime",
170-
"frame-try-runtime/try-runtime",
171-
"pallet-aura/try-runtime",
172-
"pallet-authorship/try-runtime",
173-
"pallet-balances/try-runtime",
174-
"pallet-collator-selection/try-runtime",
175-
"pallet-session/try-runtime",
176-
"pallet-sudo/try-runtime",
177-
"pallet-timestamp/try-runtime",
178-
"pallet-transaction-payment/try-runtime",
179-
"pallet-xcm/try-runtime",
180-
"parachain-info/try-runtime",
181-
"polkadot-runtime-common/try-runtime",
182-
"sp-runtime/try-runtime",
160+
"cumulus-pallet-aura-ext/try-runtime",
161+
"cumulus-pallet-dmp-queue/try-runtime",
162+
"cumulus-pallet-parachain-system/try-runtime",
163+
"cumulus-pallet-xcm/try-runtime",
164+
"cumulus-pallet-xcmp-queue/try-runtime",
165+
"frame-executive/try-runtime",
166+
"frame-support/try-runtime",
167+
"frame-system/try-runtime",
168+
"frame-try-runtime/try-runtime",
169+
"pallet-aura/try-runtime",
170+
"pallet-authorship/try-runtime",
171+
"pallet-balances/try-runtime",
172+
"pallet-collator-selection/try-runtime",
173+
"pallet-contracts/try-runtime",
174+
"pallet-revive/try-runtime",
175+
"pallet-session/try-runtime",
176+
"pallet-sudo/try-runtime",
177+
"pallet-timestamp/try-runtime",
178+
"pallet-transaction-payment/try-runtime",
179+
"pallet-xcm/try-runtime",
180+
"parachain-info/try-runtime",
181+
"polkadot-runtime-common/try-runtime",
182+
"sp-runtime/try-runtime",
183183
]
184184

185185
parachain = []

0 commit comments

Comments
 (0)