git.delta.rocks / unique-network / refs/commits / 587c55e5ec2a

difftreelog

Merge branch 'develop' into CI-43-try-runtime

Alexander Aksenov2022-08-16parents: #258c7f4 #d75b746.patch.diff
in: master

11 files changed

modified.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 && \
modified.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": [
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -27,7 +27,7 @@
     runs-on: self-hosted-ci
 
 
-    name: Build Container, Spin it Up an test
+    name: ${{ matrix.network }} - Build and Test
 
     continue-on-error: true         #Do not stop testing of matrix runs failed.
modified.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.
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
58    # The type of runner that the job will run on58    # The type of runner that the job will run on
59    runs-on: self-hosted-ci59    runs-on: self-hosted-ci
6060
61    name: Build Container, Spin it Up an test61    name: ${{ matrix.network }} - Forkless Parachain Upgrade NO data
6262
63    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.63    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.
6464
134134
135      - name: Check if docker logs consist logs related to Runtime Upgrade testing.135      - name: Check if docker logs consist logs related to Runtime Upgrade testing.
136        if: success()136        if: success()
137        run: |137        run: |
138          counter=160138          counter=160
139          function check_container_status {139          function check_container_status {
140                docker inspect -f {{.State.Running}} node-parachain140                docker inspect -f {{.State.Running}} node-parachain
141          }141          }
142          function do_docker_logs {142          function do_docker_logs {
143                docker logs --details node-parachain  2>&1143                docker logs --details node-parachain  2>&1
144          }144          }
145          function is_started {145          function is_started {
146                if [ "$(check_container_status)" == "true" ]; then146                if [ "$(check_container_status)" == "true" ]; then
147                    echo "Container: node-parachain RUNNING";147                    echo "Container: node-parachain RUNNING";
148                    echo "Check Docker logs"148                    echo "Check Docker logs"
149                    DOCKER_LOGS=$(do_docker_logs)149                    DOCKER_LOGS=$(do_docker_logs)
150                    if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then150                    if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then
151                        echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"151                        echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"
152                        return 0152                        return 0
153                        exit 1153                        exit 1
154                    else 154                    else 
155                        echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸 - Not found in logs output."155                        echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸 - Not found in logs output."
156                        return 1156                        return 1
157                        exit 1157                        exit 1
158                    fi158                    fi
159                else159                else
160                    echo "Container node-parachain not RUNNING"160                    echo "Container node-parachain not RUNNING"
161                    echo "Halting all future checks"161                    echo "Halting all future checks"
162                    exit 1162                    exit 1
163                fi163                fi
164                exit 0164                exit 0
165          }165          }
166          while ! is_started; do166          while ! is_started; do
167                echo "Waiting for special message in log files "167                echo "Waiting for special message in log files "
168                sleep 30s168                sleep 30s
169                counter=$(( $counter - 1 ))169                counter=$(( $counter - 1 ))
170                echo "Counter: $counter"170                echo "Counter: $counter"
171                if [ "$counter" -gt "0" ]; then171                if [ "$counter" -gt "0" ]; then
172                    continue172                    continue
173                else173                else
174                    break174                    break
175                fi175                fi
176                done176                done
177           echo "Halting script"177           echo "Halting script"
178           exit 1178           exit 0
179        shell: bash179        shell: bash
180180
181      - name: Collect Docker Logs181      - name: Collect Docker Logs
modified.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
addedcrates/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
+    }
+}
+```
modifiedcrates/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::{
modifiedtests/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
+});
modifiedtests/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);
modifiedtests/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
+});