git.delta.rocks / unique-network / refs/commits / 7e5f90964b48

difftreelog

chore compile fractionalizer in typescript

Grigoriy Simonov2022-08-11parent: #817fef6.patch.diff
in: master

4 files changed

deleted.maintain/scripts/compile_fractionalizer.shdiffbeforeafterboth
--- a/.maintain/scripts/compile_fractionalizer.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -eu
-
-dir=$PWD
-
-tmp=$(mktemp -d)
-cd $tmp
-mkdir refungible
-mkdir api
-cp $dir/tests/src/eth/fractionalizer/Fractionalizer.sol refungible/input.sol
-cp $dir/tests/src/eth/api/CollectionHelpers.sol api/CollectionHelpers.sol
-cp $dir/tests/src/eth/api/ContractHelpers.sol api/ContractHelpers.sol
-cp $dir/tests/src/eth/api/UniqueRefungibleToken.sol api/UniqueRefungibleToken.sol
-cp $dir/tests/src/eth/api/UniqueRefungible.sol api/UniqueRefungible.sol
-cp $dir/tests/src/eth/api/UniqueNFT.sol api/UniqueNFT.sol
-solcjs --optimize --bin refungible/input.sol -o $PWD
-solcjs --abi -p refungible/input.sol
-
-mv refungible_input_sol_Fractionalizer.bin $dir/tests/src/eth/fractionalizer/Fractionalizer.bin
-mv refungible_input_sol_Fractionalizer.abi refungible_input_sol_Fractionalizer.json
-prettier refungible_input_sol_Fractionalizer.json > $dir/tests/src/eth/fractionalizer/FractionalizerAbi.json
modifiedMakefilediffbeforeafterboth
--- a/Makefile
+++ b/Makefile
@@ -78,10 +78,7 @@
 	INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_STUBS)/CollectionHelpers.raw ./.maintain/scripts/compile_stub.sh
 	INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_ABI) ./.maintain/scripts/generate_abi.sh
 
-Fractionalizer:
-	./.maintain/scripts/compile_fractionalizer.sh
-
-evm_stubs: UniqueFungible UniqueNFT UniqueRefungible UniqueRefungibleToken ContractHelpers CollectionHelpers Fractionalizer
+evm_stubs: UniqueFungible UniqueNFT UniqueRefungible UniqueRefungibleToken ContractHelpers CollectionHelpers
 
 .PHONY: _bench
 _bench:
modifiedtests/src/eth/fractionalizer/fractionalizer.test.tsdiffbeforeafterboth
--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -19,11 +19,11 @@
 import {ApiPromise} from '@polkadot/api';
 import {evmToAddress} from '@polkadot/util-crypto';
 import {readFile} from 'fs/promises';
-import fractionalizerAbi from './FractionalizerAbi.json';
 import {submitTransactionAsync} from '../../substrate/substrate-api';
 import {UNIQUE} from '../../util/helpers';
-import {collectionIdToAddress, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, GAS_ARGS, itWeb3, tokenIdFromAddress, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} 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';
 
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
@@ -32,17 +32,67 @@
 chai.use(chaiAsPromised);
 chai.use(chaiLike);
 const expect = chai.expect;
+let fractionalizer: CompiledContract;
+
+async function compileFractionalizer() {
+  if (!fractionalizer) {
+    const input = {
+      language: 'Solidity',
+      sources: {
+        ['Fractionalizer.sol']: {
+          content: (await readFile(`${__dirname}/Fractionalizer.sol`)).toString(),
+        },
+      },
+      settings: {
+        outputSelection: {
+          '*': {
+            '*': ['*'],
+          },
+        },
+      },
+    };
+    const json = JSON.parse(solc.compile(JSON.stringify(input), {import: await findImports()}));
+    const out = json.contracts['Fractionalizer.sol']['Fractionalizer'];
+
+    fractionalizer = {
+      abi: out.abi,
+      object: '0x' + out.evm.bytecode.object,
+    };
+  }
+  return fractionalizer;
+}
+
+async function findImports() {
+  const collectionHelpers = (await readFile(`${__dirname}/../api/CollectionHelpers.sol`)).toString();
+  const contractHelpers = (await readFile(`${__dirname}/../api/ContractHelpers.sol`)).toString();
+  const uniqueRefungibleToken = (await readFile(`${__dirname}/../api/UniqueRefungibleToken.sol`)).toString();
+  const uniqueRefungible = (await readFile(`${__dirname}/../api/UniqueRefungible.sol`)).toString();
+  const uniqueNFT = (await readFile(`${__dirname}/../api/UniqueNFT.sol`)).toString();
 
-async function deployFractionalizer(api: ApiPromise, web3: Web3, owner: string) {
-  const fractionalizerContract = new web3.eth.Contract(fractionalizerAbi as any, undefined, {
+  return function(path: string) {
+    switch (path) {
+      case 'api/CollectionHelpers.sol': return {contents: `${collectionHelpers}`};
+      case 'api/ContractHelpers.sol': return {contents: `${contractHelpers}`};
+      case 'api/UniqueRefungibleToken.sol': return {contents: `${uniqueRefungibleToken}`};
+      case 'api/UniqueRefungible.sol': return {contents: `${uniqueRefungible}`};
+      case 'api/UniqueNFT.sol': return {contents: `${uniqueNFT}`};
+      default: return {error: 'File not found'};
+    }
+  };
+}
+
+async function deployFractionalizer(web3: Web3, owner: string) {
+  const compiled = await compileFractionalizer();
+  const fractionalizerContract = new web3.eth.Contract(compiled.abi, undefined, {
+    data: compiled.object,
     from: owner,
     ...GAS_ARGS,
   });
-  return await fractionalizerContract.deploy({data: (await readFile(`${__dirname}/Fractionalizer.bin`)).toString()}).send({from: owner});
+  return await fractionalizerContract.deploy({data: compiled.object}).send({from: owner});
 }
 
 async function initFractionalizer(api: ApiPromise, web3: Web3, privateKeyWrapper: (account: string) => IKeyringPair, owner: string) {
-  const fractionalizer = await deployFractionalizer(api, web3, owner);
+  const fractionalizer = await deployFractionalizer(web3, owner);
   const tx = api.tx.balances.transfer(evmToAddress(fractionalizer.options.address), 10n * UNIQUE);
   const alice = privateKeyWrapper('//Alice');
   await submitTransactionAsync(alice, tx);
@@ -71,7 +121,7 @@
 describe('Fractionalizer contract usage', () => {
   itWeb3('Set RFT collection', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);
     const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);
     await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();
@@ -88,7 +138,7 @@
   itWeb3('Mint RFT collection', async ({api, web3, privateKeyWrapper}) => {
     const alice = privateKeyWrapper('//Alice');
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const tx = api.tx.balances.transfer(evmToAddress(fractionalizer.options.address), 10n * UNIQUE);
     await submitTransactionAsync(alice, tx);
 
@@ -183,7 +233,7 @@
     const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);
     const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);
 
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();
     await fractionalizer.methods.setRFTCollection(collectionIdAddress).send();
 
@@ -196,7 +246,7 @@
     const {collectionIdAddress} = await createNonfungibleCollection(api, web3, owner);
     const nftContract = uniqueNFT(web3, collectionIdAddress, owner);
 
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     await nftContract.methods.addCollectionAdmin(fractionalizer.options.address).send();
 
     await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())
@@ -205,7 +255,7 @@
 
   itWeb3('call setRFTCollection while not collection admin', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const {collectionIdAddress} = await createRefungibleCollection(api, web3, owner);
 
     await expect(fractionalizer.methods.setRFTCollection(collectionIdAddress).call())
@@ -215,7 +265,7 @@
   itWeb3('call setRFTCollection after createAndSetRFTCollection', async ({api, web3, privateKeyWrapper}) => {
     const alice = privateKeyWrapper('//Alice');
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const tx = api.tx.balances.transfer(evmToAddress(fractionalizer.options.address), 10n * UNIQUE);
     await submitTransactionAsync(alice, tx);
 
@@ -234,7 +284,7 @@
     const nftTokenId = await nftContract.methods.nextTokenId().call();
     await nftContract.methods.mint(owner, nftTokenId).send();
 
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
 
     await expect(fractionalizer.methods.nft2rft(nftCollectionAddress, nftTokenId, 100).call())
       .to.eventually.be.rejectedWith(/RFT collection is not set$/g);
@@ -291,7 +341,7 @@
   itWeb3('call rft2nft without setting RFT collection for contract', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
 
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const {collectionIdAddress: rftCollectionAddress} = await createRefungibleCollection(api, web3, owner);
     const refungibleContract = uniqueRefungible(web3, rftCollectionAddress, owner);
     const rftTokenId = await refungibleContract.methods.nextTokenId().call();
@@ -318,7 +368,7 @@
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const {collectionIdAddress: rftCollectionAddress} = await createRefungibleCollection(api, web3, owner);
 
-    const fractionalizer = await deployFractionalizer(api, web3, owner);
+    const fractionalizer = await deployFractionalizer(web3, owner);
     const refungibleContract = uniqueRefungible(web3, rftCollectionAddress, owner);
 
     await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send();
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
250  return Web3.utils.toChecksumAddress(subToEthLowercase(eth));250  return Web3.utils.toChecksumAddress(subToEthLowercase(eth));
251}251}
252
253export interface CompiledContract {
254  abi: any,
255  object: string,
256}
252257
253export function compileContract(name: string, src: string) {258export function compileContract(name: string, src: string) : CompiledContract {
254  const out = JSON.parse(solc.compile(JSON.stringify({259  const out = JSON.parse(solc.compile(JSON.stringify({
255    language: 'Solidity',260    language: 'Solidity',
256    sources: {261    sources: {