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.j2diffbeforeafterboth1{2 "relaychain": {3 "bin": "/polkadot/target/release/polkadot",4 "chain": "westend-local",5 "nodes": [6 {7 "name": "alice",8 "wsPort": 9844,9 "rpcPort": 9843,10 "port": 30444,11 "flags": [12 "-lparachain::candidate_validation=debug",13 "-lxcm=trace",14 "--rpc-cors=all",15 "--unsafe-rpc-external",16 "--unsafe-ws-external"17 ]18 },19 {20 "name": "bob",21 "wsPort": 9855,22 "rpcPort": 9854,23 "port": 30555,24 "flags": [25 "-lparachain::candidate_validation=debug",26 "-lxcm=trace",27 "--rpc-cors=all",28 "--unsafe-rpc-external",29 "--unsafe-ws-external"30 ]31 },32 {33 "name": "charlie",34 "wsPort": 9866,35 "rpcPort": 9865,36 "port": 30666,37 "flags": [38 "-lparachain::candidate_validation=debug",39 "-lxcm=trace",40 "--rpc-cors=all",41 "--unsafe-rpc-external",42 "--unsafe-ws-external"43 ]44 },45 {46 "name": "dave",47 "wsPort": 9877,48 "rpcPort": 9876,49 "port": 30777,50 "flags": [51 "-lparachain::candidate_validation=debug",52 "-lxcm=trace",53 "--rpc-cors=all",54 "--unsafe-rpc-external",55 "--unsafe-ws-external"56 ]57 },58 {59 "name": "eve",60 "wsPort": 9888,61 "rpcPort": 9887,62 "port": 30888,63 "flags": [64 "-lparachain::candidate_validation=debug",65 "-lxcm=trace",66 "--rpc-cors=all",67 "--unsafe-rpc-external",68 "--unsafe-ws-external"69 ]70 }71 ],72 "genesis": {73 "runtime": {74 "runtime_genesis_config": {75 "parachainsConfiguration": {76 "config": {77 "validation_upgrade_frequency": 1,78 "validation_upgrade_delay": 179 }80 }81 }82 }83 }84 },85 "parachains": [86 {87 "bin": "/unique-chain/current/release/unique-collator",88 "id": "1000",89 "balance": "1000000000000000000000000",90 "chainRawInitializer": [91 "chainql",92 "--ext-str=FORK_FROM",93 "--tla-code=rawSpec=import '${rawSpec}'",94 "--tla-code=forkFrom=std.extVar('FORK_FROM')",95 "fork.jsonnet"96 ],97 "nodes": [98 {99 "port": 31200,100 "wsPort": 9944,101 "rpcPort": 9933,102 "name": "alice",103 "flags": [104 "--rpc-cors=all",105 "--unsafe-rpc-external",106 "--unsafe-ws-external",107 "-lxcm=trace"108 ]109 },110 {111 "port": 31201,112 "wsPort": 9945,113 "rpcPort": 9934,114 "name": "bob",115 "flags": [116 "--rpc-cors=all",117 "--unsafe-rpc-external",118 "--unsafe-ws-external",119 "-lxcm=trace"120 ]121 }122 ]123 }124 ],125 "simpleParachains": [],126 "hrmpChannels": [],127 "finalization": false128}1{2 "relaychain": {3 "bin": "/polkadot/target/release/polkadot",4 "chain": "westend-local",5 "nodes": [6 {7 "name": "alice",8 "wsPort": 9844,9 "rpcPort": 9843,10 "port": 30444,11 "flags": [12 "-lparachain::candidate_validation=debug",13 "-lxcm=trace",14 "--rpc-cors=all",15 "--unsafe-rpc-external",16 "--unsafe-ws-external"17 ]18 },19 {20 "name": "bob",21 "wsPort": 9855,22 "rpcPort": 9854,23 "port": 30555,24 "flags": [25 "-lparachain::candidate_validation=debug",26 "-lxcm=trace",27 "--rpc-cors=all",28 "--unsafe-rpc-external",29 "--unsafe-ws-external"30 ]31 },32 {33 "name": "charlie",34 "wsPort": 9866,35 "rpcPort": 9865,36 "port": 30666,37 "flags": [38 "-lparachain::candidate_validation=debug",39 "-lxcm=trace",40 "--rpc-cors=all",41 "--unsafe-rpc-external",42 "--unsafe-ws-external"43 ]44 },45 {46 "name": "dave",47 "wsPort": 9877,48 "rpcPort": 9876,49 "port": 30777,50 "flags": [51 "-lparachain::candidate_validation=debug",52 "-lxcm=trace",53 "--rpc-cors=all",54 "--unsafe-rpc-external",55 "--unsafe-ws-external"56 ]57 },58 {59 "name": "eve",60 "wsPort": 9888,61 "rpcPort": 9887,62 "port": 30888,63 "flags": [64 "-lparachain::candidate_validation=debug",65 "-lxcm=trace",66 "--rpc-cors=all",67 "--unsafe-rpc-external",68 "--unsafe-ws-external"69 ]70 }71 ],72 "genesis": {73 "runtime": {74 "runtime_genesis_config": {75 "parachainsConfiguration": {76 "config": {77 "validation_upgrade_frequency": 1,78 "validation_upgrade_delay": 179 }80 }81 }82 }83 }84 },85 "parachains": [86 {87 "bin": "/unique-chain/target/release/unique-collator",88 "id": "1000",89 "balance": "1000000000000000000000000",90 "chainRawInitializer": [91 "chainql",92 "--ext-str=FORK_FROM",93 "--tla-code=rawSpec=import '${rawSpec}'",94 "--tla-code=forkFrom=std.extVar('FORK_FROM')",95 "fork.jsonnet"96 ],97 "nodes": [98 {99 "port": 31200,100 "wsPort": 9944,101 "rpcPort": 9933,102 "name": "alice",103 "flags": [104 "--rpc-cors=all",105 "--unsafe-rpc-external",106 "--unsafe-ws-external",107 "-lxcm=trace"108 ]109 },110 {111 "port": 31201,112 "wsPort": 9945,113 "rpcPort": 9934,114 "name": "bob",115 "flags": [116 "--rpc-cors=all",117 "--unsafe-rpc-external",118 "--unsafe-ws-external",119 "-lxcm=trace"120 ]121 }122 ]123 }124 ],125 "simpleParachains": [],126 "hrmpChannels": [],127 "finalization": false128}.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.
.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
+});