Moving pallet-asset-tx-payment from cumulus to substrate (#712)

* Moving `pallet-asset-tx-payment` to substrate

* Pointing `substrate` to my branch to fix the CI

* Fixing cargo.lock

Memmlock2 was in double

* Duplicate Prost-build

* cargo update

* Fixing cargo.lock post merge

* Changes to `Cargo.toml` after substrate merge
This commit is contained in:
Georges
2021-11-19 13:06:38 +00:00
committed by GitHub
parent c308c01b62
commit 4a559a5872
11 changed files with 170 additions and 1348 deletions
@@ -20,6 +20,7 @@ sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", de
frame-executive = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
pallet-asset-tx-payment = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
@@ -33,7 +34,6 @@ xcm = { git = 'https://github.com/paritytech/polkadot', default-features = false
xcm-executor = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
# Local dependencies
pallet-asset-tx-payment = { path = '../../pallets/asset-tx-payment', default-features = false }
pallet-collator-selection = { path = '../../pallets/collator-selection', default-features = false }
[dev-dependencies]