Skip to content

Support asset transfers via XCM #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vgeddes wants to merge 36 commits into from
Closed

Support asset transfers via XCM #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
355969d
Convert to a Rococo-compatible parachain
vgeddes Oct 10, 2020
14857b5
Rename asset pallet
vgeddes Oct 29, 2020
421ed90
Add traits for asset module
vgeddes Oct 30, 2020
bb73fe4
Update tests
vgeddes Oct 30, 2020
b59458c
Get apps to work with new assets pallets
vgeddes Oct 30, 2020
bfff007
Update runtime for changes in asset pallet
vgeddes Oct 30, 2020
5d7dca8
Add xcm-support crate
vgeddes Oct 31, 2020
85fdc07
Add xcm-support pallet
vgeddes Nov 1, 2020
90ea753
Build now works
vgeddes Nov 1, 2020
8abd9bd
Token dealer pallet now compiles
vgeddes Nov 2, 2020
06f4aaf
Add token dealer pallet
vgeddes Nov 2, 2020
3f4a608
Add tests for token dealer pallet
vgeddes Nov 2, 2020
fdeb483
Add comments to xcm-primitives
vgeddes Nov 2, 2020
858c55e
Add location converter
vgeddes Nov 3, 2020
5e34e00
Refactor token dealer
vgeddes Nov 3, 2020
4f15664
Fixes
vgeddes Nov 3, 2020
ad66a99
Fixes
vgeddes Nov 3, 2020
1cd60cf
Fix tests
vgeddes Nov 4, 2020
e1e6026
Fixes
vgeddes Nov 4, 2020
5a0a0ca
Fixes
vgeddes Nov 4, 2020
fd09479
Add debug statements
vgeddes Nov 4, 2020
a727e6d
Fixes
vgeddes Nov 4, 2020
739377e
Tests pass
vgeddes Nov 4, 2020
635ec21
Fixes
vgeddes Nov 4, 2020
6991666
Fixes
vgeddes Nov 4, 2020
585f608
Fixes
vgeddes Nov 4, 2020
0ffb308
Fixes
vgeddes Nov 4, 2020
dbb961b
Refactor
vgeddes Nov 6, 2020
f79b3e4
Clean up code
vgeddes Nov 10, 2020
0a65d7d
Add test for transferring DOT
vgeddes Nov 10, 2020
7b1407a
Add documentation comments
vgeddes Nov 10, 2020
f8fa87c
Update parachain/pallets/assets/src/lib.rs
vgeddes Nov 18, 2020
f8901df
Fix text strings
vgeddes Nov 18, 2020
e997024
Update documentation for assets pallet
vgeddes Nov 18, 2020
9502541
Add TODO about weights
vgeddes Nov 18, 2020
a9947ec
Add correct filter for Reserve asset location
vgeddes Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,192 changes: 2,906 additions & 1,286 deletions parachain/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ panic = "unwind"
members = [
"primitives/core",
"primitives/ethereum",
"primitives/xcm-support",
"pallets/bridge",
"pallets/asset",
"pallets/assets",
"pallets/verifier",
"pallets/eth-app",
"pallets/erc20-app",
"pallets/token-dealer",
"node",
"runtime",
]
215 changes: 75 additions & 140 deletions parachain/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,145 +1,80 @@
[package]
name = "artemis-node"
description = "Artemis Node"
version = "0.1.1"
build = "build.rs"
edition = "2018"
authors = ["Snowfork <[email protected]>"]
repository = "https://github.com/Snowfork/polkadot-ethereum"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
name = 'artemis-collator'
description = 'Artemis Node'
version = '0.1.1'
build = 'build.rs'
edition = '2018'
authors = ['Snowfork <[email protected]>']
repository = 'https://github.com/Snowfork/polkadot-ethereum'

[[bin]]
name = "artemis-node"

[dependencies.artemis-runtime]
path = "../runtime"
version = "0.1.1"

[dependencies.pallet-transaction-payment-rpc]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sc-basic-authorship]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-cli]
features = ["wasmtime"]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-client-api]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sc-consensus]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-consensus-aura]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-executor]
features = ["wasmtime"]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-finality-grandpa]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-rpc]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sc-rpc-api]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-service]
features = ["wasmtime"]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sc-transaction-pool]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-api]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-block-builder]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-blockchain]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-consensus]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sp-consensus-aura]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "0.8.0-rc6"

[dependencies.sp-core]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-finality-grandpa]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-inherents]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-runtime]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.sp-transaction-pool]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"

[dependencies.substrate-frame-rpc-system]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"
name = 'artemis-collator'
path = 'src/main.rs'

[dependencies]
jsonrpc-core = "14.0.3"
structopt = "0.3.8"

[build-dependencies.substrate-build-script-utils]
git = "https://github.com/paritytech/substrate.git"
tag = "v2.0.0-rc6"
version = "2.0.0-rc6"
derive_more = '0.15.0'
exit-future = '0.1.4'
futures = { version = "0.3.1", features = ["compat"] }
log = '0.4.8'
parking_lot = '0.9.0'
trie-root = '0.15.2'
codec = { package = 'parity-scale-codec', version = '1.0.0' }
structopt = "0.3.3"
ansi_term = "0.12.1"
serde = { version = "1.0.101", features = ["derive"] }

# Parachain dependencies
artemis-runtime = { path = "../runtime" }

# Substrate dependencies
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch", version = "0.8.0-rc5" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-informant = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }

# Cumulus dependencies
cumulus-consensus = { git = "https://github.com/paritytech/cumulus", branch = 'gav-xcmp' }
cumulus-collator = { git = "https://github.com/paritytech/cumulus", branch = 'gav-xcmp' }
cumulus-network = { git = "https://github.com/paritytech/cumulus", branch = 'gav-xcmp' }
cumulus-primitives = { git = "https://github.com/paritytech/cumulus", branch = 'gav-xcmp' }
cumulus-service = { git = "https://github.com/paritytech/cumulus", branch = 'gav-xcmp' }

# Polkadot dependencies
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }

[dev-dependencies]
assert_cmd = "0.12"
nix = "0.17"
rand = "0.7.3"
tokio = { version = "0.2.13", features = ["macros"] }

# Polkadot dependencies
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcmp" }
Loading