Merge pull request #10 from flyq/master

test contract

Author: lychees

contracts/Ethereum/contracts/Billboard.sol

@@ -41,8 +41,8 @@ contract Billboard {
         art = IERC721Full(_artwork);
         art.setup();
         artist = _artist;
-        state[0] = StewardState.forcelosed;
-        state[1] = StewardState.forcelosed;        
+        state[1] = StewardState.forcelosed;
+        state[2] = StewardState.forcelosed;
     } 
 
     event LogBuy(address indexed owner, uint256 indexed price);
@@ -131,7 +131,17 @@ contract Billboard {
         require(state[id] != StewardState.forcelosed, "forcelosed");
         deposit[id] = deposit[id].add(msg.value);
     }
-    
+
+    function mint(uint256 amount) public {
+        require(msg.sender == artist, "only artist can add artwork");
+        art.mint(amount);
+
+        uint256 index = art.totalSupply().add(1);
+        for (uint256 i = 0; i < amount; i++) {
+            state[index.add(i)] = StewardState.forcelosed;
+        }
+    }
+
     function buy(uint256 _newPrice, uint256 id) public payable collectPatronage(id) {
         require(_newPrice > 0, "Price is zero");
         require(msg.value > price[id], "Not enough"); // >, coz need to have at least something for deposit

contracts/Ethereum/contracts/ERC721Full.sol

@@ -22,8 +22,17 @@ contract ERC721Full is ERC721, ERC721Enumerable, ERC721Metadata {
 
         steward = msg.sender;
         // mint artwork
-        _mint(steward, 0); // mint
-        _mint(steward, 1); // mint        
-        _setTokenURI(42, "https://thisartworkisalwaysonsale.com/metadata");
+        _mint(steward, 1); // mint
+        _mint(steward, 2); // mint        
+       // _setTokenURI(42, "https://thisartworkisalwaysonsale.com/metadata");
+    }
+
+    function mint(uint256 amount) public {
+        require(msg.sender == steward, "only steward contract can do");
+
+        uint256 index = totalSupply().add(1);
+        for (uint256 i = 0; i < amount; i++) {
+            _mint(steward, index.add(i));
+        }
     }
 }

contracts/Ethereum/contracts/interfaces/IERC721.sol

@@ -12,6 +12,7 @@ contract IERC721 is IERC165 {
     event ApprovalForAll(address indexed owner, address indexed operator, bool approved);
 
     function setup() public;
+    function mint(uint256 amount) public;
 
     function balanceOf(address owner) public view returns (uint256 balance);
     function ownerOf(uint256 tokenId) public view returns (address owner);

contracts/Ethereum/migrations/2_deploy_contracts.js

@@ -1,23 +1,24 @@
 /* globals artifacts */
 var ArtSteward = artifacts.require("./ArtSteward.sol");
 var Artwork = artifacts.require("./ERC721Full.sol");
-var BillBoard = artifacts.require("./BillBoard.sol");
+var BillBoard = artifacts.require("./Billboard.sol");
 
-const deploymentAccount =  '0xE8B21A66d89401254045bAb95B474B52B6faC351'; //[0] address from mnemonic
-const artistAccount = '0xE8B21A66d89401254045bAb95B474B52B6faC351'; // artist account [on mainnet & rinkeby]
+const deploymentAccount =  '0xcEB8dE81eb8Cfa9ECFA36a3fAc625643d39d31fd'; //[0] address from mnemonic
+const artistAccount = '0xcEB8dE81eb8Cfa9ECFA36a3fAc625643d39d31fd'; // artist account [on mainnet & rinkeby]
 
 module.exports = function(deployer, network, accounts) {
   if(network === "ropsten" || network === "rinkeby" || network === "rinkeby-fork" || network === "mainnet" || network === "mainnet-fork") {
     // deploy with mnemonic provider
     deployer.deploy(Artwork, "This Artwork Is Always OnSale", "TAIAOS").then((deployedArtwork) => {
-      console.log(deployedArtwork.address);
+	console.log(deployedArtwork.address);
+	console.log(artistAccount);
       return deployer.deploy(BillBoard, artistAccount, deployedArtwork.address);
     });
   } else {
     // development deploy
     deployer.deploy(Artwork, "ThisArtworkIsAlwaysOnSale", "TAIAOS").then((deployedArtwork) => {
-      return deployer.deploy(ArtSteward, accounts[0], deployedArtwork.address);
+      return deployer.deploy(ArtSteward, artistAccount, deployedArtwork.address);
     });
   }
 
-};
+};