difftreelog
Merge branch 'develop' into CI-43-try-runtime
in: master
11 files changed
.docker/Dockerfile-parachaindiffbeforeafterboth--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -7,7 +7,8 @@
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
-
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get update && \
apt-get install -y curl cmake pkg-config libssl-dev git clang && \
@@ -35,10 +36,10 @@
ARG REPO_URL=
ARG BRANCH=
-RUN mkdir /unique_parachain
+
WORKDIR /unique_parachain
-RUN git clone $REPO_URL -b $BRANCH && \
+RUN git clone $REPO_URL -b $BRANCH . && \
cargo build --features=$FEATURE --$PROFILE
# ===== BUILD POLKADOT =====
@@ -47,7 +48,7 @@
ARG POLKADOT_BUILD_BRANCH=
ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-RUN mkdir /unique_parachain
+
WORKDIR /unique_parachain
RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
.docker/forking/launch-config-fork.j2diffbeforeafterboth--- a/.docker/forking/launch-config-fork.j2
+++ b/.docker/forking/launch-config-fork.j2
@@ -84,7 +84,7 @@
},
"parachains": [
{
- "bin": "/unique-chain/current/release/unique-collator",
+ "bin": "/unique-chain/target/release/unique-collator",
"id": "1000",
"balance": "1000000000000000000000000",
"chainRawInitializer": [
.github/workflows/build-test-master.ymldiffbeforeafterboth1name: MASTER - Build & Test23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - master9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request13 - ready_for_review1415 # Allows you to run this workflow manually from the Actions tab16 workflow_dispatch:1718#Define Workflow variables19env:20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:2425 master-build-and-test:26 # The type of runner that the job will run on27 runs-on: self-hosted-ci282930 name: Build Container, Spin it Up an test3132 continue-on-error: true #Do not stop testing of matrix runs failed.3334 strategy:35 matrix:36 include:37 - network: "Opal"38 features: "opal-runtime"39 - network: "Quartz"40 features: "quartz-runtime"41 - network: "Unique"42 features: "unique-runtime"4344 steps:45 - name: Skip if pull request is in Draft46 # `if: github.event.pull_request.draft == true` should be kept here, at47 # the step level, rather than at the job level. The latter is not48 # recommended because when the PR is moved from "Draft" to "Ready to49 # review" the workflow will immediately be passing (since it was skipped),50 # even though it hasn't actually ran, since it takes a few seconds for51 # the workflow to start. This is also disclosed in:52 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1753 # That scenario would open an opportunity for the check to be bypassed:54 # 1. Get your PR approved55 # 2. Move it to Draft56 # 3. Push whatever commits you want57 # 4. Move it to "Ready for review"; now the workflow is passing (it was58 # skipped) and "Check reviews" is also passing (it won't be updated59 # until the workflow is finished)60 if: github.event.pull_request.draft == true61 run: exit 16263 - name: Clean Workspace64 uses: AutoModality/action-clean@v1.1.06566 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it67 - uses: actions/checkout@v368 with:69 ref: ${{ github.head_ref }}7071 - name: Read .env file72 uses: xom9ikk/dotenv@v1.0.27374 - name: Generate ENV related extend file for docker-compose75 uses: cuchi/jinja2-action@v1.2.076 with:77 template: .docker/docker-compose.tmp-master.j278 output_file: .docker/docker-compose.${{ matrix.network }}.yml79 variables: |80 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git81 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}82 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}83 FEATURE=${{ matrix.features }}84 BRANCH=${{ github.head_ref }}8586 - name: Show build configuration87 run: cat .docker/docker-compose.${{ matrix.network }}.yml8889 - name: Build the stack90 run: docker-compose -f ".docker/docker-compose-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build9192 - uses: actions/setup-node@v393 with:94 node-version: 169596 - name: Run tests97 run: |98 cd tests99 yarn install100 yarn add mochawesome101 echo "Ready to start tests"102 node scripts/readyness.js103 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}104 env:105 RPC_URL: http://127.0.0.1:9933/106107 - name: Test Report108 uses: phoenix-actions/test-reporting@v8109 id: test-report110 if: success() || failure() # run this step even if previous step failed111 with:112 name: Tests ${{ matrix.network }} # Name of the check run which will be created113 path: tests/mochawesome-report/test-*.json # Path to test results114 reporter: mochawesome-json115 fail-on-error: 'false'116117 - name: Read output variables118 run: |119 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"120121 - name: Stop running containers122 if: always() # run this step always123 run: docker-compose -f ".docker/docker-compose-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down1name: MASTER - Build & Test23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - master9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request13 - ready_for_review1415 # Allows you to run this workflow manually from the Actions tab16 workflow_dispatch:1718#Define Workflow variables19env:20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:2425 master-build-and-test:26 # The type of runner that the job will run on27 runs-on: self-hosted-ci282930 name: ${{ matrix.network }} - Build and Test3132 continue-on-error: true #Do not stop testing of matrix runs failed.3334 strategy:35 matrix:36 include:37 - network: "Opal"38 features: "opal-runtime"39 - network: "Quartz"40 features: "quartz-runtime"41 - network: "Unique"42 features: "unique-runtime"4344 steps:45 - name: Skip if pull request is in Draft46 # `if: github.event.pull_request.draft == true` should be kept here, at47 # the step level, rather than at the job level. The latter is not48 # recommended because when the PR is moved from "Draft" to "Ready to49 # review" the workflow will immediately be passing (since it was skipped),50 # even though it hasn't actually ran, since it takes a few seconds for51 # the workflow to start. This is also disclosed in:52 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1753 # That scenario would open an opportunity for the check to be bypassed:54 # 1. Get your PR approved55 # 2. Move it to Draft56 # 3. Push whatever commits you want57 # 4. Move it to "Ready for review"; now the workflow is passing (it was58 # skipped) and "Check reviews" is also passing (it won't be updated59 # until the workflow is finished)60 if: github.event.pull_request.draft == true61 run: exit 16263 - name: Clean Workspace64 uses: AutoModality/action-clean@v1.1.06566 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it67 - uses: actions/checkout@v368 with:69 ref: ${{ github.head_ref }}7071 - name: Read .env file72 uses: xom9ikk/dotenv@v1.0.27374 - name: Generate ENV related extend file for docker-compose75 uses: cuchi/jinja2-action@v1.2.076 with:77 template: .docker/docker-compose.tmp-master.j278 output_file: .docker/docker-compose.${{ matrix.network }}.yml79 variables: |80 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git81 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}82 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}83 FEATURE=${{ matrix.features }}84 BRANCH=${{ github.head_ref }}8586 - name: Show build configuration87 run: cat .docker/docker-compose.${{ matrix.network }}.yml8889 - name: Build the stack90 run: docker-compose -f ".docker/docker-compose-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build9192 - uses: actions/setup-node@v393 with:94 node-version: 169596 - name: Run tests97 run: |98 cd tests99 yarn install100 yarn add mochawesome101 echo "Ready to start tests"102 node scripts/readyness.js103 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}104 env:105 RPC_URL: http://127.0.0.1:9933/106107 - name: Test Report108 uses: phoenix-actions/test-reporting@v8109 id: test-report110 if: success() || failure() # run this step even if previous step failed111 with:112 name: Tests ${{ matrix.network }} # Name of the check run which will be created113 path: tests/mochawesome-report/test-*.json # Path to test results114 reporter: mochawesome-json115 fail-on-error: 'false'116117 - name: Read output variables118 run: |119 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"120121 - name: Stop running containers122 if: always() # run this step always123 run: docker-compose -f ".docker/docker-compose-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down.github/workflows/fork-update-withdata.ymldiffbeforeafterboth--- a/.github/workflows/fork-update-withdata.yml
+++ b/.github/workflows/fork-update-withdata.yml
@@ -26,7 +26,7 @@
# The type of runner that the job will run on
runs-on: self-hosted-ci
- name: Build Container, Spin it Up an test
+ name: ${{ matrix.network }} Fork Parachain with data
continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.
.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -58,7 +58,7 @@
# The type of runner that the job will run on
runs-on: self-hosted-ci
- name: Build Container, Spin it Up an test
+ name: ${{ matrix.network }} - Forkless Parachain Upgrade NO data
continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.
@@ -175,7 +175,7 @@
fi
done
echo "Halting script"
- exit 1
+ exit 0
shell: bash
- name: Collect Docker Logs
.github/workflows/node_build_test.ymldiffbeforeafterboth--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -33,11 +33,11 @@
matrix:
include:
- network: "Opal"
- features: " "
+ features: "opal-runtime"
- network: "Quartz"
- features: "--features=quartz-runtime"
+ features: "quartz-runtime"
- network: "Unique"
- features: "--features=unique-runtime"
+ features: "unique-runtime"
steps:
- name: Skip if pull request is in Draft
crates/struct-versioning/README.mddiffbeforeafterboth--- /dev/null
+++ b/crates/struct-versioning/README.md
@@ -0,0 +1,62 @@
+# struct-versioning
+
+The crate contains procedural macros for versioning data structures.
+Macros [`versioned`] generate versioned variants of a struct.
+
+Example:
+```
+# use struct_versioning::versioned;
+#[versioned(version = 5, first_version = 2)]
+struct Example {}
+
+// versioned macro will generate suffixed versions of example struct,
+// starting from `Version{first_version or 1}` to `Version{version}` inclusive
+let _ver2 = ExampleVersion2 {};
+let _ver3 = ExampleVersion3 {};
+let _ver4 = ExampleVersion4 {};
+let _ver5 = ExampleVersion5 {};
+
+// last version will also be aliased with original struct name
+let _orig: Example = ExampleVersion5 {};
+
+#[versioned(version = 2, upper)]
+#[derive(PartialEq, Debug)]
+struct Upper {
+ #[version(..2)]
+ removed: u32,
+ #[version(2.., upper(10))]
+ added: u32,
+
+ #[version(..2)]
+ retyped: u32,
+ #[version(2.., upper(retyped as u64))]
+ retyped: u64,
+}
+
+// #[version] attribute on field allows to specify, in which versions of structs this field should present
+// versions here works as standard rust ranges, start is inclusive, end is exclusive
+let _up1 = UpperVersion1 {removed: 1, retyped: 0};
+let _up2 = UpperVersion2 {added: 1, retyped: 0};
+
+// and upper() allows to specify, which value should be assigned to this field in `From<OldVersion>` impl
+assert_eq!(
+ UpperVersion2::from(UpperVersion1 {removed: 0, retyped: 6}),
+ UpperVersion2 {added: 10, retyped: 6},
+);
+```
+
+In this case, the upgrade is described in `on_runtime_upgrade` using the `translate_values` substrate feature
+
+```ignore
+#[pallet::hooks]
+impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+ fn on_runtime_upgrade() -> Weight {
+ if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {
+ <TokenData<T>>::translate_values::<ItemDataVersion1, _>(|v| {
+ Some(<ItemDataVersion2>::from(v))
+ })
+ }
+ 0
+ }
+}
+```
crates/struct-versioning/src/lib.rsdiffbeforeafterboth--- a/crates/struct-versioning/src/lib.rs
+++ b/crates/struct-versioning/src/lib.rs
@@ -1,3 +1,21 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+#![doc = include_str!("../README.md")]
+
use proc_macro::TokenStream;
use quote::format_ident;
use syn::{
tests/src/eth/fractionalizer/fractionalizer.test.tsdiffbeforeafterboth--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -20,7 +20,7 @@
import {evmToAddress} from '@polkadot/util-crypto';
import {readFile} from 'fs/promises';
import {executeTransaction, submitTransactionAsync} from '../../substrate/substrate-api';
-import {getCreateCollectionResult, getCreateItemResult, UNIQUE} from '../../util/helpers';
+import {getCreateCollectionResult, getCreateItemResult, UNIQUE, requirePallets, Pallets} from '../../util/helpers';
import {collectionIdToAddress, CompiledContract, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, GAS_ARGS, itWeb3, tokenIdFromAddress, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} from '../util/helpers';
import {Contract} from 'web3-eth-contract';
import * as solc from 'solc';
@@ -116,6 +116,10 @@
}
describe('Fractionalizer contract usage', () => {
+ before(async function() {
+ await requirePallets(this, [Pallets.ReFungible]);
+ });
+
itWeb3('Set RFT collection', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const fractionalizer = await deployFractionalizer(web3, owner);
@@ -224,6 +228,10 @@
describe('Negative Integration Tests for fractionalizer', () => {
+ before(async function() {
+ await requirePallets(this, [Pallets.ReFungible]);
+ });
+
itWeb3('call setRFTCollection twice', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);
@@ -467,4 +475,4 @@
await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100n).call())
.to.be.rejectedWith(/TransferNotAllowed$/g);
});
-});
\ No newline at end of file
+});
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -651,6 +651,10 @@
});
describe('ERC 1633 implementation', () => {
+ before(async function() {
+ await requirePallets(this, [Pallets.ReFungible]);
+ });
+
itWeb3('Parent NFT token address and id', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
tests/src/evmCoder.test.tsdiffbeforeafterboth--- a/tests/src/evmCoder.test.ts
+++ b/tests/src/evmCoder.test.ts
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
import Web3 from 'web3';
-import {createEthAccountWithBalance, createRefungibleCollection, GAS_ARGS, itWeb3} from './eth/util/helpers';
+import {createEthAccountWithBalance, createNonfungibleCollection, GAS_ARGS, itWeb3} from './eth/util/helpers';
import * as solc from 'solc';
import chai from 'chai';
@@ -92,7 +92,7 @@
describe('Evm Coder tests', () => {
itWeb3('Call non-existing function', async ({api, web3, privateKeyWrapper}) => {
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);
+ const {collectionIdAddress} = await createNonfungibleCollection(api, web3, owner);
const contract = await deployTestContract(web3, owner, collectionIdAddress, '0x1bfed5D614b886b9Ab2eA4CBAc22A96B7EC29c9c');
const testContract = await deployTestContract(web3, owner, collectionIdAddress, contract.options.address);
{
@@ -114,4 +114,4 @@
.to.be.rejectedWith(/unrecognized selector: 0xd9f02b36$/g);
}
});
-});
\ No newline at end of file
+});