Skip to content

Commit 169cc8f

Browse files
arrudagatesarrudagates
authored
Merge pull request #176 from Abstracted-Labs/francisco-wasm_contracts
InvArch WASM Contracts
2 parents 8492191 + d4aa94e commit 169cc8f

File tree

10 files changed

+1019
-763
lines changed

10 files changed

+1019
-763
lines changed

‎invarch/Cargo.lock

Lines changed: 751 additions & 587 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎invarch/Cargo.toml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@ resolver = "2"
33
members = ['node', 'runtime']
44

55
[workspace.package]
6-
version = "1.2.0"
6+
authors = ["InvArch Association <https://github.com/Abstracted-Labs>"]
77
edition = "2021"
8-
8+
homepage = "https://invarch.network"
99
license = "GPL-3.0"
10-
authors = ["InvArch Association <https://github.com/Abstracted-Labs>"]
1110
repository = "https://github.com/Abstracted-Labs/InvArch/"
12-
homepage = "https://invarch.network"
13-
11+
version = "1.2.2"
1412

1513
[profile.release]
1614
panic = 'unwind'
1715

1816
[workspace.dependencies]
1917

2018
# [build-dependencies]
21-
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
2219
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
20+
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
2321

24-
array-bytes = { version = "6.2" }
22+
array-bytes = { version = "6.2" }
2523
async-trait = { version = "0.1.79" }
26-
clap = { version = "4.5.3"}
24+
clap = { version = "4.5.3" }
2725
codec = { package = "parity-scale-codec", version = "3.6.12", features = [
2826
"derive",
2927
], default-features = false }
@@ -41,20 +39,18 @@ serde = { version = "1.0.197", default-features = false, features = ["derive"] }
4139
serde_json = { version = "1.0.121", default-features = false }
4240
smallvec = { version = "1.11.0", default-features = false }
4341

44-
# Local dependencies
45-
new-modified-construct-runtime = { path = "../new-modified-construct-runtime", default-features = false }
46-
pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
47-
4842

49-
# InvArch
43+
# InvArch/local
44+
pallet-checked-inflation = { path = "../pallets/pallet-checked-inflation", default-features = false }
5045
pallet-dao-manager = { path = "../pallets/pallet-dao-manager", default-features = false }
5146
pallet-dao-staking = { path = "../pallets/pallet-dao-staking", default-features = false }
52-
pallet-checked-inflation = { path = "../pallets/pallet-checked-inflation", default-features = false }
47+
new-modified-construct-runtime = { path = "../new-modified-construct-runtime", default-features = false }
5348

5449
# Substrate
5550
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
5651
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
5752
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
53+
frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
5854
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
5955
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6056
frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
@@ -63,16 +59,18 @@ frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", br
6359
pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6460
pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6561
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
62+
pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6663
pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
67-
frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false}
64+
pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
65+
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6866
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
6967
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
70-
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7168
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7269
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7370
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
7471
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7572
pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
73+
pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7674
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7775
sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
7876
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
@@ -168,4 +166,4 @@ sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.gi
168166
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
169167
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
170168
polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" }
171-
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }
169+
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false }

‎invarch/node/Cargo.toml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[package]
2-
name = "invarch-node"
3-
version.workspace = true
42
authors.workspace = true
3+
build = "build.rs"
54
description = "A Substrate-based InvArch Node."
6-
license.workspace = true
5+
edition.workspace = true
76
homepage.workspace = true
7+
license.workspace = true
8+
name = "invarch-node"
89
publish = false
910
repository.workspace = true
10-
edition.workspace = true
11-
build = "build.rs"
11+
version.workspace = true
1212

1313
# [package.metadata.docs.rs]
1414
# targets = ["x86_64-unknown-linux-gnu"]
@@ -18,68 +18,68 @@ name = "invarch-collator"
1818
path = "src/main.rs"
1919

2020
[dependencies]
21-
async-trait = { workspace = true }
2221
array-bytes = { workspace = true }
22+
async-trait = { workspace = true }
2323
clap = { features = ["derive"], workspace = true }
24-
log = { workspace = true, default-features = true }
2524
codec = { workspace = true, default-features = true }
26-
serde = { features = ["derive"], workspace = true, default-features = true }
27-
jsonrpsee = { features = ["server"], workspace = true }
2825
futures = { workspace = true }
26+
jsonrpsee = { features = ["server"], workspace = true }
27+
log = { workspace = true, default-features = true }
28+
serde = { features = ["derive"], workspace = true, default-features = true }
2929

30-
## Local Dependencies
30+
# Local Dependencies
3131
invarch-runtime = { path = "../runtime" }
3232

33-
serde_json = { workspace = true, default-features = true }
33+
color-print = { workspace = true }
34+
cumulus-client-cli = { workspace = true, default-features = true }
35+
cumulus-client-collator = { workspace = true, default-features = true }
36+
cumulus-client-consensus-aura = { workspace = true, default-features = true }
37+
cumulus-client-consensus-common = { workspace = true, default-features = true }
38+
cumulus-client-consensus-proposer = { workspace = true, default-features = true }
39+
cumulus-client-parachain-inherent = { workspace = true }
40+
cumulus-client-service = { workspace = true, default-features = true }
41+
cumulus-primitives-core = { workspace = true, default-features = true }
42+
cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
43+
cumulus-relay-chain-interface = { workspace = true, default-features = true }
3444
docify = { workspace = true }
3545
frame-benchmarking = { workspace = true, default-features = true }
3646
frame-benchmarking-cli = { workspace = true, default-features = true }
3747
pallet-transaction-payment-rpc = { workspace = true, default-features = true }
48+
polkadot-cli = { features = [
49+
"rococo-native",
50+
], workspace = true, default-features = true }
51+
polkadot-primitives = { workspace = true, default-features = true }
52+
prometheus-endpoint = { workspace = true, default-features = true }
3853
sc-basic-authorship = { workspace = true, default-features = true }
3954
sc-chain-spec = { workspace = true, default-features = true }
4055
sc-cli = { workspace = true, default-features = true }
4156
sc-client-api = { workspace = true, default-features = true }
42-
sc-consensus-aura = { workspace = true }
43-
sc-offchain = { workspace = true, default-features = true }
4457
sc-consensus = { workspace = true, default-features = true }
58+
sc-consensus-aura = { workspace = true }
4559
sc-executor = { workspace = true, default-features = true }
4660
sc-network = { workspace = true, default-features = true }
4761
sc-network-sync = { workspace = true, default-features = true }
62+
sc-offchain = { workspace = true, default-features = true }
4863
sc-rpc = { workspace = true, default-features = true }
4964
sc-service = { workspace = true, default-features = true }
5065
sc-sysinfo = { workspace = true, default-features = true }
5166
sc-telemetry = { workspace = true, default-features = true }
5267
sc-tracing = { workspace = true, default-features = true }
5368
sc-transaction-pool = { workspace = true, default-features = true }
5469
sc-transaction-pool-api = { workspace = true, default-features = true }
70+
serde_json = { workspace = true, default-features = true }
5571
sp-api = { workspace = true, default-features = true }
5672
sp-block-builder = { workspace = true, default-features = true }
5773
sp-blockchain = { workspace = true, default-features = true }
5874
sp-consensus-aura = { workspace = true, default-features = true }
5975
sp-core = { workspace = true, default-features = true }
60-
sp-keystore = { workspace = true, default-features = true }
6176
sp-io = { workspace = true, default-features = true }
77+
sp-keystore = { workspace = true, default-features = true }
6278
sp-runtime = { workspace = true, default-features = true }
6379
sp-timestamp = { workspace = true, default-features = true }
6480
substrate-frame-rpc-system = { workspace = true, default-features = true }
65-
prometheus-endpoint = { workspace = true, default-features = true }
66-
polkadot-cli = { features = [
67-
"rococo-native",
68-
], workspace = true, default-features = true }
69-
polkadot-primitives = { workspace = true, default-features = true }
70-
xcm = { workspace = true }
71-
cumulus-client-cli = { workspace = true, default-features = true }
72-
cumulus-client-collator = { workspace = true, default-features = true }
73-
cumulus-client-consensus-aura = { workspace = true, default-features = true }
74-
cumulus-client-consensus-common = { workspace = true, default-features = true }
75-
cumulus-client-consensus-proposer = { workspace = true, default-features = true }
76-
cumulus-client-parachain-inherent = { workspace = true }
77-
cumulus-client-service = { workspace = true, default-features = true }
78-
cumulus-primitives-core = { workspace = true, default-features = true }
79-
cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
80-
cumulus-relay-chain-interface = { workspace = true, default-features = true }
81-
color-print = { workspace = true }
8281
try-runtime-cli = { workspace = true, optional = true }
82+
xcm = { workspace = true }
8383

8484
[build-dependencies]
8585
substrate-build-script-utils = { workspace = true, default-features = true }

‎invarch/runtime/Cargo.toml

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
2-
name = "invarch-runtime"
3-
version.workspace = true
42
authors.workspace = true
5-
license.workspace = true
3+
edition.workspace = true
64
homepage.workspace = true
5+
license.workspace = true
6+
name = "invarch-runtime"
77
publish = false
88
repository.workspace = true
9-
edition.workspace = true
9+
version.workspace = true
1010

1111
[package.metadata.docs.rs]
1212
targets = ["x86_64-unknown-linux-gnu"]
@@ -22,12 +22,11 @@ log = { workspace = true }
2222
scale-info = { workspace = true }
2323
smallvec = { workspace = true }
2424

25-
new-modified-construct-runtime = { workspace = true }
26-
27-
# InvArch
25+
# InvArch/local
26+
pallet-checked-inflation = { workspace = true }
2827
pallet-dao-manager = { workspace = true }
2928
pallet-dao-staking = { workspace = true }
30-
pallet-checked-inflation = { workspace = true }
29+
new-modified-construct-runtime = { workspace = true }
3130

3231
# Substrate
3332
frame-benchmarking = { workspace = true, optional = true }
@@ -41,14 +40,17 @@ frame-try-runtime = { workspace = true, optional = true }
4140
pallet-aura = { workspace = true }
4241
pallet-authorship = { workspace = true }
4342
pallet-balances = { workspace = true }
43+
pallet-contracts = { workspace = true }
4444
pallet-identity = { workspace = true }
45+
pallet-insecure-randomness-collective-flip = { workspace = true }
4546
pallet-message-queue = { workspace = true }
4647
pallet-session = { workspace = true }
4748
pallet-sudo = { workspace = true }
4849
pallet-timestamp = { workspace = true }
4950
pallet-transaction-payment = { workspace = true }
5051
pallet-transaction-payment-rpc-runtime-api = { workspace = true }
5152
pallet-treasury = { workspace = true }
53+
pallet-tx-pause = { workspace = true }
5254
pallet-utility = { workspace = true }
5355
sp-api = { workspace = true }
5456
sp-block-builder = { workspace = true }
@@ -63,9 +65,6 @@ sp-std = { workspace = true }
6365
sp-transaction-pool = { workspace = true }
6466
sp-version = { workspace = true }
6567

66-
## Local tx-pause pallet as it wasn't available at the time of v0.9.43
67-
pallet-tx-pause = { workspace = true }
68-
6968
# ORML
7069
orml-asset-registry = { workspace = true }
7170
orml-currencies = { workspace = true }
@@ -102,42 +101,55 @@ parachain-info = { workspace = true }
102101

103102
[features]
104103

105-
metadata-hash = [
106-
"substrate-wasm-builder/metadata-hash",
107-
]
104+
metadata-hash = ["substrate-wasm-builder/metadata-hash"]
108105

109-
default = [
110-
"std",
111-
]
106+
default = ["std"]
112107

113108
on-chain-release-build = ["metadata-hash"]
114109

115110
std = [
116111
"codec/std",
117112
"cumulus-pallet-aura-ext/std",
118-
"cumulus-primitives-aura/std",
119113
"cumulus-pallet-dmp-queue/std",
120114
"cumulus-pallet-parachain-system/std",
121115
"cumulus-pallet-xcm/std",
122116
"cumulus-pallet-xcmp-queue/std",
117+
"cumulus-primitives-aura/std",
123118
"cumulus-primitives-core/std",
124119
"cumulus-primitives-timestamp/std",
125120
"cumulus-primitives-utility/std",
126121
"frame-executive/std",
127-
"frame-metadata-hash-extension/std",
122+
"frame-metadata-hash-extension/std",
128123
"frame-support/std",
129124
"frame-system-rpc-runtime-api/std",
130125
"frame-system/std",
131126
"log/std",
127+
"new-modified-construct-runtime/std",
128+
"orml-asset-registry/std",
129+
"orml-currencies/std",
130+
"orml-tokens/std",
131+
"orml-tokens2/std",
132+
"orml-vesting/std",
133+
"orml-xcm/std",
134+
"orml-xtokens/std",
132135
"pallet-aura/std",
133136
"pallet-authorship/std",
134137
"pallet-balances/std",
138+
"pallet-checked-inflation/std",
135139
"pallet-collator-selection/std",
140+
"pallet-contracts/std",
141+
"pallet-dao-manager/std",
142+
"pallet-dao-staking/std",
143+
"pallet-identity/std",
144+
"pallet-insecure-randomness-collective-flip/std",
136145
"pallet-session/std",
137146
"pallet-sudo/std",
138147
"pallet-timestamp/std",
139148
"pallet-transaction-payment-rpc-runtime-api/std",
140149
"pallet-transaction-payment/std",
150+
"pallet-treasury/std",
151+
"pallet-tx-pause/std",
152+
"pallet-utility/std",
141153
"pallet-xcm/std",
142154
"parachain-info/std",
143155
"polkadot-parachain/std",
@@ -157,23 +169,6 @@ std = [
157169
"xcm-builder/std",
158170
"xcm-executor/std",
159171
"xcm/std",
160-
"orml-asset-registry/std",
161-
"orml-currencies/std",
162-
"orml-vesting/std",
163-
"orml-tokens/std",
164-
"orml-tokens2/std",
165-
"orml-xcm/std",
166-
"orml-xtokens/std",
167-
"pallet-identity/std",
168-
"pallet-treasury/std",
169-
"pallet-tx-pause/std",
170-
"pallet-utility/std",
171-
172-
"new-modified-construct-runtime/std",
173-
174-
"pallet-checked-inflation/std",
175-
"pallet-dao-manager/std",
176-
"pallet-dao-staking/std"
177172
]
178173

179174
runtime-benchmarks = [
@@ -184,14 +179,14 @@ runtime-benchmarks = [
184179
"frame-system-benchmarking/runtime-benchmarks",
185180
"frame-system/runtime-benchmarks",
186181
"pallet-balances/runtime-benchmarks",
182+
"pallet-checked-inflation/runtime-benchmarks",
187183
"pallet-collator-selection/runtime-benchmarks",
184+
"pallet-dao-manager/runtime-benchmarks",
185+
"pallet-dao-staking/runtime-benchmarks",
188186
"pallet-timestamp/runtime-benchmarks",
189187
"pallet-xcm/runtime-benchmarks",
190188
"sp-runtime/runtime-benchmarks",
191189
"xcm-builder/runtime-benchmarks",
192-
"pallet-checked-inflation/runtime-benchmarks",
193-
"pallet-dao-manager/runtime-benchmarks",
194-
"pallet-dao-staking/runtime-benchmarks",
195190
]
196191

197192
try-runtime = [

0 commit comments

Comments
 (0)