difftreelog
Merge remote-tracking branch 'origin/develop' into feature/polkadot-v0.9.12
in: master
14 files changed
.dockerignorediffbeforeafterboth2.github/2.github/3doc/3doc/4target/4target/5tests/5chain-data*/6chain-data*/6smart_contract/7smart_contract/8Dockerfile-parachain9docker-compose-tests-parachain.yml710Cargo.lockdiffbeforeafterboth385385386[[package]]386[[package]]387name = "backtrace"387name = "backtrace"388version = "0.3.61"388version = "0.3.62"389source = "registry+https://github.com/rust-lang/crates.io-index"389source = "registry+https://github.com/rust-lang/crates.io-index"390checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"390checksum = "091bcdf2da9950f96aa522681ce805e6857f6ca8df73833d35736ab2dc78e152"391dependencies = [391dependencies = [392 "addr2line",392 "addr2line",393 "cc",393 "cc",394 "cfg-if 1.0.0",394 "cfg-if 1.0.0",395 "libc",395 "libc",396 "miniz_oxide",396 "miniz_oxide",397 "object",397 "object 0.27.1",398 "rustc-demangle",398 "rustc-demangle",399]399]400400317931793180[[package]]3180[[package]]3181name = "http-body"3181name = "http-body"3182version = "0.4.3"3182version = "0.4.4"3183source = "registry+https://github.com/rust-lang/crates.io-index"3183source = "registry+https://github.com/rust-lang/crates.io-index"3184checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"3184checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"3185dependencies = [3185dependencies = [3186 "bytes 1.1.0",3186 "bytes 1.1.0",3187 "http",3187 "http",321732173218[[package]]3218[[package]]3219name = "hyper"3219name = "hyper"3220version = "0.14.13"3220version = "0.14.14"3221source = "registry+https://github.com/rust-lang/crates.io-index"3221source = "registry+https://github.com/rust-lang/crates.io-index"3222checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593"3222checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b"3223dependencies = [3223dependencies = [3224 "bytes 1.1.0",3224 "bytes 1.1.0",3225 "futures-channel",3225 "futures-channel",3724 "pallet-offences-benchmarking",3724 "pallet-offences-benchmarking",3725 "pallet-proxy",3725 "pallet-proxy",3726 "pallet-recovery",3726 "pallet-recovery",3727 "pallet-scheduler 4.0.0-dev",3727 "pallet-scheduler",3728 "pallet-session",3728 "pallet-session",3729 "pallet-session-benchmarking",3729 "pallet-session-benchmarking",3730 "pallet-society",3730 "pallet-society",383238323833[[package]]3833[[package]]3834name = "libc"3834name = "libc"3835version = "0.2.104"3835version = "0.2.105"3836source = "registry+https://github.com/rust-lang/crates.io-index"3836source = "registry+https://github.com/rust-lang/crates.io-index"3837checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce"3837checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"383838383839[[package]]3839[[package]]3840name = "libloading"3840name = "libloading"5093 "pallet-nft-charge-transaction",5093 "pallet-nft-charge-transaction",5094 "pallet-nft-transaction-payment",5094 "pallet-nft-transaction-payment",5095 "pallet-randomness-collective-flip",5095 "pallet-randomness-collective-flip",5096 "pallet-scheduler 3.0.0",5097 "pallet-sudo",5096 "pallet-sudo",5098 "pallet-timestamp",5097 "pallet-timestamp",5099 "pallet-transaction-payment",5098 "pallet-transaction-payment",5100 "pallet-transaction-payment-rpc-runtime-api",5099 "pallet-transaction-payment-rpc-runtime-api",5101 "pallet-treasury",5100 "pallet-treasury",5101 "pallet-unq-scheduler",5102 "pallet-vesting",5102 "pallet-vesting",5103 "pallet-xcm",5103 "pallet-xcm",5104 "parachain-info",5104 "parachain-info",5243 "memchr",5243 "memchr",5244]5244]52455246[[package]]5247name = "object"5248version = "0.27.1"5249source = "registry+https://github.com/rust-lang/crates.io-index"5250checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"5251dependencies = [5252 "memchr",5253]524552545246[[package]]5255[[package]]5247name = "once_cell"5256name = "once_cell"6137 "sp-std",6146 "sp-std",6138]6147]61396140[[package]]6141name = "pallet-scheduler"6142version = "3.0.0"6143dependencies = [6144 "frame-benchmarking",6145 "frame-support",6146 "frame-system",6147 "log",6148 "parity-scale-codec",6149 "scale-info",6150 "serde",6151 "sp-core",6152 "sp-io",6153 "sp-runtime",6154 "sp-std",6155 "substrate-test-utils",6156 "up-sponsorship",6157]615861486159[[package]]6149[[package]]6160name = "pallet-scheduler"6150name = "pallet-scheduler"6379 "sp-std",6369 "sp-std",6380]6370]63716372[[package]]6373name = "pallet-unq-scheduler"6374version = "3.0.0"6375dependencies = [6376 "frame-benchmarking",6377 "frame-support",6378 "frame-system",6379 "log",6380 "parity-scale-codec",6381 "scale-info",6382 "serde",6383 "sp-core",6384 "sp-io",6385 "sp-runtime",6386 "sp-std",6387 "substrate-test-utils",6388 "up-sponsorship",6389]638163906382[[package]]6391[[package]]6383name = "pallet-utility"6392name = "pallet-utility"679568046796[[package]]6805[[package]]6797name = "pkg-config"6806name = "pkg-config"6798version = "0.3.20"6807version = "0.3.22"6799source = "registry+https://github.com/rust-lang/crates.io-index"6808source = "registry+https://github.com/rust-lang/crates.io-index"6800checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb"6809checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"680168106802[[package]]6811[[package]]6803name = "platforms"6812name = "platforms"7584 "pallet-offences",7593 "pallet-offences",7585 "pallet-offences-benchmarking",7594 "pallet-offences-benchmarking",7586 "pallet-proxy",7595 "pallet-proxy",7587 "pallet-scheduler 4.0.0-dev",7596 "pallet-scheduler",7588 "pallet-session",7597 "pallet-session",7589 "pallet-session-benchmarking",7598 "pallet-session-benchmarking",7590 "pallet-staking",7599 "pallet-staking",799180007992[[package]]8001[[package]]7993name = "ppv-lite86"8002name = "ppv-lite86"7994version = "0.2.14"8003version = "0.2.15"7995source = "registry+https://github.com/rust-lang/crates.io-index"8004source = "registry+https://github.com/rust-lang/crates.io-index"7996checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741"8005checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"799780067998[[package]]8007[[package]]7999name = "primitive-types"8008name = "primitive-types"100051001410006[[package]]10015[[package]]10007name = "signature"10016name = "signature"10008version = "1.3.1"10017version = "1.4.0"10009source = "registry+https://github.com/rust-lang/crates.io-index"10018source = "registry+https://github.com/rust-lang/crates.io-index"10010checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335"10019checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"100111002010012[[package]]10021[[package]]10013name = "simba"10022name = "simba"11954 "lazy_static",11963 "lazy_static",11955 "libc",11964 "libc",11956 "log",11965 "log",11957 "object",11966 "object 0.26.2",11958 "paste",11967 "paste",11959 "psm",11968 "psm",11960 "rayon",11969 "rayon",12006 "cranelift-wasm",12015 "cranelift-wasm",12007 "gimli",12016 "gimli",12008 "more-asserts",12017 "more-asserts",12009 "object",12018 "object 0.26.2",12010 "target-lexicon",12019 "target-lexicon",12011 "thiserror",12020 "thiserror",12012 "wasmparser",12021 "wasmparser",12026 "indexmap",12035 "indexmap",12027 "log",12036 "log",12028 "more-asserts",12037 "more-asserts",12029 "object",12038 "object 0.26.2",12030 "serde",12039 "serde",12031 "target-lexicon",12040 "target-lexicon",12032 "thiserror",12041 "thiserror",12048 "libc",12057 "libc",12049 "log",12058 "log",12050 "more-asserts",12059 "more-asserts",12051 "object",12060 "object 0.26.2",12052 "region",12061 "region",12053 "serde",12062 "serde",12054 "target-lexicon",12063 "target-lexicon",12171 "pallet-offences-benchmarking",12180 "pallet-offences-benchmarking",12172 "pallet-proxy",12181 "pallet-proxy",12173 "pallet-recovery",12182 "pallet-recovery",12174 "pallet-scheduler 4.0.0-dev",12183 "pallet-scheduler",12175 "pallet-session",12184 "pallet-session",12176 "pallet-session-benchmarking",12185 "pallet-session-benchmarking",12177 "pallet-society",12186 "pallet-society",Dockerfile-parachaindiffbeforeafterboth1# ===== BUILD ======1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.0.0 as builder2FROM phusion/baseimage:focal-1.0.0 as rust-builder3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"44567ARG RUST_TOOLCHAIN=nightly-2021-06-285ARG RUST_TOOLCHAIN=nightly-2021-06-288#ARG RUST_C=1.55.0-nightly6#ARG RUST_C=1.55.0-nightly9ARG POLKA_VERSION=v0.9.127ARG POLKA_VERSION=v0.9.1224#RUN echo $POLKA_VERSION22#RUN echo $POLKA_VERSION25#RUN echo $NFT_BRANCH23#RUN echo $NFT_BRANCH262425ENV CARGO_HOME="/cargo-home"26ENV PATH="/cargo-home/bin:$PATH"272728RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none282929ARG PROFILE=release3031RUN apt-get update && \30RUN apt-get update && \32 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \31 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \33 apt-get install -y cmake pkg-config libssl-dev git clang32 apt-get install -y cmake pkg-config libssl-dev git clang343335# Get project and run it34RUN rustup toolchain uninstall $(rustup toolchain list) && \35 rustup toolchain install $RUST_TOOLCHAIN && \36 rustup default $RUST_TOOLCHAIN && \37 rustup target list --installed && \38 rustup show39RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN364037#RUN git clone -b $NFT_BRANCH https://$USER:$PASS@github.com/UniqueNetwork/unique-chain.git /nft_parachain41RUN cargo install cargo-chef38423940RUN mkdir nft_parachain43RUN mkdir nft_parachain41WORKDIR /nft_parachain44WORKDIR /nft_parachain4546# ===== Chef =====47FROM rust-builder as chef4842COPY . .49COPY . .50RUN cargo chef prepare --recipe-path recipe.json435152# ===== BUILD ======53FROM rust-builder as builder445445RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y55RUN mkdir nft_parachain46RUN export PATH="/cargo-home/bin:$PATH" && \56WORKDIR /nft_parachain47 export CARGO_HOME="/cargo-home" && \48 cargo fetch495750RUN export PATH="/cargo-home/bin:$PATH" && \58COPY --from=chef /nft_parachain/recipe.json recipe.json51 export CARGO_HOME="/cargo-home" && \59ARG PROFILE=release52 rustup toolchain uninstall $(rustup toolchain list) && \60RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json53 rustup toolchain install $RUST_TOOLCHAIN && \54# rustup toolchain install $RUST_C && \55 rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN && \56 rustup default $RUST_TOOLCHAIN && \57 rustup target list --installed && \58 rustup show596160RUN export PATH="/cargo-home/bin:$PATH" && \62COPY . .61 export CARGO_HOME="/cargo-home" && \62 cargo build "--$PROFILE"63RUN cargo build "--$PROFILE"63 # && \64 # && \64 # cargo test65 # cargo test656667# ===== BUILD POLKADOT =====68FROM rust-builder as builder-polkadot666970RUN mkdir nft_parachain71WORKDIR /nft_parachain677268RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \73RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \69 cd polkadot && \74 cd polkadot && \70 git tag -n && \75 git tag -n && \71 export PATH="/cargo-home/bin:$PATH" && \72 export CARGO_HOME="/cargo-home" && \73 cargo build --release76 cargo build --release747775# ===== RUN ======78# ===== RUN ======788179ARG PROFILE=release82ARG PROFILE=release808381COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/82COPY --from=builder /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/8384RUN apt-get update && \85 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \86 apt-get install -y cmake pkg-config libssl-dev git clang8788RUN git clone https://github.com/paritytech/polkadot-launch.git8990RUN apt-get -y update && \84RUN apt-get -y update && \91 apt-get -y upgrade && \85 apt-get -y upgrade && \92 apt-get -y install curl && \86 apt-get -y install curl git && \93 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \87 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \94 export NVM_DIR="$HOME/.nvm" && \88 export NVM_DIR="$HOME/.nvm" && \95 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \89 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96 nvm install v15.5.0 && \90 nvm install v15.5.0 && \97 nvm use v15.5.091 nvm use v15.5.098# npm install --save @polkadot/api && \99# npm install --save-dev mochawesome1009293RUN git clone https://github.com/paritytech/polkadot-launch.git1019495RUN export NVM_DIR="$HOME/.nvm" && \96 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \97 cd /polkadot-launch && \98 npm install --global yarn && \99 yarn100101COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/102COPY --from=builder-polkadot /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/103102CMD export NVM_DIR="$HOME/.nvm" && \104CMD export NVM_DIR="$HOME/.nvm" && \103 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \105 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \104 cd /polkadot-launch && \106 cd /polkadot-launch && \105 npm install --global yarn && \106 yarn install && \107 yarn build && \108 yarn start launch-config.json107 yarn start launch-config.json109108Dockerfile-testsdiffbeforeafterbothno changes
README.mddiffbeforeafterboth302```302```303// use pallet_contracts::weights::WeightInfo;303// use pallet_contracts::weights::WeightInfo;304...304...305// use pallet_contracts::chain_extension::UncheckedFrom;306...307// pub use pallet_timestamp::Call as TimestampCall;305// pub use pallet_timestamp::Call as TimestampCall;308...306...309// mod chain_extension;307// mod chain_extension;docker-compose-tests-parachain.ymldiffbeforeafterboth31 container_name: integration_tests31 container_name: integration_tests32 image: integration_tests32 image: integration_tests33 build:33 build:34 context: ./34 context: tests/35 dockerfile: Dockerfile-tests35 dockerfile: Dockerfile-tests36 environment:37 RPC_URL: http://blockchain_nodes:9934/36 volumes:38 volumes:37 - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts39 - ./tests/src/config_docker.ts:/nft_parachain/src/config.ts38 - /home/ubuntu/mochawesome-report:/nft_parachain/tests/mochawesome-report40 - /home/ubuntu/mochawesome-report:/nft_parachain/mochawesome-report41 - ./runtime_types.json:/runtime_types.json39# command: bash -c 'while true; do sleep 20; df -h; done'42# command: bash -c 'while true; do sleep 20; df -h; done'40 networks:43 networks:41 - node_test_network44 - node_test_networkpallets/scheduler/Cargo.tomldiffbeforeafterboth1[package]1[package]2name = "pallet-scheduler"2name = "pallet-unq-scheduler"3version = "3.0.0"3version = "3.0.0"4authors = ["Parity Technologies <admin@parity.io>"]4authors = ["Parity Technologies <admin@parity.io>"]5edition = "2018"5edition = "2018"runtime/Cargo.tomldiffbeforeafterboth69 'serde',69 'serde',70 'pallet-inflation/std',70 'pallet-inflation/std',71 'pallet-nft/std',71 'pallet-nft/std',72 'pallet-scheduler/std',72 'pallet-unq-scheduler/std',73 'pallet-nft-charge-transaction/std',73 'pallet-nft-charge-transaction/std',74 'pallet-nft-transaction-payment/std',74 'pallet-nft-transaction-payment/std',75 'nft-data-structs/std',75 'nft-data-structs/std',360pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }360pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }361pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }361pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }362nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }362nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }363pallet-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }363pallet-unq-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }364# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }364# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }365pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }365pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }366pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }366pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }runtime/src/lib.rsdiffbeforeafterboth764 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,764 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,765);765);766766767impl pallet_scheduler::Config for Runtime {767impl pallet_unq_scheduler::Config for Runtime {768 type Event = Event;768 type Event = Event;769 type Origin = Origin;769 type Origin = Origin;770 type PalletsOrigin = OriginCaller;770 type PalletsOrigin = OriginCaller;837 // Unique Pallets837 // Unique Pallets838 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,838 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,839 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,839 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,840 Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 62,840 Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,841 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,841 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,842 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,842 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,843 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,843 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,tests/.dockerignorediffbeforeafterbothno changes
tests/Dockerfile-testsdiffbeforeafterbothno changes
tests/package-lock.jsondiffbeforeafterbothno changes
tests/scripts/wait_for_first_block.shdiffbeforeafterbothno changes
tests/src/config_docker.tsdiffbeforeafterboth6import process from 'process';6import process from 'process';778const config = {8const config = {9 substrateUrl: process.env.substrateUrl || 'ws://172.17.0.1:9944',9 substrateUrl: process.env.substrateUrl || 'ws://blockchain_nodes:9944',10 frontierUrl: process.env.frontierUrl || 'http://172.17.0.1:9933',10 frontierUrl: process.env.frontierUrl || 'http://blockchain_nodes:9933',11};11};121213export default config;13export default config;