difftreelog
Merge branch 'develop' into feature/NFTPAR-250
in: master
4 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth395 // Basic collections395 // Basic collections396 pub Collection get(fn collection) config(): map hasher(identity) CollectionId => CollectionType<T::AccountId>;396 pub Collection get(fn collection) config(): map hasher(identity) CollectionId => CollectionType<T::AccountId>;397 pub AdminList get(fn admin_list_collection): map hasher(identity) CollectionId => Vec<T::AccountId>;397 pub AdminList get(fn admin_list_collection): map hasher(identity) CollectionId => Vec<T::AccountId>;398 pub WhiteList get(fn white_list): map hasher(identity) CollectionId => Vec<T::AccountId>;398 pub WhiteList get(fn white_list): double_map hasher(identity) CollectionId, hasher(twox_64_concat) T::AccountId => bool;399399400 /// Balance owner per collection map400 /// Balance owner per collection map401 pub Balance get(fn balance_count): double_map hasher(identity) CollectionId, hasher(twox_64_concat) T::AccountId => u128;401 pub Balance get(fn balance_count): double_map hasher(identity) CollectionId, hasher(twox_64_concat) T::AccountId => u128;421 pub ContractSelfSponsoring get(fn contract_self_sponsoring): map hasher(twox_64_concat) T::AccountId => bool;421 pub ContractSelfSponsoring get(fn contract_self_sponsoring): map hasher(twox_64_concat) T::AccountId => bool;422 pub ContractSponsorBasket get(fn contract_sponsor_basket): map hasher(twox_64_concat) (T::AccountId, T::AccountId) => T::BlockNumber;422 pub ContractSponsorBasket get(fn contract_sponsor_basket): map hasher(twox_64_concat) (T::AccountId, T::AccountId) => T::BlockNumber;423 pub ContractSponsoringRateLimit get(fn contract_sponsoring_rate_limit): map hasher(twox_64_concat) T::AccountId => T::BlockNumber;423 pub ContractSponsoringRateLimit get(fn contract_sponsoring_rate_limit): map hasher(twox_64_concat) T::AccountId => T::BlockNumber;424 pub ContractWhiteListEnabled get(fn contract_white_list_enabled): map hasher(twox_64_concat) T::AccountId => bool; 425 pub ContractWhiteList get(fn contract_white_list): double_map hasher(twox_64_concat) T::AccountId, hasher(twox_64_concat) T::AccountId => bool; 424 }426 }425 add_extra_genesis {427 add_extra_genesis {426 build(|config: &GenesisConfig<T>| {428 build(|config: &GenesisConfig<T>| {610 <ItemListIndex>::remove(collection_id);612 <ItemListIndex>::remove(collection_id);611 <AdminList<T>>::remove(collection_id);613 <AdminList<T>>::remove(collection_id);612 <Collection<T>>::remove(collection_id);614 <Collection<T>>::remove(collection_id);613 <WhiteList<T>>::remove(collection_id);615 <WhiteList<T>>::remove_prefix(collection_id);614616615 <NftItemList<T>>::remove_prefix(collection_id);617 <NftItemList<T>>::remove_prefix(collection_id);616 <FungibleItemList<T>>::remove_prefix(collection_id);618 <FungibleItemList<T>>::remove_prefix(collection_id);651 let sender = ensure_signed(origin)?;653 let sender = ensure_signed(origin)?;652 Self::check_owner_or_admin_permissions(collection_id, sender)?;654 Self::check_owner_or_admin_permissions(collection_id, sender)?;653655654 let mut white_list_collection: Vec<T::AccountId>;656 <WhiteList<T>>::insert(collection_id, address, true);655 if <WhiteList<T>>::contains_key(collection_id) {656 white_list_collection = <WhiteList<T>>::get(collection_id);657 if !white_list_collection.contains(&address.clone())658 {659 white_list_collection.push(address.clone());660 }657 661 }662 else {663 white_list_collection = Vec::new();664 white_list_collection.push(address.clone());665 }666667 <WhiteList<T>>::insert(collection_id, white_list_collection);668 Ok(())658 Ok(())669 }659 }670660686 let sender = ensure_signed(origin)?;676 let sender = ensure_signed(origin)?;687 Self::check_owner_or_admin_permissions(collection_id, sender)?;677 Self::check_owner_or_admin_permissions(collection_id, sender)?;688678689 if <WhiteList<T>>::contains_key(collection_id) {679 <WhiteList<T>>::remove(collection_id, address);690 let mut white_list_collection = <WhiteList<T>>::get(collection_id);691 if white_list_collection.contains(&address.clone())692 {693 white_list_collection.retain(|i| *i != address.clone());694 <WhiteList<T>>::insert(collection_id, white_list_collection);695 }696 }697680698 Ok(())681 Ok(())699 }682 }1396 #[cfg(feature = "runtime-benchmarks")]1379 #[cfg(feature = "runtime-benchmarks")]1397 <ContractOwner<T>>::insert(contract_address.clone(), sender.clone());1380 <ContractOwner<T>>::insert(contract_address.clone(), sender.clone());139813811399 let mut is_owner = false;1382 Self::ensure_contract_owned(sender, &contract_address)?;1400 if <ContractOwner<T>>::contains_key(contract_address.clone()) {1401 let owner = <ContractOwner<T>>::get(&contract_address);1402 is_owner = sender == owner;1403 }1404 ensure!(is_owner, Error::<T>::NoPermission);140513831406 <ContractSelfSponsoring<T>>::insert(contract_address, enable);1384 <ContractSelfSponsoring<T>>::insert(contract_address, enable);1407 Ok(())1385 Ok(())1431 rate_limit: T::BlockNumber1409 rate_limit: T::BlockNumber1432 ) -> DispatchResult {1410 ) -> DispatchResult {1433 let sender = ensure_signed(origin)?;1411 let sender = ensure_signed(origin)?;1434 let mut is_owner = false;1412 Self::ensure_contract_owned(sender, &contract_address)?;1435 if <ContractOwner<T>>::contains_key(contract_address.clone()) {1436 let owner = <ContractOwner<T>>::get(&contract_address);1437 is_owner = sender == owner;1438 }1439 ensure!(is_owner, Error::<T>::NoPermission);144014131441 <ContractSponsoringRateLimit<T>>::insert(contract_address, rate_limit);1414 <ContractSponsoringRateLimit<T>>::insert(contract_address, rate_limit);1442 Ok(())1415 Ok(())1443 }1416 }144414171418 /// Enable the white list for a contract. Only addresses added to the white list with addToContractWhiteList will be able to call this smart contract.1419 /// 1420 /// # Permissions1421 /// 1422 /// * Address that deployed smart contract.1423 /// 1424 /// # Arguments1425 /// 1426 /// -`contract_address`: Address of the contract.1427 /// 1428 /// - `enable`: . 1445 #[weight = 0]1429 #[weight = 0]1430 pub fn toggle_contract_white_list(1431 origin,1432 contract_address: T::AccountId,1433 enable: bool1434 ) -> DispatchResult {1435 let sender = ensure_signed(origin)?;1436 Self::ensure_contract_owned(sender, &contract_address)?;14371438 <ContractWhiteListEnabled<T>>::insert(contract_address, enable);1439 Ok(())1440 }1441 1442 /// Add an address to smart contract white list.1443 /// 1444 /// # Permissions1445 /// 1446 /// * Address that deployed smart contract.1447 /// 1448 /// # Arguments1449 /// 1450 /// -`contract_address`: Address of the contract.1451 ///1452 /// -`account_address`: Address to add.1453 #[weight = 0]1454 pub fn add_to_contract_white_list(1455 origin,1456 contract_address: T::AccountId,1457 account_address: T::AccountId1458 ) -> DispatchResult {1459 let sender = ensure_signed(origin)?;1460 Self::ensure_contract_owned(sender, &contract_address)?;1461 1462 <ContractWhiteList<T>>::insert(contract_address, account_address, true);1463 Ok(())1464 }14651466 /// Remove an address from smart contract white list.1467 /// 1468 /// # Permissions1469 /// 1470 /// * Address that deployed smart contract.1471 /// 1472 /// # Arguments1473 /// 1474 /// -`contract_address`: Address of the contract.1475 ///1476 /// -`account_address`: Address to remove.1477 #[weight = 0]1478 pub fn remove_from_contract_white_list(1479 origin,1480 contract_address: T::AccountId,1481 account_address: T::AccountId1482 ) -> DispatchResult {1483 let sender = ensure_signed(origin)?;1484 Self::ensure_contract_owned(sender, &contract_address)?;1485 1486 <ContractWhiteList<T>>::remove(contract_address, account_address);1487 Ok(())1488 }14891490 #[weight = 0]1446 pub fn set_collection_limits(1491 pub fn set_collection_limits(1447 origin,1492 origin,1448 collection_id: u32,1493 collection_id: u32,177818231779 fn check_white_list(collection_id: CollectionId, address: &T::AccountId) -> DispatchResult {1824 fn check_white_list(collection_id: CollectionId, address: &T::AccountId) -> DispatchResult {1780 let mes = Error::<T>::AddresNotInWhiteList;1825 let mes = Error::<T>::AddresNotInWhiteList;1781 ensure!(<WhiteList<T>>::contains_key(collection_id), mes);1826 ensure!(<WhiteList<T>>::contains_key(collection_id, address), mes);1782 let wl = <WhiteList<T>>::get(collection_id);1783 ensure!(wl.contains(address), mes);178418271785 Ok(())1828 Ok(())1786 }1829 }213821812139 Ok(())2182 Ok(())2140 }2183 }2184 2185 fn ensure_contract_owned(account: T::AccountId, contract: &T::AccountId) -> DispatchResult {2186 if <ContractOwner<T>>::contains_key(contract.clone()) {2187 let owner = <ContractOwner<T>>::get(contract);2188 ensure!(account == owner, Error::<T>::NoPermission);2189 } else {2190 fail!(Error::<T>::NoPermission);2191 }21922193 Ok(())2194 }2141}2195}214221962143////////////////////////////////////////////////////////////////////////////////////////////////////2197////////////////////////////////////////////////////////////////////////////////////////////////////2356 Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) => {2410 Some(pallet_contracts::Call::call(dest, _value, _gas_limit, _data)) => {235724112358 let called_contract: T::AccountId = T::Lookup::lookup((*dest).clone()).unwrap_or(T::AccountId::default());2412 let called_contract: T::AccountId = T::Lookup::lookup((*dest).clone()).unwrap_or(T::AccountId::default());24132414 let owned_contract = <ContractOwner<T>>::contains_key(called_contract.clone())2415 && <ContractOwner<T>>::get(called_contract.clone()) == *who;2416 let white_list_enabled = <ContractWhiteListEnabled<T>>::contains_key(called_contract.clone()) && <ContractWhiteListEnabled<T>>::get(called_contract.clone());2417 2418 if !owned_contract && white_list_enabled {2419 if !<ContractWhiteList<T>>::contains_key(called_contract.clone(), who) {2420 return Err(InvalidTransaction::Call.into());2421 }2422 }235924232360 let mut sponsor_transfer = false;2424 let mut sponsor_transfer = false;2361 if <ContractSponsoringRateLimit<T>>::contains_key(called_contract.clone()) {2425 if <ContractSponsoringRateLimit<T>>::contains_key(called_contract.clone()) {pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -960,7 +960,7 @@
let origin1 = Origin::signed(1);
assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, 2));
- assert_eq!(TemplateModule::white_list(collection_id)[0], 2);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), true);
});
}
@@ -975,7 +975,7 @@
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), collection_id, 2));
assert_ok!(TemplateModule::add_to_white_list(origin2.clone(), collection_id, 3));
- assert_eq!(TemplateModule::white_list(collection_id)[0], 3);
+ assert_eq!(TemplateModule::white_list(collection_id, 3), true);
});
}
@@ -1035,8 +1035,7 @@
assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, 2));
assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), collection_id, 2));
- assert_eq!(TemplateModule::white_list(collection_id)[0], 2);
- assert_eq!(TemplateModule::white_list(collection_id).len(), 1);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), true);
});
}
@@ -1054,7 +1053,7 @@
collection_id,
2
));
- assert_eq!(TemplateModule::white_list(collection_id).len(), 0);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), false);
});
}
@@ -1075,7 +1074,7 @@
collection_id,
3
));
- assert_eq!(TemplateModule::white_list(collection_id).len(), 0);
+ assert_eq!(TemplateModule::white_list(collection_id, 3), false);
});
}
@@ -1093,7 +1092,7 @@
TemplateModule::remove_from_white_list(origin2.clone(), collection_id, 2),
Error::<Test>::NoPermission
);
- assert_eq!(TemplateModule::white_list(collection_id)[0], 2);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), true);
});
}
@@ -1125,7 +1124,7 @@
TemplateModule::remove_from_white_list(origin2.clone(), collection_id, 2),
Error::<Test>::CollectionNotFound
);
- assert_eq!(TemplateModule::white_list(collection_id).len(), 0);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), false);
});
}
@@ -1149,7 +1148,7 @@
collection_id,
2
));
- assert_eq!(TemplateModule::white_list(collection_id).len(), 0);
+ assert_eq!(TemplateModule::white_list(collection_id, 2), false);
});
}
tests/src/contracts.test.tsdiffbeforeafterboth--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -1,16 +1,15 @@
-//
-// This file is subject to the terms and conditions defined in
-// file 'LICENSE', which is part of this source code package.
-//
-
-import { ApiPromise } from "@polkadot/api";
-import { expect } from "chai";
-import { default as usingApi, submitTransactionAsync } from "./substrate/substrate-api";
+import chai from "chai";
+import chaiAsPromised from 'chai-as-promised';
+import usingApi, { submitTransactionAsync, submitTransactionExpectFailAsync } from "./substrate/substrate-api";
import fs from "fs";
-import { Abi, BlueprintPromise, CodePromise } from "@polkadot/api-contract";
+import { Abi, BlueprintPromise as Blueprint, CodePromise, ContractPromise as Contract } from "@polkadot/api-contract";
import { IKeyringPair } from "@polkadot/types/types";
-import { Keyring } from "@polkadot/api";
+import { ApiPromise, Keyring } from "@polkadot/api";
import { ApiTypes, SubmittableExtrinsic } from "@polkadot/api/types";
+import privateKey from "./substrate/privateKey";
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
import { BigNumber } from 'bignumber.js';
import { findUnusedAddress } from './util/helpers'
@@ -18,8 +17,8 @@
const gasLimit = 3000n * 1000000n;
const endowment = `1000000000000000`;
-function deployBlueprint(alice: IKeyringPair, code: CodePromise): Promise<BlueprintPromise> {
- return new Promise<BlueprintPromise>(async (resolve, reject) => {
+function deployBlueprint(alice: IKeyringPair, code: CodePromise): Promise<Blueprint> {
+ return new Promise<Blueprint>(async (resolve, reject) => {
const unsub = await code
.createBlueprint()
.signAndSend(alice, (result) => {
@@ -32,7 +31,7 @@
});
}
-function deployContract(alice: IKeyringPair, blueprint: BlueprintPromise) : Promise<any> {
+function deployContract(alice: IKeyringPair, blueprint: Blueprint) : Promise<any> {
return new Promise<any>(async (resolve, reject) => {
const initValue = true;
@@ -62,39 +61,112 @@
return deployer;
}
-describe('Contracts smoke test', () => {
+async function deployFlipper(api: ApiPromise): Promise<[Contract, IKeyringPair]> {
+ const metadata = JSON.parse(fs.readFileSync('./src/flipper/metadata.json').toString('utf-8'));
+ const abi = new Abi(metadata);
+
+ const deployer = await prepareDeployer(api);
+
+ const wasm = fs.readFileSync('./src/flipper/flipper.wasm');
+
+ const code = new CodePromise(api, abi, wasm);
+
+ const blueprint = await deployBlueprint(deployer, code);
+ const contract = (await deployContract(deployer, blueprint))['contract'] as Contract;
+
+ const initialGetResponse = await getFlipValue(contract, deployer);
+ expect(initialGetResponse).to.be.true;
+
+ return [contract, deployer];
+}
+
+async function getFlipValue(contract: Contract, deployer: IKeyringPair) {
+ const result = await contract.query.get(deployer.address, value, gasLimit);
+
+ if(!result.result.isSuccess) {
+ throw `Failed to get flipper value`;
+ }
+ return (result.result.asSuccess.data[0] == 0x00) ? false : true;
+}
+
+describe('Contracts', () => {
it(`Can deploy smart contract Flipper, instantiate it and call it's get and flip messages.`, async () => {
await usingApi(async api => {
- const deployer = await prepareDeployer(api);
+ const [contract, deployer] = await deployFlipper(api);
+ const initialGetResponse = await getFlipValue(contract, deployer);
+
+ const bob = privateKey("//Bob");
+ const flip = contract.exec('flip', value, gasLimit);
+ await submitTransactionAsync(bob, flip);
+
+ const afterFlipGetResponse = await getFlipValue(contract, deployer);
+ expect(afterFlipGetResponse).not.to.be.eq(initialGetResponse, 'Flipping should change value.');
+ });
+ });
+
+ it(`Whitelisted account can call contract.`, async () => {
+ await usingApi(async api => {
+ const bob = privateKey("//Bob");
- const wasm = fs.readFileSync('./src/flipper/flipper.wasm');
-
- const metadata = JSON.parse(fs.readFileSync('./src/flipper/metadata.json').toString('utf-8'));
- const abi = new Abi(metadata);
+ const [contract, deployer] = await deployFlipper(api);
+ const consoleError = console.error;
+ console.error = (...data: any[]) => {
+ };
- const code = new CodePromise(api, abi, wasm);
+ let expectedFlipValue = await getFlipValue(contract, deployer);
- const blueprint = await deployBlueprint(deployer, code);
- const contract = (await deployContract(deployer, blueprint))['contract'];
+ const flip = contract.exec('flip', value, gasLimit);
+ await submitTransactionAsync(bob, flip);
+ expectedFlipValue = !expectedFlipValue;
+ const afterFlip = await getFlipValue(contract,deployer);
+ expect(afterFlip).to.be.eq(expectedFlipValue, `Anyone can call new contract.`);
- const getFlipValue = async () => {
- const result = await contract.query.get(deployer.address, value, gasLimit);
+ const deployerCanFlip = async () => {
+ expectedFlipValue = !expectedFlipValue;
+ const deployerFlip = contract.exec('flip', value, gasLimit);
+ await submitTransactionAsync(deployer, deployerFlip);
+ const aliceFlip1Response = await getFlipValue(contract, deployer);
+ expect(aliceFlip1Response).to.be.eq(expectedFlipValue, `Deployer always can flip.`);
+ };
+ await deployerCanFlip();
- if(!result.result.isSuccess) {
- throw `Failed to get flipper value`;
- }
- return (result.result.asSuccess.data[0] == 0x00) ? false : true;
- }
+ const enableWhiteListTx = api.tx.nft.toggleContractWhiteList(contract.address, true);
+ const enableResult = await submitTransactionAsync(deployer, enableWhiteListTx);
+ const flipWithEnabledWhiteList = contract.exec('flip', value, gasLimit);
+ await expect(submitTransactionExpectFailAsync(bob, flipWithEnabledWhiteList)).to.be.rejected;
+ const flipValueAfterEnableWhiteList = await getFlipValue(contract, deployer);
+ expect(flipValueAfterEnableWhiteList).to.be.eq(expectedFlipValue, `Enabling whitelist doesn't make it possible to call contract for everyone.`);
- const initialGetResponse = await getFlipValue();
- expect(initialGetResponse).to.be.true;
+ await deployerCanFlip();
- const flip = contract.exec('flip', value, gasLimit);
- await submitTransactionAsync(deployer, flip);
+ const addBobToWhiteListTx = api.tx.nft.addToContractWhiteList(contract.address, bob.address);
+ const addBobResult = await submitTransactionAsync(deployer, addBobToWhiteListTx);
+ const flipWithWhitelistedBob = contract.exec('flip', value, gasLimit);
+ await submitTransactionAsync(bob, flipWithWhitelistedBob);
+ expectedFlipValue = !expectedFlipValue;
+ const flipAfterWhiteListed = await getFlipValue(contract,deployer);
+ expect(flipAfterWhiteListed).to.be.eq(expectedFlipValue, `Bob was whitelisted, now he can flip.`);
- const afterFlipGetResponse = await getFlipValue();
+ await deployerCanFlip();
- expect(afterFlipGetResponse).to.be.false;
+ const removeBobFromWhiteListTx = api.tx.nft.removeFromContractWhiteList(contract.address, bob.address);
+ const removeBobResult = await submitTransactionAsync(deployer, removeBobFromWhiteListTx);
+ const bobRemoved = contract.exec('flip', value, gasLimit);
+ await expect(submitTransactionExpectFailAsync(bob, bobRemoved)).to.be.rejected;
+ const afterBobRemoved = await getFlipValue(contract, deployer);
+ expect(afterBobRemoved).to.be.eq(expectedFlipValue, `Bob can't call contract, now when he is removeed from white list.`);
+
+ await deployerCanFlip();
+
+ const disableWhiteListTx = api.tx.nft.toggleContractWhiteList(contract.address, false);
+ const disableWhiteListResult = await submitTransactionAsync(deployer, disableWhiteListTx);
+ const whiteListDisabledFlip = contract.exec('flip', value, gasLimit);
+ await submitTransactionAsync(bob, whiteListDisabledFlip);
+ expectedFlipValue = !expectedFlipValue;
+ const afterWhiteListDisabled = await getFlipValue(contract,deployer);
+ expect(afterWhiteListDisabled).to.be.eq(expectedFlipValue, `Anyone can call contract with disabled whitelist.`);
+
+ console.error = consoleError;
});
});
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -56,3 +56,25 @@
}
});
}
+
+export function submitTransactionExpectFailAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {
+ return new Promise(async function(resolve, reject) {
+ try {
+ await transaction.signAndSend(sender, ({ events = [], status }) => {
+ if (status.isReady) {
+ // nothing to do
+ // console.log(`Current tx status is Ready`);
+ } else if (status.isBroadcast) {
+ // nothing to do
+ // console.log(`Current tx status is Broadcast`);
+ } else if (status.isInBlock || status.isFinalized) {
+ resolve(events);
+ } else {
+ reject("Transaction failed");
+ }
+ });
+ } catch (e) {
+ reject(e);
+ }
+ });
+}
\ No newline at end of file