Implemented buying artist tokens using profile funds

Author: ggarri

contracts/GSNProfile.sol

@@ -36,6 +36,8 @@ contract GSNProfile is Initializable, GSNMultiOwnableRecipient {
     constructor(address _owner) public GSNMultiOwnableRecipient(_owner) {
     }
 
+    function() payable external {}
+
     function addFile(bytes32 _cid, address _acl) public isOwner(_msgSender()) fileNotExists(_cid) {
         require(ACL(_acl).hasAdmin(address(this)));
 

migrations/03_deploy_artist_token.js

@@ -13,10 +13,10 @@ const theta = 350000;         // 35% in ppm
 const p0 = 1;                 // Price of internal token in external tokens.
 const initialRaise = 300;     // Raise amount in external tokens.
 const friction = 20000;       // 2% in ppm
-const gasPrice = 15000000000; // 15 gwei
+const gasPrice = 500000000000; // 500 gwei
 const hatchDurationSeconds = 3024000; // 5 weeks
-const hatchVestingDurationSeconds = 7890000; // 3 months
-const minExternalContribution = 100000;
+const hatchVestingDurationSeconds = 0; // 3 months
+const minExternalContribution = 10;
 
 module.exports = function(deployer) {
   const fromAccount = process.env.ACCOUNT;

src/contracts/profile.js

@@ -13,7 +13,8 @@ const {
 
 const {
   buyArtistTokens,
-  transfer: transferArtistToken
+  transfer: transferArtistToken,
+  getBalanceOf
 } = require('./artist_token');
 
 const factoryScJSON = require('../../build/contracts/GSNProfileFactory.json');
@@ -208,7 +209,7 @@ module.exports.removeFile = (web3, { from, contractAddr, cid }) => {
   });
 };
 
-module.exports.withdraw = (web3, {from, beneficiary, contractAddr, amountInPht}) => {
+const withdraw = module.exports.withdraw = (web3, {from, beneficiary, contractAddr, amountInPht}) => {
   Web3Wrapper.validator.validateAddress("from", from);
   Web3Wrapper.validator.validateAddress("beneficiary", beneficiary);
   Web3Wrapper.validator.validateAddress("contractAddr", contractAddr);
@@ -239,6 +240,7 @@ module.exports.withdrawArtistTokens = (web3, {from, beneficiary, contractAddr, a
 
 module.exports.buyArtistTokens = async(web3, {from, contractAddr, artistTokenAddr, wphtAddr, amountInPht}) => {
   // Firstly we withdraw from profile contract enough PHT to buy artist token
+  console.log(`Withdrawing ${amountInPht} from profile contract ${contractAddr}`);
   await withdraw(web3, {
     from,
     beneficiary: from,
@@ -247,16 +249,19 @@ module.exports.buyArtistTokens = async(web3, {from, contractAddr, artistTokenAdd
   });
 
   // Then we proceed buying the tokens
-
+  console.log(`Buying ${amountInPht} of artist tokens`);
   const boughtAmountInBN = await buyArtistTokens(web3, {
     from,
     artistTokenAddr,
     wphtAddr,
     amountWeiBn: Web3Wrapper.utils.toBN(Web3Wrapper.utils.toWei(amountInPht))
-  });
+  }, true);
 
   // At last we transfer tokens back to our profile contract
+  console.log(`Transfer purchased artist tokens ${Web3Wrapper.utils.toPht(boughtAmountInBN)} back to profile contract ${contractAddr}`);
   await transferArtistToken(web3, {
+    from,
+    to: contractAddr,
     artistTokenAddr,
     amountInBn: boughtAmountInBN
   });

src/web3/addon/utils.js

@@ -9,7 +9,7 @@ const web3Utils = require('web3-utils');
 const ethUtil = require('ethereumjs-util');
 
 module.exports.toWei = (pht, unit = 'ether') => {
-  return web3Utils.toWei(pht, unit)
+  return web3Utils.toWei(`${pht}`, unit)
 };
 
 module.exports.wei2pht = (n) => {

test/01_profile.js

@@ -17,11 +17,12 @@ const ACL = artifacts.require("ACL");
 
 const Web3 = require('../src/web3');
 const {
-  buyArtistTokens
+  buyArtistTokens,
 } = require('../src/contracts/profile');
 
 const {
-  getBalanceOf
+  getBalanceOf,
+  isArtistTokenHatched
 } = require('../src/contracts/artist_token');
 
 contract('Profile', (accounts) => {
@@ -31,77 +32,85 @@ contract('Profile', (accounts) => {
   const ACCOUNT_DEFAULT_PASSWORD = 'test123';
   let profileInstance;
 
+  it('should deploy a multi ownable GSN Profile contract', async () => {
+    const instanceProfile = await Profile.new(ROOT_ACCOUNT);
+
+    const isOwner = await instanceProfile.hasOwner(ROOT_ACCOUNT);
+    assert.equal(isOwner, true, "message sender is correctly inserted as contract owner");
+  });
+
+  it('should deploy a multi ownable GSN Profile contract, with recovery account', async () => {
+    RECOVERY_ACCOUNT = await web3.eth.personal.newAccount(ACCOUNT_DEFAULT_PASSWORD);
+
+    const instanceProfile = await Profile.new(ROOT_ACCOUNT);
+    await instanceProfile.addOwner(RECOVERY_ACCOUNT);
+
+    const isOwner = await instanceProfile.hasOwner(ROOT_ACCOUNT);
+    assert.equal(isOwner, true, "message sender is correctly inserted as contract owner");
+
+    const isRecoveryAccountOwner = await instanceProfile.hasOwner(RECOVERY_ACCOUNT);
+    assert.equal(isRecoveryAccountOwner, true, "recovery account is correctly inserted as contract owner");
+
+    profileInstance = instanceProfile;
+  });
+
+  it('should deploy an ACL and add a file to the GSN Profile', async () => {
+    const instanceAcl = await ACL.new(ROOT_ACCOUNT, false);
+    const ipfsHashHex = web3.utils.asciiToHex('QmVkoUR7okDxVtoX');
+    const ipfsHashBytes = web3.utils.hexToBytes(ipfsHashHex);
+
+    await instanceAcl.grantAdmin(profileInstance.address);
+    await profileInstance.addFile(ipfsHashBytes, instanceAcl.address);
+
+    const hasFile = await profileInstance.hasFile(ipfsHashBytes);
+    assert.equal(hasFile, true, "file was added correctly to profile");
+  });
+
   it('should buy artist tokens using profile contract funds', async () => {
     const amountInPht = 10;
-    const txCost = 2;
-    const artistTokenInstance = ArtistToken.deployed();
-    const wphtInstance = WPHT.deployed();
+    const txCost = 3;
+    const artistTokenInstance = await ArtistToken.deployed();
+    const wphtInstance = await WPHT.deployed();
+
+    assert.isTrue(await artistTokenInstance.isHatched());
+    assert.isFalse(await artistTokenInstance.paused());
 
     // Transfer little funds to recovery account to perform the claiming
     FAN_ACCOUNT = await web3.eth.personal.newAccount(ACCOUNT_DEFAULT_PASSWORD);
+    await web3.eth.personal.unlockAccount(FAN_ACCOUNT, ACCOUNT_DEFAULT_PASSWORD, 1000);
+    console.log(`Sending ${txCost} PHT to fan account`);
     await web3.eth.sendTransaction({
-      from: FAN_ACCOUNT,
-      to: profileInstance.address,
+      from: ROOT_ACCOUNT,
+      to: FAN_ACCOUNT,
       value: Web3.utils.toWei(`${txCost}`)
     });
 
     // New fan profile contract
+    console.log(`Deploying a new profile contract for the fan`);
     const fanProfileInstance = await Profile.new(FAN_ACCOUNT);
 
     // Transfer funds to profile contract
+    console.log(`Sending ${amountInPht} PHT to fan contract`);
     await web3.eth.sendTransaction({
       from: ROOT_ACCOUNT,
-      to: profileInstance.address,
+      to: fanProfileInstance.address,
       value: Web3.utils.toWei(`${amountInPht}`)
     });
 
+    console.log(`Buying ${amountInPht} artist tokens`);
     const bougthAmount = await buyArtistTokens(web3, {
+      from: FAN_ACCOUNT,
       contractAddr: fanProfileInstance.address,
       artistTokenAddr: artistTokenInstance.address,
       wphtAddr: wphtInstance.address,
-      from: RECOVERY_ACCOUNT,
       amountInPht
     });
 
     const balanceOf = await getBalanceOf(web3, {
       artistTokenAddr: artistTokenInstance.address,
-      accountAddr: profileInstance.address
+      accountAddr: fanProfileInstance.address
     });
 
     assert.equal(bougthAmount, balanceOf);
   });
-
-  // it('should deploy a multi ownable GSN Profile contract', async () => {
-  //   const instanceProfile = await Profile.new(ROOT_ACCOUNT);
-  //
-  //   const isOwner = await instanceProfile.hasOwner(ROOT_ACCOUNT);
-  //   assert.equal(isOwner, true, "message sender is correctly inserted as contract owner");
-  // });
-  //
-  // it('should deploy a multi ownable GSN Profile contract, with recovery account', async () => {
-  //   RECOVERY_ACCOUNT = await web3.eth.personal.newAccount(ACCOUNT_DEFAULT_PASSWORD);
-  //
-  //   const instanceProfile = await Profile.new(ROOT_ACCOUNT);
-  //   await instanceProfile.addOwner(RECOVERY_ACCOUNT);
-  //
-  //   const isOwner = await instanceProfile.hasOwner(ROOT_ACCOUNT);
-  //   assert.equal(isOwner, true, "message sender is correctly inserted as contract owner");
-  //
-  //   const isRecoveryAccountOwner = await instanceProfile.hasOwner(RECOVERY_ACCOUNT);
-  //   assert.equal(isRecoveryAccountOwner, true, "recovery account is correctly inserted as contract owner");
-  //
-  //   profileInstance = instanceProfile;
-  // });
-  //
-  // it('should deploy an ACL and add a file to the GSN Profile', async () => {
-  //   const instanceAcl = await ACL.new(ROOT_ACCOUNT, false);
-  //   const ipfsHashHex = web3.utils.asciiToHex('QmVkoUR7okDxVtoX');
-  //   const ipfsHashBytes = web3.utils.hexToBytes(ipfsHashHex);
-  //
-  //   await instanceAcl.grantAdmin(profileInstance.address);
-  //   await profileInstance.addFile(ipfsHashBytes, instanceAcl.address);
-  //
-  //   const hasFile = await profileInstance.hasFile(ipfsHashBytes);
-  //   assert.equal(hasFile, true, "file was added correctly to profile");
-  // });
 });