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.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.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.161718import Web3 from 'web3';19import {ApiPromise} from '@polkadot/api';20import {evmToAddress} from '@polkadot/util-crypto';21import {readFile} from 'fs/promises';22import {executeTransaction, submitTransactionAsync} from '../../substrate/substrate-api';23import {getCreateCollectionResult, getCreateItemResult, UNIQUE, requirePallets, Pallets} from '../../util/helpers';24import {collectionIdToAddress, CompiledContract, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, GAS_ARGS, itWeb3, tokenIdFromAddress, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} from '../util/helpers';25import {Contract} from 'web3-eth-contract';26import * as solc from 'solc';2728import chai from 'chai';29import chaiLike from 'chai-like';30import {IKeyringPair} from '@polkadot/types/types';31chai.use(chaiLike);32const expect = chai.expect;33let fractionalizer: CompiledContract;3435async function compileFractionalizer() {36 if (!fractionalizer) {37 const input = {38 language: 'Solidity',39 sources: {40 ['Fractionalizer.sol']: {41 content: (await readFile(`${__dirname}/Fractionalizer.sol`)).toString(),42 },43 },44 settings: {45 outputSelection: {46 '*': {47 '*': ['*'],48 },49 },50 },51 };52 const json = JSON.parse(solc.compile(JSON.stringify(input), {import: await findImports()}));53 const out = json.contracts['Fractionalizer.sol']['Fractionalizer'];5455 fractionalizer = {56 abi: out.abi,57 object: '0x' + out.evm.bytecode.object,58 };59 }60 return fractionalizer;61}6263async function findImports() {64 const collectionHelpers = (await readFile(`${__dirname}/../api/CollectionHelpers.sol`)).toString();65 const contractHelpers = (await readFile(`${__dirname}/../api/ContractHelpers.sol`)).toString();66 const uniqueRefungibleToken = (await readFile(`${__dirname}/../api/UniqueRefungibleToken.sol`)).toString();67 const uniqueRefungible = (await readFile(`${__dirname}/../api/UniqueRefungible.sol`)).toString();68 const uniqueNFT = (await readFile(`${__dirname}/../api/UniqueNFT.sol`)).toString();6970 return function(path: string) {71 switch (path) {72 case 'api/CollectionHelpers.sol': return {contents: `${collectionHelpers}`};73 case 'api/ContractHelpers.sol': return {contents: `${contractHelpers}`};74 case 'api/UniqueRefungibleToken.sol': return {contents: `${uniqueRefungibleToken}`};75 case 'api/UniqueRefungible.sol': return {contents: `${uniqueRefungible}`};76 case 'api/UniqueNFT.sol': return {contents: `${uniqueNFT}`};77 default: return {error: 'File not found'};78 }79 };80}8182async function deployFractionalizer(web3: Web3, owner: string) {83 const compiled = await compileFractionalizer();84 const fractionalizerContract = new web3.eth.Contract(compiled.abi, undefined, {85 data: compiled.object,86 from: owner,87 ...GAS_ARGS,88 });89 return await fractionalizerContract.deploy({data: compiled.object}).send({from: owner});90}9192async function initFractionalizer(api: ApiPromise, web3: Web3, privateKeyWrapper: (account: string) => IKeyringPair, owner: string) {93 const fractionalizer = await deployFractionalizer(web3, owner);94 const amount = 10n * UNIQUE;95 await web3.eth.sendTransaction({from: owner, to: fractionalizer.options.address, value: `${amount}`, ...GAS_ARGS});96 const result = await fractionalizer.methods.createAndSetRFTCollection('A', 'B', 'C').send();97 const rftCollectionAddress = result.events.RFTCollectionSet.returnValues._collection;98 return {fractionalizer, rftCollectionAddress};99}100101async function createRFTToken(api: ApiPromise, web3: Web3, owner: string, fractionalizer: Contract, amount: bigint) {102 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);103 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);104 const nftTokenId = await nftContract.methods.nextTokenId().call();105 await nftContract.methods.mint(owner, nftTokenId).send();106107 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();108 await nftContract.methods.approve(fractionalizer.options.address, nftTokenId).send();109 const result = await fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, amount).send();110 const {_collection, _tokenId, _rftToken} = result.events.Fractionalized.returnValues;111 return {112 nftCollectionAddress: _collection,113 nftTokenId: _tokenId,114 rftTokenAddress: _rftToken,115 };116}117118describe('Fractionalizer contract usage', () => {119 before(async function() {120 await requirePallets(this, [Pallets.ReFungible]);121 });122123 itWeb3('Set RFT collection', async ({api, web3, privateKeyWrapper}) => {124 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);125 const fractionalizer = await deployFractionalizer(web3, owner);126 const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);127 const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);128 await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();129 const result = await fractionalizer.methods.setRFTCollection(collectionIdAddress).send();130 expect(result.events).to.be.like({131 RFTCollectionSet: {132 returnValues: {133 _collection: collectionIdAddress,134 },135 },136 });137 });138139 itWeb3('Mint RFT collection', async ({api, web3, privateKeyWrapper}) => {140 const alice = privateKeyWrapper('//Alice');141 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);142 const fractionalizer = await deployFractionalizer(web3, owner);143 const tx = api.tx.balances.transfer(evmToAddress(fractionalizer.options.address), 10n * UNIQUE);144 await submitTransactionAsync(alice, tx);145146 const result = await fractionalizer.methods.createAndSetRFTCollection('A', 'B', 'C').send({from: owner});147 expect(result.events).to.be.like({148 RFTCollectionSet: {},149 });150 expect(result.events.RFTCollectionSet.returnValues._collection).to.be.ok;151 });152153 itWeb3('Set Allowlist', async ({api, web3, privateKeyWrapper}) => {154 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);155 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);156 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);157 const result1 = await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send({from: owner});158 expect(result1.events).to.be.like({159 AllowListSet: {160 returnValues: {161 _collection: nftCollectionAddress,162 _status: true,163 },164 },165 });166 const result2 = await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, false).send({from: owner});167 expect(result2.events).to.be.like({168 AllowListSet: {169 returnValues: {170 _collection: nftCollectionAddress,171 _status: false,172 },173 },174 });175 });176177 itWeb3('NFT to RFT', async ({api, web3, privateKeyWrapper}) => {178 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);179180 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);181 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);182 const nftTokenId = await nftContract.methods.nextTokenId().call();183 await nftContract.methods.mint(owner, nftTokenId).send();184185 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);186187 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();188 await nftContract.methods.approve(fractionalizer.options.address, nftTokenId).send();189 const result = await fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).send();190 expect(result.events).to.be.like({191 Fractionalized: {192 returnValues: {193 _collection: nftCollectionAddress,194 _tokenId: nftTokenId,195 _amount: '100',196 },197 },198 });199 const rftTokenAddress = result.events.Fractionalized.returnValues._rftToken;200 const rftTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);201 expect(await rftTokenContract.methods.balanceOf(owner).call()).to.equal('100');202 });203204 itWeb3('RFT to NFT', async ({api, web3, privateKeyWrapper}) => {205 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);206207 const {fractionalizer, rftCollectionAddress} = await initFractionalizer(api, web3, privateKeyWrapper, owner);208 const {rftTokenAddress, nftCollectionAddress, nftTokenId} = await createRFTToken(api, web3, owner, fractionalizer, 100n);209210 const {collectionId, tokenId} = tokenIdFromAddress(rftTokenAddress);211 const refungibleAddress = collectionIdToAddress(collectionId);212 expect(rftCollectionAddress).to.be.equal(refungibleAddress);213 const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);214 await refungibleTokenContract.methods.approve(fractionalizer.options.address, 100).send();215 const result = await fractionalizer.methods.rft2nft(refungibleAddress, tokenId).send();216 expect(result.events).to.be.like({217 Defractionalized: {218 returnValues: {219 _rftToken: rftTokenAddress,220 _nftCollection: nftCollectionAddress,221 _nftTokenId: nftTokenId,222 },223 },224 });225 });226});227228229230describe('Negative Integration Tests for fractionalizer', () => {231 before(async function() {232 await requirePallets(this, [Pallets.ReFungible]);233 });234235 itWeb3('call setRFTCollection twice', async ({api, web3, privateKeyWrapper}) => {236 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);237 const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);238 const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);239240 const fractionalizer = await deployFractionalizer(web3, owner);241 await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();242 await fractionalizer.methods.setRFTCollection(collectionIdAddress).send();243244 await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())245 .to.be.rejectedWith(/RFT collection is already set$/g);246 });247248 itWeb3('call setRFTCollection with NFT collection', async ({api, web3, privateKeyWrapper}) => {249 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);250 const {collectionIdAddress} = await createNonfungibleCollection(api, web3, owner);251 const nftContract = uniqueNFT(web3, collectionIdAddress, owner);252253 const fractionalizer = await deployFractionalizer(web3, owner);254 await nftContract.methods.addCollectionAdmin(fractionalizer.options.address).send();255256 await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())257 .to.be.rejectedWith(/Wrong collection type. Collection is not refungible.$/g);258 });259260 itWeb3('call setRFTCollection while not collection admin', async ({api, web3, privateKeyWrapper}) => {261 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);262 const fractionalizer = await deployFractionalizer(web3, owner);263 const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);264265 await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())266 .to.be.rejectedWith(/Fractionalizer contract should be an admin of the collection$/g);267 });268269 itWeb3('call setRFTCollection after createAndSetRFTCollection', async ({api, web3, privateKeyWrapper}) => {270 const alice = privateKeyWrapper('//Alice');271 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);272 const fractionalizer = await deployFractionalizer(web3, owner);273 const tx = api.tx.balances.transfer(evmToAddress(fractionalizer.options.address), 10n * UNIQUE);274 await submitTransactionAsync(alice, tx);275276 const result = await fractionalizer.methods.createAndSetRFTCollection('A', 'B', 'C').send({from: owner});277 const collectionIdAddress = result.events.RFTCollectionSet.returnValues._collection;278279 await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())280 .to.be.rejectedWith(/RFT collection is already set$/g);281 });282283 itWeb3('call nft2rft without setting RFT collection for contract', async ({api, web3, privateKeyWrapper}) => {284 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);285286 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);287 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);288 const nftTokenId = await nftContract.methods.nextTokenId().call();289 await nftContract.methods.mint(owner, nftTokenId).send();290291 const fractionalizer = await deployFractionalizer(web3, owner);292293 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())294 .to.be.rejectedWith(/RFT collection is not set$/g);295 });296297 itWeb3('call nft2rft while not owner of NFT token', async ({api, web3, privateKeyWrapper}) => {298 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);299 const nftOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);300301 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);302 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);303 const nftTokenId = await nftContract.methods.nextTokenId().call();304 await nftContract.methods.mint(owner, nftTokenId).send();305 await nftContract.methods.transfer(nftOwner, 1).send();306307308 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);309 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();310311 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())312 .to.be.rejectedWith(/Only token owner could fractionalize it$/g);313 });314315 itWeb3('call nft2rft while not in list of allowed accounts', async ({api, web3, privateKeyWrapper}) => {316 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);317318 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);319 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);320 const nftTokenId = await nftContract.methods.nextTokenId().call();321 await nftContract.methods.mint(owner, nftTokenId).send();322323 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);324325 await nftContract.methods.approve(fractionalizer.options.address, nftTokenId).send();326 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())327 .to.be.rejectedWith(/Fractionalization of this collection is not allowed by admin$/g);328 });329330 itWeb3('call nft2rft while fractionalizer doesnt have approval for nft token', async ({api, web3, privateKeyWrapper}) => {331 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);332333 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);334 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);335 const nftTokenId = await nftContract.methods.nextTokenId().call();336 await nftContract.methods.mint(owner, nftTokenId).send();337338 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);339340 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();341 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())342 .to.be.rejectedWith(/ApprovedValueTooLow$/g);343 });344345 itWeb3('call rft2nft without setting RFT collection for contract', async ({api, web3, privateKeyWrapper}) => {346 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);347348 const fractionalizer = await deployFractionalizer(web3, owner);349 const {collectionIdAddress: rftCollectionAddress} = await createRefungibleCollection(api, web3, owner);350 const refungibleContract = uniqueRefungible(web3, rftCollectionAddress, owner);351 const rftTokenId = await refungibleContract.methods.nextTokenId().call();352 await refungibleContract.methods.mint(owner, rftTokenId).send();353 354 await expect(fractionalizer.methods.rft2nft(rftCollectionAddress, rftTokenId).call())355 .to.be.rejectedWith(/RFT collection is not set$/g);356 });357358 itWeb3('call rft2nft for RFT token that is not from configured RFT collection', async ({api, web3, privateKeyWrapper}) => {359 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);360361 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);362 const {collectionIdAddress: rftCollectionAddress} = await createRefungibleCollection(api, web3, owner);363 const refungibleContract = uniqueRefungible(web3, rftCollectionAddress, owner);364 const rftTokenId = await refungibleContract.methods.nextTokenId().call();365 await refungibleContract.methods.mint(owner, rftTokenId).send();366 367 await expect(fractionalizer.methods.rft2nft(rftCollectionAddress, rftTokenId).call())368 .to.be.rejectedWith(/Wrong RFT collection$/g);369 });370371 itWeb3('call rft2nft for RFT token that was not minted by fractionalizer contract', async ({api, web3, privateKeyWrapper}) => {372 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);373 const {collectionIdAddress: rftCollectionAddress} = await createRefungibleCollection(api, web3, owner);374375 const fractionalizer = await deployFractionalizer(web3, owner);376 const refungibleContract = uniqueRefungible(web3, rftCollectionAddress, owner);377378 await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();379 await fractionalizer.methods.setRFTCollection(rftCollectionAddress).send();380381 const rftTokenId = await refungibleContract.methods.nextTokenId().call();382 await refungibleContract.methods.mint(owner, rftTokenId).send();383 384 await expect(fractionalizer.methods.rft2nft(rftCollectionAddress, rftTokenId).call())385 .to.be.rejectedWith(/No corresponding NFT token found$/g);386 });387388 itWeb3('call rft2nft without owning all RFT pieces', async ({api, web3, privateKeyWrapper}) => {389 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);390 const receiver = await createEthAccountWithBalance(api, web3, privateKeyWrapper);391392 const {fractionalizer, rftCollectionAddress} = await initFractionalizer(api, web3, privateKeyWrapper, owner);393 const {rftTokenAddress} = await createRFTToken(api, web3, owner, fractionalizer, 100n);394 395 const {tokenId} = tokenIdFromAddress(rftTokenAddress);396 const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);397 await refungibleTokenContract.methods.transfer(receiver, 50).send();398 await refungibleTokenContract.methods.approve(fractionalizer.options.address, 50).send();399 await expect(fractionalizer.methods.rft2nft(rftCollectionAddress, tokenId).call())400 .to.be.rejectedWith(/Not all pieces are owned by the caller$/g);401 });402403 itWeb3('send QTZ/UNQ to contract from non owner', async ({api, web3, privateKeyWrapper}) => {404 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);405 const payer = await createEthAccountWithBalance(api, web3, privateKeyWrapper);406407 const fractionalizer = await deployFractionalizer(web3, owner);408 const amount = 10n * UNIQUE;409 await expect(web3.eth.sendTransaction({from: payer, to: fractionalizer.options.address, value: `${amount}`, ...GAS_ARGS})).to.be.rejected;410 });411412 itWeb3('fractionalize NFT with NFT transfers disallowed', async ({api, web3, privateKeyWrapper}) => {413 const alice = privateKeyWrapper('//Alice');414 let collectionId;415 {416 const tx = api.tx.unique.createCollectionEx({name: 'A', description: 'B', tokenPrefix: 'C', mode: 'NFT'});417 const events = await submitTransactionAsync(alice, tx);418 const result = getCreateCollectionResult(events);419 collectionId = result.collectionId;420 }421 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);422 let nftTokenId;423 {424 const createData = {nft: {}};425 const tx = api.tx.unique.createItem(collectionId, {Ethereum: owner}, createData as any);426 const events = await executeTransaction(api, alice, tx);427 const result = getCreateItemResult(events);428 nftTokenId = result.itemId;429 }430 {431 const tx = api.tx.unique.setTransfersEnabledFlag(collectionId, false);432 await executeTransaction(api, alice, tx);433 }434 const nftCollectionAddress = collectionIdToAddress(collectionId);435 const {fractionalizer} = await initFractionalizer(api, web3, privateKeyWrapper, owner);436 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();437438 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);439 await nftContract.methods.approve(fractionalizer.options.address, nftTokenId).send();440 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())441 .to.be.rejectedWith(/TransferNotAllowed$/g);442 });443 444 itWeb3('fractionalize NFT with RFT transfers disallowed', async ({api, web3, privateKeyWrapper}) => {445 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);446 const alice = privateKeyWrapper('//Alice');447448 let collectionId;449 {450 const tx = api.tx.unique.createCollectionEx({name: 'A', description: 'B', tokenPrefix: 'C', mode: 'ReFungible'});451 const events = await submitTransactionAsync(alice, tx);452 const result = getCreateCollectionResult(events);453 collectionId = result.collectionId;454 }455 const rftCollectionAddress = collectionIdToAddress(collectionId);456 const fractionalizer = await deployFractionalizer(web3, owner);457 {458 const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, {Ethereum: fractionalizer.options.address});459 await submitTransactionAsync(alice, changeAdminTx);460 }461 await fractionalizer.methods.setRFTCollection(rftCollectionAddress).send();462 {463 const tx = api.tx.unique.setTransfersEnabledFlag(collectionId, false);464 await executeTransaction(api, alice, tx);465 }466467 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);468 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);469 const nftTokenId = await nftContract.methods.nextTokenId().call();470 await nftContract.methods.mint(owner, nftTokenId).send();471472 await fractionalizer.methods.setNftCollectionIsAllowed(nftCollectionAddress, true).send();473 await nftContract.methods.approve(fractionalizer.options.address, nftTokenId).send();474475 await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100n).call())476 .to.be.rejectedWith(/TransferNotAllowed$/g);477 });478});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
+});