Skip to content
This repository was archived by the owner on Feb 11, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions contracts/PersonalEconomy.sol
Original file line number Diff line number Diff line change
@@ -1,54 +1,55 @@
pragma solidity ^0.4.24;

import "@convergent/arc/contracts/EthPolynomialCurvedToken.sol";
import "@convergent/arc/contracts/Spreads/SpreadEther.sol";

contract PersonalEconomy is EthPolynomialCurvedToken {
contract PersonalEconomy is SpreadEther {
event Requested(string message, uint256 time, address who);

bytes32 public mhash;
address public owner;

constructor(
bytes32 _mhash,
string _name,
string _symbol,
address _owner
) EthPolynomialCurvedToken(
_name,
_symbol,
18,
1,
1000
)
public
) public
{
SpreadEther.initialize(
_name,
_symbol,
18,
1,
1,
3000,
4000
);
transferOwnership(_owner);
mhash = _mhash;
owner = _owner;
}

function requestWithEth(
string _msg,
uint256 _price
string message,
uint256 reqNumTokens
) public
payable
{
uint256 cost = priceToMint(_price);
uint256 cost = price(reqNumTokens);
require(msg.value >= cost, "Must send requisite amount to purchase.");

_mint(msg.sender, _price);
_transfer(msg.sender, owner, _price);
emit Requested(_msg, now, msg.sender);
_mint(msg.sender, reqNumTokens);
_transfer(msg.sender, owner(), reqNumTokens);
emit Requested(message, now, msg.sender);
}

function requestWithToken(string _msg, uint256 _price) public {
_transfer(msg.sender, owner, _price);
emit Requested(_msg, now, msg.sender);
function requestWithToken(string message, uint256 reqNumTokens) public {
_transfer(msg.sender, owner(), reqNumTokens);
emit Requested(message, now, msg.sender);
}

function updateData(bytes32 _mhash)
public returns (bool)
{
require(msg.sender == owner);
require(msg.sender == owner());
mhash = _mhash;
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"web3": "1.0.0-beta.37"
},
"devDependencies": {
"@convergent/arc": "0.0.3",
"@convergent/arc": "0.0.5",
"babel-eslint": "9.0.0",
"bs58": "4.0.1",
"data-uri-to-buffer": "2.0.0",
Expand Down
4,752 changes: 2,460 additions & 2,292 deletions src/build/contracts/ERC20.json

Large diffs are not rendered by default.

Loading