Skip to content

Commit 0554c2d

Browse files
clangenbbrenzi
clangenb
and
brenzi
authored
Enable Fee Payment in community currency (paritytech#118)
last feature addition before 1.0.0 release * bump polkadot deps to 0.9.18 * bump pallets to 1.0.0 * define existential deposit for community currency * enable asset fee payment for community currency Tested with kusama-local * [x] bootstrap_demo_community 👍 * [x] pay fees in CC, even if no native token on account * [x] bot-community growth 👍 Co-authored-by: Alain Brenzikofer <news@brenzi.ch>
1 parent 16d499f commit 0554c2d

File tree

15 files changed

+1454
-930
lines changed

15 files changed

+1454
-930
lines changed

‎Cargo.lock

+1,159-672
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+4-23
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,12 @@ panic = "unwind"
1111

1212
#only while debugging/developping
1313
#[patch."https://github.com/encointer/pallets"]
14+
#encointer-balances-tx-payment = { path = "../encointer-pallets/balances-tx-payment" }
15+
#encointer-primitives = { path = "../encointer-pallets/primitives" }
16+
#pallet-encointer-balances = { path = "../encointer-pallets/balances" }
17+
#pallet-encointer-bazaar = { path = "../encointer-pallets/bazaar" }
1418
#pallet-encointer-ceremonies = { path = "../encointer-pallets/ceremonies" }
1519
#pallet-encointer-communities = { path = "../encointer-pallets/communities" }
16-
#pallet-encointer-balances = { path = "../encointer-pallets/balances" }
1720
#pallet-encointer-scheduler = { path = "../encointer-pallets/scheduler" }
18-
#pallet-encointer-bazaar = { path = "../encointer-pallets/bazaar" }
19-
#encointer-primitives = { path = "../encointer-pallets/primitives" }
20-
#ep-core = { path = "../encointer-pallets/primitives/core" }
2121
#pallet-encointer-sybil-gate-template = { path = "../encointer-pallets/sybil-gate-template" }
2222
#pallet-encointer-personhood-oracle = { path = "../encointer-pallets/personhood-oracle" }
23-
24-
## This was used, as I added some debug logs to de xcm-executor. The rest is just second level deps.
25-
#[patch."https://github.com/paritytech/polkadot"]
26-
#xcm = { path = "../polkadot/xcm"}
27-
#xcm-builder = { path = "../polkadot/xcm/xcm-builder"}
28-
#xcm-executor = { path = "../polkadot/xcm/xcm-executor"}
29-
#polkadot-runtime = { path = "../polkadot/runtime/polkadot" }
30-
#polkadot-statement-table = { path = "../polkadot/statement-table" }
31-
#polkadot-overseer = { path = "../polkadot/node/overseer" }
32-
#polkadot-node-primitives = { path = "../polkadot/node/primitives" }
33-
#polkadot-node-subsystem = { path = "../polkadot/node/subsystem" }
34-
#polkadot-test-client = { path = "../polkadot/node/test/client" }
35-
#polkadot-core-primitives = { path = "../polkadot/core-primitives" }
36-
#polkadot-cli = { path = "../polkadot/cli" }
37-
#polkadot-test-service = { path = "../polkadot/node/test/service" }
38-
#polkadot-parachain = { path = "../polkadot/parachain" }
39-
#polkadot-primitives = { path = "../polkadot/primitives" }
40-
#polkadot-service = { path = "../polkadot/node/service" }
41-
#polkadot-test-runtime = { path = "../polkadot/runtime/test-runtime" }

‎polkadot-parachains/Cargo.toml

+59-58
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "encointer-collator"
33
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
4-
version = "0.6.11"
4+
version = "1.0.0"
55
authors = ["Encointer <info@encointer.org>"]
66
build = "build.rs"
77
edition = "2021"
@@ -14,7 +14,7 @@ path = "src/main.rs"
1414
clap = { version = "3.1", features = ["derive"] }
1515
futures = { version = "0.3.1", features = ["compat"] }
1616
log = "0.4.8"
17-
codec = { package = "parity-scale-codec", version = "2.3.0" }
17+
codec = { package = "parity-scale-codec", version = "3.0.0" }
1818
serde = { version = "1.0.132", features = ["derive"] }
1919
hex-literal = "0.3.4"
2020
async-trait = "0.1.42"
@@ -28,74 +28,75 @@ launch-runtime = { package = "launch-runtime", path = "launch-runtime" }
2828
parachains-common = { path = "parachains-common" }
2929

3030
# encointer dependencies
31-
pallet-encointer-ceremonies-rpc = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
32-
pallet-encointer-ceremonies-rpc-runtime-api = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
33-
pallet-encointer-communities-rpc = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
34-
pallet-encointer-communities-rpc-runtime-api = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
35-
pallet-encointer-bazaar-rpc = {git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
36-
pallet-encointer-bazaar-rpc-runtime-api = {git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.17"}
31+
pallet-encointer-ceremonies-rpc = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
32+
pallet-encointer-ceremonies-rpc-runtime-api = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
33+
pallet-encointer-communities-rpc = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
34+
pallet-encointer-communities-rpc-runtime-api = { git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
35+
pallet-encointer-bazaar-rpc = {git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
36+
pallet-encointer-bazaar-rpc-runtime-api = {git = "https://github.com/encointer/pallets", branch = "polkadot-v0.9.18"}
3737

3838
# Substrate dependencies
39-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
40-
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
41-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.17" }
42-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
43-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
44-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
45-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
46-
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
47-
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
48-
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
49-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
50-
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
51-
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
52-
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
53-
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
54-
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
55-
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
56-
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
57-
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
58-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
59-
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
60-
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
61-
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
62-
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
63-
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
64-
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
65-
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
66-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
67-
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
68-
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
39+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
40+
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
41+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.18" }
42+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
43+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
44+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
45+
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
46+
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
47+
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
48+
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
49+
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
50+
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
51+
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
52+
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
53+
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
54+
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
55+
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
56+
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
57+
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
58+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
59+
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
60+
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
61+
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
62+
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
63+
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
64+
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
65+
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
66+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
67+
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
68+
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
6969

70-
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
70+
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
7171

7272
# RPC related dependencies
7373
jsonrpc-core = "18.0.0"
74-
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
75-
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
76-
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
74+
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
75+
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
76+
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
7777

7878
# Cumulus dependencies
79-
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
80-
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
81-
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
82-
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
83-
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
84-
cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
85-
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
86-
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
87-
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
88-
cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" }
79+
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
80+
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
81+
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
82+
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
83+
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
84+
cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
85+
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
86+
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
87+
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
88+
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
89+
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" }
8990

9091
# Polkadot dependencies
91-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
92-
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
93-
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
94-
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
95-
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
92+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
93+
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
94+
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
95+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
96+
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
9697

9798
[build-dependencies]
98-
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
99+
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
99100

100101
[dev-dependencies]
101102
assert_cmd = "0.12"

0 commit comments

Comments
 (0)