Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3,320 changes: 1,617 additions & 1,703 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,14 @@ lto = true
codegen-units = 1

[workspace]
members = ['node/*', 'pallets/*', 'runtime/*', 'integration-tests','support']
members = ['node/*', 'pallets/*', 'runtime/*','support','integration-tests']

[patch.crates-io]
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [detect-secrets] reported by reviewdog 🐶

  • Hex High Entropy String

Copy link
Contributor Author

@yrong yrong May 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GopherJ could we relax check here? no 0.9.22 branch or tag in orml repo so just patch with matched rev commit here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but I didn't find how to configure reviewdog on this

orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-oracle-rpc = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = 'f709ed62262435b3ad80482d309e3575625d1e5b' }
4 changes: 2 additions & 2 deletions LIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- `node`: parallelfinance/parallel:v1.8.6
- `runtime`: 186
- `branch`: https://github.com/parallel-finance/parallel/tree/v1.8.6
- `polkadot`: v0.9.19
- `polkadot`: v0.9.22
- `wasm`: https://github.com/parallel-finance/parallel/releases/download/v1.8.6/heiko_runtime.compact.compressed.wasm
- `blake256_hash`: 0xe5032dcb49ad0e2cd35fe7b840fc4964a6ec95b8d3652c2458dff21584b56679
- `deployment_date`: 2022/05/17
Expand All @@ -13,7 +13,7 @@
- `node`: parallelfinance/parallel:v1.8.6-1
- `runtime`: 186
- `branch`: https://github.com/parallel-finance/parallel/tree/v1.8.6-1
- `polkadot`: v0.9.19
- `polkadot`: v0.9.22
- `wasm`: https://github.com/parallel-finance/parallel/releases/download/v1.8.6-1/parallel_runtime.compact.compressed.wasm
- `blake256_hash`: 0xbfcf000098f3ffa441ff71f4867646572265cea336dfa8180337432744faac5d
- `deployment_date`: 2022/05/18
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ LAUNCH_CONFIG_YAML := config.yml
LAUNCH_CONFIG_JSON := config.json
DOCKER_OVERRIDE_YAML := docker-compose.override.yml
DOCKER_TAG := latest
RELAY_DOCKER_TAG := v0.9.19
CUMULUS_DOCKER_TAG := v0.9.19
RELAY_DOCKER_TAG := v0.9.22
CUMULUS_DOCKER_TAG := v0.9.22

.PHONY: init
init: submodules
git config advice.ignoredHook false
git config core.hooksPath .githooks
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2022-04-24 --component rust-src --target wasm32-unknown-unknown
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2022-04-24 --component rust-src --component rustfmt --component clippy --target wasm32-unknown-unknown
cargo install cargo-udeps --locked
cd scripts/helper && yarn
cd scripts/polkadot-launch && yarn

Expand Down Expand Up @@ -78,7 +79,7 @@ fast-test-crowdloan:

.PHONY: integration-test
integration-test:
SKIP_WASM_BUILD= cargo test -p runtime-integration-tests -- --nocapture
RUST_LOG="xcm=trace,xcm-executor=trace" SKIP_WASM_BUILD= cargo test -p runtime-integration-tests -- --nocapture

.PHONY: integration-test-statemine
integration-test-statemine:
Expand Down Expand Up @@ -143,6 +144,10 @@ fmt:
SKIP_WASM_BUILD= cargo fmt --all
cd scripts/helper && yarn format

.PHONY: udeps
udeps:
SKIP_WASM_BUILD= cargo udeps -q --all-targets

.PHONY: resources
resources:
docker run --rm parallelfinance/parallel:$(DOCKER_TAG) export-genesis-state --chain $(CHAIN) > ./resources/para-$(PARA_ID)-genesis
Expand Down
4 changes: 2 additions & 2 deletions config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
relaychain:
image: parallelfinance/polkadot:v0.9.19
image: parallelfinance/polkadot:v0.9.22
chain: polkadot-local
runtimeGenesisConfig:
hrmp:
Expand Down Expand Up @@ -48,7 +48,7 @@ parachains:
nodes:
- flags:
- --alice
- image: parallelfinance/polkadot-collator:v0.9.19
- image: parallelfinance/polkadot-collator:v0.9.22
chain:
base: statemine-dev
collators:
Expand Down
74 changes: 37 additions & 37 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@ smallvec = '1.6.1'
static_assertions = '1.1.0'

# Substrate
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }

# Polkadot dependencies
pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }

# Cumulus dependencies
cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }

# ORML dependencies
orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'polkadot-v0.9.19' }
orml-oracle = { version = '0.4.1-dev' }
orml-traits = { version = '0.4.1-dev' }
orml-vesting = { version = '0.4.1-dev' }
orml-xcm = { version = '0.4.1-dev' }
orml-xcm-support = { version = '0.4.1-dev' }
orml-xtokens = { version = '0.4.1-dev' }

# Parallel dependencies
heiko-runtime = { path = '../runtime/heiko' }
Expand All @@ -71,16 +71,16 @@ parallel-runtime = { path = '../runtime/parallel' }
primitives = { package = 'parallel-primitives', path = '../primitives' }

[dev-dependencies]
cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-test-relay-sproof-builder = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
cumulus-test-relay-sproof-builder = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
env_logger = '0.9.0'
kusama-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
kusama-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
log = '0.4.14'
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
polkadot-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.19' }
sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
sp-trie = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.19' }
statemine-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
statemint-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.19' }
xcm-emulator = { git = 'https://github.com/shaunxw/xcm-simulator.git', rev = '6c358483d8e119cd3b631ebb14d3b0cf0041d94e' }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
polkadot-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.22' }
sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
sp-trie = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.22' }
statemine-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
statemint-runtime = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.22' }
xcm-emulator = { git = 'https://github.com/shaunxw/xcm-simulator.git', rev = '5a04d6286ee9082d4b7433541e48508f8b65616b' }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [detect-secrets] reported by reviewdog 🐶

  • Hex High Entropy String

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same,any way it is commit id not secret

2 changes: 1 addition & 1 deletion integration-tests/src/kusama_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn transfer_to_relay_chain() {
println!("heiko para account in relaychain:{:?}", para_acc);
assert_eq!(
kusama_runtime::Balances::free_balance(&AccountId::from(BOB)),
999_834_059_328 //xcm fee in kusama is 165_940_672 ~=0.015$
999_988_476_752 //xcm fee in kusama is 165_940_672 ~=0.015$
);
});
}
2 changes: 1 addition & 1 deletion integration-tests/src/polkadot_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn transfer_to_relay_chain() {
println!("parallel para account in relaychain:{:?}", para_acc);
assert_eq!(
polkadot_runtime::Balances::free_balance(&AccountId::from(BOB)),
995_172_288_96
995_305_825_48
);
});
}
3 changes: 2 additions & 1 deletion integration-tests/src/statemine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub const RMRK_DECIMAL: u8 = 10;
pub const RMRK_WEIGHT_PER_SEC: u128 = 100000000000;
pub const HEIKO_RMRK_ASSET_ID: u32 = 4187061565;
pub const STATEMINE_TOTAL_FEE_AMOUNT: u128 = 1_000_000_000; //still can be decreased further but we add some margin here
pub const FEE_IN_KUSAMA: u128 = 165_940_672;
pub const FEE_IN_KUSAMA: u128 = 29_642_910;
pub const FEE_IN_STATEMINE: u128 = 10_666_664;
pub const WEIGHT_IN_STATEMINE: u64 = 4_000_000_000;

Expand All @@ -38,6 +38,7 @@ pub fn rmrk(n: f64) -> Balance {

#[test]
fn statemine() {
env_logger::init();
use pallet_traits::xcm::AssetType;
let statemine_rmrk_asset_location =
MultiLocation::new(1, X3(Parachain(1000), PalletInstance(50), GeneralIndex(8)));
Expand Down
Loading