difftreelog
tests(util): fix and adapt feed-alices to asynchronisity
in: master
4 files changed
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -29,14 +29,14 @@
"feedAlices": "ts-node ./src/util/playgrounds/feedAlices.ts",
"test": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './src/**/*.test.ts'",
+ "testSequential": "yarn feedAlices && mocha --timeout 9999999 -r ts-node/register './src/**/*.seqtest.ts'",
"testStructure": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./**/nesting/**.test.ts",
"testEth": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",
"testEthNesting": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",
"testEthFractionalizer": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/fractionalizer/**/*.test.ts'",
"testEthMarketplace": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",
- "testCollision": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",
"testEvent": "yarn feedAlices && mocha --parallel --timeout 9999999 -r ts-node/register ./src/check-event/*.test.ts",
- "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**.test.ts",
+ "testRmrk": "mocha --timeout 9999999 -r ts-node/register ./**/rmrk/**test.ts",
"testEthPayable": "mocha --timeout 9999999 -r ts-node/register './**/eth/payable.test.ts'",
"testEthTokenProperties": "mocha --timeout 9999999 -r ts-node/register ./**/eth/tokenProperties.test.ts",
@@ -48,7 +48,7 @@
"testSetCollectionLimits": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionLimits.test.ts",
"testChangeCollectionOwner": "mocha --timeout 9999999 -r ts-node/register ./**/change-collection-owner.test.ts",
"testSetCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/setCollectionSponsor.test.ts",
- "testConfirmSponsorship": "mocha --timeout 9999999 -r ts-node/register ./**/confirmSponsorship.test.ts",
+ "testConfirmSponsorship": "mocha --timeout 9999999 --parallel -r ts-node/register ./**/confirmSponsorship.test.ts",
"testRemoveCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionAdmin.test.ts",
"testRemoveCollectionSponsor": "mocha --timeout 9999999 -r ts-node/register ./**/removeCollectionSponsor.test.ts",
"testAllowLists": "mocha --timeout 9999999 -r ts-node/register ./**/allowLists.test.ts",
@@ -78,12 +78,6 @@
"testInflation": "mocha --timeout 9999999 -r ts-node/register ./**/inflation.test.ts",
"testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",
"testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",
- "testXcmUnique": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmUnique.test.ts",
- "testXcmQuartz": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmQuartz.test.ts",
- "testXcmOpal": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmOpal.test.ts",
- "testXcmTransferAcala": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferAcala.test.ts acalaId=2000 uniqueId=5000",
- "testXcmTransferStatemine": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferStatemine.test.ts statemineId=1000 uniqueId=5000",
- "testXcmTransferMoonbeam": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferMoonbeam.test.ts",
"testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
"testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
"testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
@@ -97,6 +91,13 @@
"testEthFT": "mocha --timeout 9999999 -r ts-node/register ./**/eth/fungible.test.ts",
"testRPC": "mocha --timeout 9999999 -r ts-node/register ./**/rpc.test.ts",
"testPromotion": "mocha --timeout 9999999 -r ts-node/register ./**/app-promotion.test.ts",
+
+ "testXcmUnique": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmUnique.test.ts",
+ "testXcmQuartz": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmQuartz.test.ts",
+ "testXcmOpal": "RUN_XCM_TESTS=1 mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmOpal.test.ts",
+ "testXcmTransferAcala": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferAcala.test.ts acalaId=2000 uniqueId=5000",
+ "testXcmTransferStatemine": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferStatemine.test.ts statemineId=1000 uniqueId=5000",
+ "testXcmTransferMoonbeam": "mocha --timeout 9999999 -r ts-node/register ./**/xcm/xcmTransferMoonbeam.test.ts",
"load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",
"loadTransfer": "ts-node src/transfer.nload.ts",
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */5// eslint-disable-next-line @typescript-eslint/triple-slash-reference6/// <reference path="unique.dev.d.ts" />78import {readFile} from 'fs/promises';910import Web3 from 'web3';11import {WebsocketProvider} from 'web3-core';12import {Contract} from 'web3-eth-contract';1314import * as solc from 'solc';1516import {evmToAddress} from '@polkadot/util-crypto';17import {IKeyringPair} from '@polkadot/types/types';1819import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';2021import {ContractImports, CompiledContract, NormalizedEvent} from './types';2223// Native contracts ABI24import collectionHelpersAbi from '../../collectionHelpersAbi.json';25import fungibleAbi from '../../fungibleAbi.json';26import nonFungibleAbi from '../../nonFungibleAbi.json';27import refungibleAbi from '../../reFungibleAbi.json';28import refungibleTokenAbi from '../../reFungibleTokenAbi.json';29import contractHelpersAbi from './../contractHelpersAbi.json';30import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';3132class EthGroupBase {33 helper: EthUniqueHelper;3435 constructor(helper: EthUniqueHelper) {36 this.helper = helper;37 }38}394041class ContractGroup extends EthGroupBase {42 async findImports(imports?: ContractImports[]){43 if(!imports) return function(path: string) {44 return {error: `File not found: ${path}`};45 };46 47 const knownImports = {} as {[key: string]: string};48 for(const imp of imports) {49 knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();50 }51 52 return function(path: string) {53 if(path in knownImports) return {contents: knownImports[path]};54 return {error: `File not found: ${path}`};55 };56 }5758 async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {59 const out = JSON.parse(solc.compile(JSON.stringify({60 language: 'Solidity',61 sources: {62 [`${name}.sol`]: {63 content: src,64 },65 },66 settings: {67 outputSelection: {68 '*': {69 '*': ['*'],70 },71 },72 },73 }), {import: await this.findImports(imports)})).contracts[`${name}.sol`][name];74 75 return {76 abi: out.abi,77 object: '0x' + out.evm.bytecode.object,78 };79 }8081 async deployByCode(signer: string, name: string, src: string, imports?: ContractImports[]): Promise<Contract> {82 const compiledContract = await this.compile(name, src, imports);83 return this.deployByAbi(signer, compiledContract.abi, compiledContract.object);84 }8586 async deployByAbi(signer: string, abi: any, object: string): Promise<Contract> {87 const web3 = this.helper.getWeb3();88 const contract = new web3.eth.Contract(abi, undefined, {89 data: object,90 from: signer,91 gas: this.helper.eth.DEFAULT_GAS,92 });93 return await contract.deploy({data: object}).send({from: signer});94 }9596}97 98class NativeContractGroup extends EthGroupBase {99100 contractHelpers(caller: string): Contract {101 const web3 = this.helper.getWeb3();102 return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, gas: this.helper.eth.DEFAULT_GAS});103 }104105 collectionHelpers(caller: string) {106 const web3 = this.helper.getWeb3();107 return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, gas: this.helper.eth.DEFAULT_GAS});108 }109110 collection(address: string, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {111 const abi = {112 'nft': nonFungibleAbi,113 'rft': refungibleAbi,114 'ft': fungibleAbi,115 }[mode];116 const web3 = this.helper.getWeb3();117 return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});118 }119120 collectionById(collectionId: number, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {121 return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller);122 }123124 rftToken(address: string, caller?: string): Contract {125 const web3 = this.helper.getWeb3();126 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});127 }128129 rftTokenById(collectionId: number, tokenId: number, caller?: string): Contract {130 return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);131 }132}133134135class EthGroup extends EthGroupBase {136 DEFAULT_GAS = 2_500_000;137138 createAccount() {139 const web3 = this.helper.getWeb3();140 const account = web3.eth.accounts.create();141 web3.eth.accounts.wallet.add(account.privateKey);142 return account.address;143 }144145 async createAccountWithBalance(donor: IKeyringPair, amount=1000n) {146 const account = this.createAccount();147 await this.transferBalanceFromSubstrate(donor, account, amount);148 149 return account;150 }151152 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=1000n, inTokens=true) {153 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));154 }155 156 async getCollectionCreationFee(signer: string) {157 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);158 return await collectionHelper.methods.collectionCreationFee().call();159 }160161 async sendEVM(signer: IKeyringPair, contractAddress: string, abi: string, value: string, gasLimit?: number) {162 if(!gasLimit) gasLimit = this.DEFAULT_GAS;163 const web3 = this.helper.getWeb3();164 const gasPrice = await web3.eth.getGasPrice();165 // TODO: check execution status166 await this.helper.executeExtrinsic(167 signer,168 'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],169 true,170 );171 }172173 async callEVM(signer: TEthereumAccount, contractAddress: string, abi: string) {174 return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);175 }176177 async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {178 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();179 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);180 181 const result = await collectionHelper.methods.createNonfungibleCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});182183 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);184 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);185186 return {collectionId, collectionAddress};187 }188189 async createRefungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {190 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();191 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);192 193 const result = await collectionHelper.methods.createRFTCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});194195 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);196 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);197198 return {collectionId, collectionAddress};199 }200201 async deployCollectorContract(signer: string): Promise<Contract> {202 return await this.helper.ethContract.deployByCode(signer, 'Collector', `203 // SPDX-License-Identifier: UNLICENSED204 pragma solidity ^0.8.6;205206 contract Collector {207 uint256 collected;208 fallback() external payable {209 giveMoney();210 }211 function giveMoney() public payable {212 collected += msg.value;213 }214 function getCollected() public view returns (uint256) {215 return collected;216 }217 function getUnaccounted() public view returns (uint256) {218 return address(this).balance - collected;219 }220221 function withdraw(address payable target) public {222 target.transfer(collected);223 collected = 0;224 }225 }226 `);227 }228229 async deployFlipper(signer: string): Promise<Contract> {230 return await this.helper.ethContract.deployByCode(signer, 'Flipper', `231 // SPDX-License-Identifier: UNLICENSED232 pragma solidity ^0.8.6;233234 contract Flipper {235 bool value = false;236 function flip() public {237 value = !value;238 }239 function getValue() public view returns (bool) {240 return value;241 }242 }243 `);244 }245246 async recordCallFee(user: string, call: () => Promise<any>): Promise<bigint> {247 const before = await this.helper.balance.getEthereum(user);248 await call();249 // In dev mode, the transaction might not finish processing in time250 await this.helper.wait.newBlocks(1);251 const after = await this.helper.balance.getEthereum(user);252253 return before - after;254 }255256 normalizeEvents(events: any): NormalizedEvent[] {257 const output = [];258 for (const key of Object.keys(events)) {259 if (key.match(/^[0-9]+$/)) {260 output.push(events[key]);261 } else if (Array.isArray(events[key])) {262 output.push(...events[key]);263 } else {264 output.push(events[key]);265 }266 }267 output.sort((a, b) => a.logIndex - b.logIndex);268 return output.map(({address, event, returnValues}) => {269 const args: { [key: string]: string } = {};270 for (const key of Object.keys(returnValues)) {271 if (!key.match(/^[0-9]+$/)) {272 args[key] = returnValues[key];273 }274 }275 return {276 address,277 event,278 args,279 };280 });281 }282283 async calculateFee(address: ICrossAccountId, code: () => Promise<any>): Promise<bigint> {284 const wrappedCode = async () => {285 await code();286 // In dev mode, the transaction might not finish processing in time287 await this.helper.wait.newBlocks(1);288 };289 return await this.helper.arrange.calculcateFee(address, wrappedCode);290 }291} 292293class EthAddressGroup extends EthGroupBase {294 extractCollectionId(address: string): number {295 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');296 return parseInt(address.substr(address.length - 8), 16);297 }298299 fromCollectionId(collectionId: number): string {300 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');301 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);302 }303304 extractTokenId(address: string): {collectionId: number, tokenId: number} {305 if (!address.startsWith('0x'))306 throw 'address not starts with "0x"';307 if (address.length > 42)308 throw 'address length is more than 20 bytes';309 return {310 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),311 tokenId: Number('0x' + address.substring(address.length - 8)),312 };313 }314315 fromTokenId(collectionId: number, tokenId: number): string {316 return this.helper.util.getTokenAddress({collectionId, tokenId});317 }318319 normalizeAddress(address: string): string {320 return '0x' + address.substring(address.length - 40);321 }322} 323 324export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;325326export class EthUniqueHelper extends DevUniqueHelper {327 web3: Web3 | null = null;328 web3Provider: WebsocketProvider | null = null;329330 eth: EthGroup;331 ethAddress: EthAddressGroup;332 ethNativeContract: NativeContractGroup;333 ethContract: ContractGroup;334335 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {336 options.helperBase = options.helperBase ?? EthUniqueHelper;337338 super(logger, options);339 this.eth = new EthGroup(this);340 this.ethAddress = new EthAddressGroup(this);341 this.ethNativeContract = new NativeContractGroup(this);342 this.ethContract = new ContractGroup(this);343 }344345 getWeb3(): Web3 {346 if(this.web3 === null) throw Error('Web3 not connected');347 return this.web3;348 }349350 async connectWeb3(wsEndpoint: string) {351 if(this.web3 !== null) return;352 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);353 this.web3 = new Web3(this.web3Provider);354 }355356 async disconnect() {357 if(this.web3 === null) return;358 this.web3Provider?.connection.close();359360 await super.disconnect();361 }362363 clearApi() {364 this.web3 = null;365 }366367 clone(helperCls: EthUniqueHelperConstructor, options?: { [key: string]: any; }): EthUniqueHelper {368 const newHelper = super.clone(helperCls, options) as EthUniqueHelper;369 newHelper.web3 = this.web3;370 newHelper.web3Provider = this.web3Provider;371372 return newHelper;373 }374}375 1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */5// eslint-disable-next-line @typescript-eslint/triple-slash-reference6/// <reference path="unique.dev.d.ts" />78import {readFile} from 'fs/promises';910import Web3 from 'web3';11import {WebsocketProvider} from 'web3-core';12import {Contract} from 'web3-eth-contract';1314import * as solc from 'solc';1516import {evmToAddress} from '@polkadot/util-crypto';17import {IKeyringPair} from '@polkadot/types/types';1819import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';2021import {ContractImports, CompiledContract, NormalizedEvent} from './types';2223// Native contracts ABI24import collectionHelpersAbi from '../../collectionHelpersAbi.json';25import fungibleAbi from '../../fungibleAbi.json';26import nonFungibleAbi from '../../nonFungibleAbi.json';27import refungibleAbi from '../../reFungibleAbi.json';28import refungibleTokenAbi from '../../reFungibleTokenAbi.json';29import contractHelpersAbi from './../contractHelpersAbi.json';30import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';3132class EthGroupBase {33 helper: EthUniqueHelper;3435 constructor(helper: EthUniqueHelper) {36 this.helper = helper;37 }38}394041class ContractGroup extends EthGroupBase {42 async findImports(imports?: ContractImports[]){43 if(!imports) return function(path: string) {44 return {error: `File not found: ${path}`};45 };46 47 const knownImports = {} as {[key: string]: string};48 for(const imp of imports) {49 knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();50 }51 52 return function(path: string) {53 if(path in knownImports) return {contents: knownImports[path]};54 return {error: `File not found: ${path}`};55 };56 }5758 async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {59 const out = JSON.parse(solc.compile(JSON.stringify({60 language: 'Solidity',61 sources: {62 [`${name}.sol`]: {63 content: src,64 },65 },66 settings: {67 outputSelection: {68 '*': {69 '*': ['*'],70 },71 },72 },73 }), {import: await this.findImports(imports)})).contracts[`${name}.sol`][name];74 75 return {76 abi: out.abi,77 object: '0x' + out.evm.bytecode.object,78 };79 }8081 async deployByCode(signer: string, name: string, src: string, imports?: ContractImports[]): Promise<Contract> {82 const compiledContract = await this.compile(name, src, imports);83 return this.deployByAbi(signer, compiledContract.abi, compiledContract.object);84 }8586 async deployByAbi(signer: string, abi: any, object: string): Promise<Contract> {87 const web3 = this.helper.getWeb3();88 const contract = new web3.eth.Contract(abi, undefined, {89 data: object,90 from: signer,91 gas: this.helper.eth.DEFAULT_GAS,92 });93 return await contract.deploy({data: object}).send({from: signer});94 }9596}97 98class NativeContractGroup extends EthGroupBase {99100 contractHelpers(caller: string): Contract {101 const web3 = this.helper.getWeb3();102 return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, gas: this.helper.eth.DEFAULT_GAS});103 }104105 collectionHelpers(caller: string) {106 const web3 = this.helper.getWeb3();107 return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, gas: this.helper.eth.DEFAULT_GAS});108 }109110 collection(address: string, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {111 const abi = {112 'nft': nonFungibleAbi,113 'rft': refungibleAbi,114 'ft': fungibleAbi,115 }[mode];116 const web3 = this.helper.getWeb3();117 return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});118 }119120 collectionById(collectionId: number, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {121 return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller);122 }123124 rftToken(address: string, caller?: string): Contract {125 const web3 = this.helper.getWeb3();126 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});127 }128129 rftTokenById(collectionId: number, tokenId: number, caller?: string): Contract {130 return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);131 }132}133134135class EthGroup extends EthGroupBase {136 DEFAULT_GAS = 2_500_000;137138 createAccount() {139 const web3 = this.helper.getWeb3();140 const account = web3.eth.accounts.create();141 web3.eth.accounts.wallet.add(account.privateKey);142 return account.address;143 }144145 async createAccountWithBalance(donor: IKeyringPair, amount=100n) {146 const account = this.createAccount();147 await this.transferBalanceFromSubstrate(donor, account, amount);148 149 return account;150 }151152 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=100n, inTokens=true) {153 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));154 }155 156 async getCollectionCreationFee(signer: string) {157 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);158 return await collectionHelper.methods.collectionCreationFee().call();159 }160161 async sendEVM(signer: IKeyringPair, contractAddress: string, abi: string, value: string, gasLimit?: number) {162 if(!gasLimit) gasLimit = this.DEFAULT_GAS;163 const web3 = this.helper.getWeb3();164 const gasPrice = await web3.eth.getGasPrice();165 // TODO: check execution status166 await this.helper.executeExtrinsic(167 signer,168 'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],169 true,170 );171 }172173 async callEVM(signer: TEthereumAccount, contractAddress: string, abi: string) {174 return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);175 }176177 async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {178 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();179 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);180 181 const result = await collectionHelper.methods.createNonfungibleCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});182183 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);184 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);185186 return {collectionId, collectionAddress};187 }188189 async createRefungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {190 const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();191 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);192 193 const result = await collectionHelper.methods.createRFTCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});194195 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);196 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);197198 return {collectionId, collectionAddress};199 }200201 async deployCollectorContract(signer: string): Promise<Contract> {202 return await this.helper.ethContract.deployByCode(signer, 'Collector', `203 // SPDX-License-Identifier: UNLICENSED204 pragma solidity ^0.8.6;205206 contract Collector {207 uint256 collected;208 fallback() external payable {209 giveMoney();210 }211 function giveMoney() public payable {212 collected += msg.value;213 }214 function getCollected() public view returns (uint256) {215 return collected;216 }217 function getUnaccounted() public view returns (uint256) {218 return address(this).balance - collected;219 }220221 function withdraw(address payable target) public {222 target.transfer(collected);223 collected = 0;224 }225 }226 `);227 }228229 async deployFlipper(signer: string): Promise<Contract> {230 return await this.helper.ethContract.deployByCode(signer, 'Flipper', `231 // SPDX-License-Identifier: UNLICENSED232 pragma solidity ^0.8.6;233234 contract Flipper {235 bool value = false;236 function flip() public {237 value = !value;238 }239 function getValue() public view returns (bool) {240 return value;241 }242 }243 `);244 }245246 async recordCallFee(user: string, call: () => Promise<any>): Promise<bigint> {247 const before = await this.helper.balance.getEthereum(user);248 await call();249 // In dev mode, the transaction might not finish processing in time250 await this.helper.wait.newBlocks(1);251 const after = await this.helper.balance.getEthereum(user);252253 return before - after;254 }255256 normalizeEvents(events: any): NormalizedEvent[] {257 const output = [];258 for (const key of Object.keys(events)) {259 if (key.match(/^[0-9]+$/)) {260 output.push(events[key]);261 } else if (Array.isArray(events[key])) {262 output.push(...events[key]);263 } else {264 output.push(events[key]);265 }266 }267 output.sort((a, b) => a.logIndex - b.logIndex);268 return output.map(({address, event, returnValues}) => {269 const args: { [key: string]: string } = {};270 for (const key of Object.keys(returnValues)) {271 if (!key.match(/^[0-9]+$/)) {272 args[key] = returnValues[key];273 }274 }275 return {276 address,277 event,278 args,279 };280 });281 }282283 async calculateFee(address: ICrossAccountId, code: () => Promise<any>): Promise<bigint> {284 const wrappedCode = async () => {285 await code();286 // In dev mode, the transaction might not finish processing in time287 await this.helper.wait.newBlocks(1);288 };289 return await this.helper.arrange.calculcateFee(address, wrappedCode);290 }291} 292293class EthAddressGroup extends EthGroupBase {294 extractCollectionId(address: string): number {295 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');296 return parseInt(address.substr(address.length - 8), 16);297 }298299 fromCollectionId(collectionId: number): string {300 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');301 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);302 }303304 extractTokenId(address: string): {collectionId: number, tokenId: number} {305 if (!address.startsWith('0x'))306 throw 'address not starts with "0x"';307 if (address.length > 42)308 throw 'address length is more than 20 bytes';309 return {310 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),311 tokenId: Number('0x' + address.substring(address.length - 8)),312 };313 }314315 fromTokenId(collectionId: number, tokenId: number): string {316 return this.helper.util.getTokenAddress({collectionId, tokenId});317 }318319 normalizeAddress(address: string): string {320 return '0x' + address.substring(address.length - 40);321 }322} 323 324export type EthUniqueHelperConstructor = new (...args: any[]) => EthUniqueHelper;325326export class EthUniqueHelper extends DevUniqueHelper {327 web3: Web3 | null = null;328 web3Provider: WebsocketProvider | null = null;329330 eth: EthGroup;331 ethAddress: EthAddressGroup;332 ethNativeContract: NativeContractGroup;333 ethContract: ContractGroup;334335 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {336 options.helperBase = options.helperBase ?? EthUniqueHelper;337338 super(logger, options);339 this.eth = new EthGroup(this);340 this.ethAddress = new EthAddressGroup(this);341 this.ethNativeContract = new NativeContractGroup(this);342 this.ethContract = new ContractGroup(this);343 }344345 getWeb3(): Web3 {346 if(this.web3 === null) throw Error('Web3 not connected');347 return this.web3;348 }349350 async connectWeb3(wsEndpoint: string) {351 if(this.web3 !== null) return;352 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);353 this.web3 = new Web3(this.web3Provider);354 }355356 async disconnect() {357 if(this.web3 === null) return;358 this.web3Provider?.connection.close();359360 await super.disconnect();361 }362363 clearApi() {364 this.web3 = null;365 }366367 clone(helperCls: EthUniqueHelperConstructor, options?: { [key: string]: any; }): EthUniqueHelper {368 const newHelper = super.clone(helperCls, options) as EthUniqueHelper;369 newHelper.web3 = this.web3;370 newHelper.web3Provider = this.web3Provider;371372 return newHelper;373 }374}375 tests/src/util/playgrounds/feedAlices.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/feedAlices.ts
+++ b/tests/src/util/playgrounds/feedAlices.ts
@@ -26,23 +26,23 @@
const nonce = await helper.chain.getNonce(alice.address);
const filenames = await getFiles(path.resolve(__dirname, '../..'));
- console.log(`Main Alice address: ${alice.address}, with balance:`, await helper.balance.getSubstrate(alice.address));
-
- const batchSize = 20;
+ // batching is actually undesired, it takes away the time while all the transactions actually succeed
+ const batchSize = 300;
let balanceGrantedCounter = 0;
for (let b = 0; b < filenames.length; b += batchSize) {
const tx = [];
let batchBalanceGrantedCounter = 0;
- for (const f of filenames.slice(b, b + batchSize)) {
- if (!f.endsWith('.test.ts')) continue;
- const account = await privateKey({filename: f});
+ for (let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {
+ const f = filenames[b + i];
+ if (!f.endsWith('.test.ts') || f.includes('.outdated')) continue;
+ const account = await privateKey({filename: f, ignoreFundsPresence: true});
const aliceBalance = await helper.balance.getSubstrate(account.address);
- if (aliceBalance < 5000n * oneToken) {
+ if (aliceBalance < 7500n * oneToken) {
tx.push(helper.executeExtrinsic(
alice,
'api.tx.balances.transfer',
- [account.address, 10000n * oneToken],
+ [account.address, 15000n * oneToken],
true,
{nonce: nonce + balanceGrantedCounter++},
).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));
@@ -65,13 +65,14 @@
if (retriesLeft <= 0) return Promise.resolve(false);
return fundFilenames()
.then(() => Promise.resolve(true))
- .catch(() => {
- console.error(`Some transactions have failed. ${retriesLeft >= 1 ? 'Retrying...' : 'Something is wrong.'}`);
+ .catch(e => {
+ console.error(e);
+ console.error(`Some transactions might have failed. ${retriesLeft > 1 ? 'Retrying...' : 'Something is wrong.'}\n`);
return fundFilenamesWithRetries(--retriesLeft);
});
};
-fundFilenamesWithRetries(2).then((result) => process.exit(result ? 0 : 1)).catch(e => {
+fundFilenamesWithRetries(3).then((result) => process.exit(result ? 0 : 1)).catch(e => {
console.error(e);
process.exit(1);
});
tests/src/util/playgrounds/index.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/index.ts
+++ b/tests/src/util/playgrounds/index.ts
@@ -22,8 +22,7 @@
return `//Alice+${getTestHash(filename)}`;
};
-// todo:playgrounds normalize to seed and filename
-export const usingPlaygrounds = async (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => {
+export const usingPlaygrounds = async (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => {
const silentConsole = new SilentConsole();
silentConsole.enable();
@@ -32,14 +31,14 @@
try {
await helper.connect(url);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const privateKey = async (seed: string | {filename: string}) => {
+ const privateKey = async (seed: string | {filename: string, ignoreFundsPresence?: boolean}) => {
if (typeof seed === 'string') {
return helper.util.fromSeed(seed, ss58Format);
}
else {
const actualSeed = getTestSeed(seed.filename);
let account = helper.util.fromSeed(actualSeed, ss58Format);
- if (await helper.balance.getSubstrate(account.address) == 0n) {
+ if (!seed.ignoreFundsPresence && await helper.balance.getSubstrate(account.address) == 0n) {
console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
account = helper.util.fromSeed('//Alice', ss58Format);
}