Merge pull request #116 from MoonSHRD/network/ropsten

Network/ropsten
MoonSHRD · Jan 20, 2022 · c91ccdd · c91ccdd
2 parents 077c32a + 0d0aa31
commit c91ccdd
Show file tree

Hide file tree

Showing 7 changed files with 28,164 additions and 343 deletions.
diff --git a/contracts/721/singleton/MSNFT.sol b/contracts/721/singleton/MSNFT.sol
@@ -34,7 +34,7 @@ contract MSNFT is ERC721Enumerable, Ownable {
      * @param item_id -- unique id of item
      */
     event ItemBought(address indexed buyer,uint256 indexed master_id, uint256 indexed item_id);
-    event ItemBoughtHuman(address buyer,uint256 master_id, uint256 item_id);
+    event ItemBoughtHuman(address buyer,uint256 master_id, uint256 item_id, uint256 file_order);
 
     //Mint new token
     event MintNewToken(address to, uint m_master_id, uint item_id);
@@ -337,7 +337,7 @@ contract MSNFT is ERC721Enumerable, Ownable {
             Mint(buyer, master_id, item_id, file_order_);
 
             emit ItemBought(buyer,master_id,item_id);
-            emit ItemBoughtHuman(buyer,master_id,item_id);
+            emit ItemBoughtHuman(buyer,master_id,item_id,file_order_);
     }
 
 

diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -37,7 +37,7 @@ var wei_gas_price = web3.utils.toWei(custom_gas_price, 'gwei');
 
 module.exports = function (deployer, network, accounts) {
   process.env.NETWORK = deployer.network;
-  if (network == "ropsten") {
+  if (network == "rinkeby") {
     console.log(accounts);
     console.log(wei_gas_price);