Skip to content

Commit

Permalink
enable TEER on Asset Hub and KSM on self (#271)
Browse files Browse the repository at this point in the history
* added assets and asset-registry pallets

* assets can only be created by root

* reserve transfer of ROC to and from relay works

* fix benchmark build

* enable teleport of TEER to asset hub

* be more tolerant of MultiLocation synonyms

* lift patches

* teleport back works too now

* bump versions

* cleanup deadends

* balance comparison script

* cleanup, document  and reorder xcm-config

* send XCM revenues to treasury

* clarify inline docs
  • Loading branch information
brenzi authored Feb 16, 2024
1 parent c54aae6 commit e578170
Show file tree
Hide file tree
Showing 13 changed files with 1,228 additions and 159 deletions.
112 changes: 95 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ serde_json = "1.0"
smallvec = "1.11.0"

# integritee pallets
pallet-asset-registry = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
xcm-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }
xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v1.6.0" }

# Polkadot-sdk and ecosystem crates [no_std]
assets-common = { version = "0.7.0", default-features = false }
cumulus-pallet-aura-ext = { version = "0.7.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.7.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.7.0", default-features = false }
Expand All @@ -52,6 +55,7 @@ orml-traits = { version = "0.7", default-features = false }
orml-xcm = { version = "0.7", default-features = false }
orml-xcm-support = { version = "0.7", default-features = false }
orml-xtokens = { version = "0.7", default-features = false }
pallet-assets = { version = "29.0.0", default-features = false }
pallet-aura = { version = "27.0.0", default-features = false }
pallet-authorship = { version = "28.0.0", default-features = false }
pallet-balances = { version = "28.0.0", default-features = false }
Expand Down Expand Up @@ -161,6 +165,7 @@ substrate-wasm-builder = "17.0.0"
#claims-primitives = { path = '../pallets/primitives/claims' }
#common-primitives = { path = '../pallets/primitives/common' }
#enclave-bridge-primitives = { path = '../pallets/primitives/enclave-bridge' }
#pallet-asset-registry = { path = '../pallets/asset-registry' }
#pallet-claims = { path = '../pallets/claims' }
#pallet-enclave-bridge = { path = '../pallets/enclave-bridge' }
#pallet-sidechain = { path = '../pallets/sidechain' }
Expand All @@ -170,8 +175,9 @@ substrate-wasm-builder = "17.0.0"
#sgx-verify = { path = '../pallets/teerex/sgx-verify' }
#teeracle-primitives = { path = '../pallets/primitives/teeracle' }
#teerex-primitives = { path = '../pallets/primitives/teerex' }
#xcm-transactor-primitives = { path = '../pallets/primitives/xcm-transactor' }
#test-utils = { path = '../pallets/test-utils' }
#xcm-primitives = { path = '../pallets/primitives/xcm' }
#xcm-transactor-primitives = { path = '../pallets/primitives/xcm-transactor' }

[patch.crates-io]
ring = { git = "https://github.com/betrusted-io/ring-xous", branch = "0.16.20-cleanup" }
2 changes: 1 addition & 1 deletion polkadot-parachains/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-collator"
description = "The Integritee parachain collator binary"
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
version = "1.9.0"
version = "1.9.1"
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
Loading

0 comments on commit e578170

Please sign in to comment.