Skip to content

Commit

Permalink
Revert NftAuthTokenManager.sol
Browse files Browse the repository at this point in the history
  • Loading branch information
masaun committed Oct 24, 2020
1 parent a8df76a commit cfc0ff1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 25 deletions.
43 changes: 19 additions & 24 deletions contracts/NftAuthToken.sol
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
pragma solidity ^0.6.12;
pragma experimental ABIEncoderV2;

import "@openzeppelin/contracts/access/AccessControl.sol";

import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
//import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
//import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";

import "@openzeppelin/contracts/access/AccessControl.sol";

//import { IMasset } from "./@mstable/protocol/contracts/interfaces/IMasset.sol";
import { IMStableHelper } from "./@mstable/protocol/contracts/interfaces/IMStableHelper.sol";
import { ISavingsContract } from "./@mstable/protocol/contracts/interfaces/ISavingsContract.sol";
//import { IMStableHelper } from "./@mstable/protocol/contracts/interfaces/IMStableHelper.sol";
//import { ISavingsContract } from "./@mstable/protocol/contracts/interfaces/ISavingsContract.sol";

import { PoolWithNftAuthToken } from "./PoolWithNftAuthToken.sol";
//import { PoolWithNftAuthToken } from "./PoolWithNftAuthToken.sol";


contract NftAuthToken is ERC721, AccessControl {
// contract NftAuthToken is ERC721, PoolWithNftAuthToken {
using SafeMath for uint;
// using SafeERC20 for IERC20;

// IERC20 public mUSD;
// ISavingsContract public save;
// IMStableHelper public helper;

mapping(address => address) pool; /// [Note]: Both of addresses should be associated
//using SafeERC20 for IERC20;

uint public currentAuthTokenId;

Expand All @@ -33,9 +27,9 @@ contract NftAuthToken is ERC721, AccessControl {
constructor(
address to,
string memory ipfsHash
// IERC20 _mUSD,
// ISavingsContract _save,
// IMStableHelper _helper
//IERC20 _mUSD,
//ISavingsContract _save,
//IMStableHelper _helper
)
public
ERC721("NFT Auth Token", "NAT")
Expand Down Expand Up @@ -87,18 +81,19 @@ contract NftAuthToken is ERC721, AccessControl {
return isAuth;
}


/***
* @notice - Pool Factory
**/
function createPool(IERC20 _mUSD, ISavingsContract _save, IMStableHelper _helper) public returns (address _pool) {
PoolWithNftAuthToken poolWithNftAuthToken = new PoolWithNftAuthToken(_mUSD, _save, _helper);
pool[address(this)] = address(poolWithNftAuthToken);
return address(poolWithNftAuthToken);
}
// function createPool(IERC20 _mUSD, ISavingsContract _save, IMStableHelper _helper) public returns (address _pool) {
// PoolWithNftAuthToken poolWithNftAuthToken = new PoolWithNftAuthToken(_mUSD, _save, _helper);
// pool[address(this)] = address(poolWithNftAuthToken);
// return address(poolWithNftAuthToken);
// }

function getPool(address _authToken) public view returns (address _pool) {
return pool[_authToken];
}
// function getPool(address _authToken) public view returns (address _pool) {
// return pool[_authToken];
// }



Expand Down
2 changes: 1 addition & 1 deletion scripts/scripts-kovan/NftAuthToken.scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ async function createPool() {
let inputData1 = await nftAuthToken.methods.createPool(_mUSD, _save, _helper).encodeABI();
let transaction1 = await sendTransaction(walletAddress1, privateKey1, nftAuthTokenAddr, inputData1)
}
mintAuthToken();
createPool();



Expand Down

0 comments on commit cfc0ff1

Please sign in to comment.