Instadapp/InstaContract
1
0
Fork 0
mirror of https://github.com/Instadapp/InstaContract.git synced 2024-07-29 22:47:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed standard errors.

Browse Source
This commit is contained in:
Sowmayjain 2018-10-25 10:22:53 +05:30
parent 0f04dc81d4
commit a78710c8ee
2 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/MoatAddress.sol
View File

@ -2,10 +2,11 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
contract AddressRegistry { contract AddressRegistry {
event eSetAddr(string AddrName, address TargetAddr); event AddressChanged(string name, address target);
mapping(bytes32 => address) internal addressBook; mapping(bytes32 => address) internal addressRegistry;
modifier onlyAdmin() { modifier onlyAdmin() {
require( require(
@ -16,18 +17,17 @@ contract AddressRegistry {
} }
constructor() public { constructor() public {
addressBook[keccak256("admin")] = msg.sender; addressRegistry[keccak256("admin")] = msg.sender;
} }
function setAddr(string AddrName, address Addr) public onlyAdmin { function setAddr(string name, address newAddress) public onlyAdmin {
addressBook[keccak256(AddrName)] = Addr; addressRegistry[keccak256(name)] = newAddress;
emit eSetAddr(AddrName, Addr); emit AddressChanged(name, newAddress);
} }
function getAddr(string AddrName) public view returns(address AssignedAddress) { function getAddr(string name) public view returns(address addr) {
address realAddress = addressBook[keccak256(AddrName)]; addr = addressRegistry[keccak256(name)];
require(realAddress != address(0), "Not a valid address."); require(addr != address(0), "Not a valid address.");
return realAddress;
} }
} }

82
contracts/MoatAsset.sol
View File

@ -4,7 +4,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
interface AddressRegistry { interface AddressRegistry {
function getAddr(string AddrName) external returns(address); function getAddr(string name) external returns(address);
} }
interface token { interface token {
@ -12,7 +12,9 @@ interface token {
function transfer(address receiver, uint amount) external returns (bool); function transfer(address receiver, uint amount) external returns (bool);
} }
contract Registry { contract Registry {
address public registryAddress; address public registryAddress;
modifier onlyAdmin() { modifier onlyAdmin() {
require( require(
@ -21,19 +23,21 @@ contract Registry {
); );
_; _;
} }
function getAddress(string AddressName) internal view returns(address) {
function getAddress(string name) internal view returns(address addr) {
AddressRegistry aRegistry = AddressRegistry(registryAddress); AddressRegistry aRegistry = AddressRegistry(registryAddress);
address realAddress = aRegistry.getAddr(AddressName); addr = aRegistry.getAddr(name);
require(realAddress != address(0), "Invalid Address"); require(addr != address(0), "Invalid Address");
return realAddress;
} }
} }
contract AllowedResolver is Registry { contract AllowedResolver is Registry {
// Contract Address >> Asset Owner Address >> Bool // Contract Address >> Asset Owner Address >> Bool
mapping(address => mapping(address => bool)) allowed; mapping(address => mapping(address => bool)) allowed;
bool public ACEnabled; bool public enabled;
modifier onlyAllowedResolver() { modifier onlyAllowedResolver() {
require( require(
allowed[getAddress("resolver")][msg.sender], allowed[getAddress("resolver")][msg.sender],
@ -46,48 +50,45 @@ contract AllowedResolver is Registry {
function allowContract() public { function allowContract() public {
allowed[getAddress("resolver")][msg.sender] = true; allowed[getAddress("resolver")][msg.sender] = true;
} }
function disallowContract() public { function disallowContract() public {
allowed[getAddress("resolver")][msg.sender] = false; allowed[getAddress("resolver")][msg.sender] = false;
} }
// enableAC & disableAC will completely stop the withdrawal of assets on behalf (additional security check) // enableAC & disableAC will completely stop the withdrawal of assets on behalf (additional security check)
function enableAC() public onlyAdmin { function enableAC() public onlyAdmin {
ACEnabled = true; enabled = true;
} }
function disableAC() public onlyAdmin { function disableAC() public onlyAdmin {
ACEnabled = false; enabled = false;
} }
} }
contract MoatAsset is AllowedResolver {
contract AssetDB is AllowedResolver {
// AssetOwner >> TokenAddress >> Balance (as per respective decimals) // AssetOwner >> TokenAddress >> Balance (as per respective decimals)
mapping(address => mapping(address => uint)) Balances; mapping(address => mapping(address => uint)) balances;
address ETH = 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee; address eth = 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee;
function getBalance( function getBalance(
address AssetHolder, address assetHolder,
address Token address token
) public view returns (uint256 balance) { ) public view returns (uint256 balance)
return Balances[AssetHolder][Token]; {
balance = balances[assetHolder][token];
} }
// received ether directly from protocols like Kyber Network function deposit() public payable {
// emit an event atleast balances[msg.sender][eth] += msg.value;
function () public payable {}
function Deposit() public payable {
Balances[msg.sender][ETH] += msg.value;
} }
function Withdraw( function withdraw(address addr, uint amt) public {
address addr, require(balances[msg.sender][addr] >= amt, "Insufficient Balance");
uint amt balances[msg.sender][addr] -= amt;
) public { if (addr == eth) {
require(Balances[msg.sender][addr] >= amt, "Insufficient Balance");
Balances[msg.sender][addr] -= amt;
if (addr == ETH) {
msg.sender.transfer(amt); msg.sender.transfer(amt);
} else { } else {
token tokenFunctions = token(addr); token tokenFunctions = token(addr);
@ -95,25 +96,27 @@ contract MoatAsset is AllowedResolver {
} }
} }
function UpdateBalance( function updateBalance(
address tokenAddr, address tokenAddr,
uint amt, uint amt,
bool add, bool add,
address target address target
) public onlyAllowedResolver { ) public onlyAllowedResolver
{
if (add) { if (add) {
Balances[target][tokenAddr] += amt; balances[target][tokenAddr] += amt;
} else { } else {
Balances[target][tokenAddr] -= amt; balances[target][tokenAddr] -= amt;
} }
} }
function TransferAssets( function transferAssets(
address tokenAddress, address tokenAddress,
uint amount, uint amount,
address sendTo address sendTo
) public onlyAllowedResolver { ) public onlyAllowedResolver
if (tokenAddress == ETH) { {
if (tokenAddress == eth) {
sendTo.transfer(amount); sendTo.transfer(amount);
} else { } else {
token tokenFunctions = token(tokenAddress); token tokenFunctions = token(tokenAddress);
@ -121,9 +124,18 @@ contract MoatAsset is AllowedResolver {
} }
} }
}
contract MoatAsset is AssetDB {
constructor(address rAddr) public { constructor(address rAddr) public {
registryAddress = rAddr; registryAddress = rAddr;
enableAC(); enableAC();
} }
// received ether directly from protocols like Kyber Network
// emit an event atleast
function () public payable {}
} }