Skip to content

Commit

Permalink
switch to orml master & latest polkadot-v0.9.10 commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@GopherJ
GopherJ committed Sep 29, 2021
1 parent 344b503 commit 8e2a522
Show file tree
Hide file tree
Showing 10 changed files with 265 additions and 271 deletions.
466 changes: 230 additions & 236 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion node/parallel/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ serde = { version = '1.0.119', features = ['derive'] }
serde_json = '1.0.64'
structopt = '0.3.8'

orml-oracle-rpc = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle-rpc = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' }

sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' }
Expand Down
2 changes: 1 addition & 1 deletion pallets/liquid-staking-v2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ targets = ['x86_64-unknown-linux-gnu']
codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['max-encoded-len'], default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions pallets/liquid-staking/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ targets = ['x86_64-unknown-linux-gnu']
codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['max-encoded-len'], default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
Expand Down Expand Up @@ -47,8 +47,8 @@ cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus
cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' }
parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' }

orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1' }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1' }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git' }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git' }

[features]
default = ['std', 'westend']
Expand Down
6 changes: 3 additions & 3 deletions pallets/loans/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ codec = { package = 'parity-scale-codec', version = '2.2.0', defaul
frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true }
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
Expand All @@ -24,7 +24,7 @@ sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'po
sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }

[dev-dependencies]
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1' }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git' }
pallet-prices = { path = '../prices' }
sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions pallets/prices/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ version = '3.0.0'
codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false }
serde = { version = '1.0.124', optional = true }
sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = '1.0.0'
codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
serde = { version = '1', optional = true }
sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false }
Expand Down
16 changes: 8 additions & 8 deletions runtime/heiko/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus
parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false }

# ORML dependencies
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }

# Parallel dependencies
pallet-amm = { path = '../../pallets/amm', default-features = false }
Expand Down
16 changes: 8 additions & 8 deletions runtime/parallel/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus
parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false }

# ORML dependencies
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }

# Parallel dependencies
pallet-amm = { path = '../../pallets/amm', default-features = false }
Expand Down
16 changes: 8 additions & 8 deletions runtime/vanilla/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus
parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false }

# ORML dependencies
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false }
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false }

# Parallel dependencies
pallet-amm = { path = '../../pallets/amm', default-features = false }
Expand Down

0 comments on commit 8e2a522

Please sign in to comment.