Skip to content

Commit

Permalink
Fix imports pahs and external interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@luismartinh
luismartinh committed Feb 5, 2021
1 parent 060b7e1 commit 779522d
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions Erc20Manager.sol
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.6;

import "./../contracts/math/SafeMath.sol";
import "./../utils/Utils.sol";
import "./../contracts/GSN/Context.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/math/SafeMath.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Utils.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/GSN/Context.sol";


contract Erc20Manager is Context {
Expand Down
18 changes: 9 additions & 9 deletions IInvestiable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ pragma solidity ^0.6.6;


interface IInvestable{
function getFreezeCount() external returns(uint256) ;
function getLastIndexFreezes() external returns(uint256);
function FreezeExist(address account) external returns(bool);
function FreezeIndexExist(uint256 index) external returns(bool);
function getFreezeCount() external view returns(uint256) ;
function getLastIndexFreezes() external view returns(uint256);
function FreezeExist(address account) external view returns(bool);
function FreezeIndexExist(uint256 index) external view returns(bool);
function newFreeze(address account,uint256 amount,uint256 date ) external returns(uint256);
function removeFreeze(address account) external;
function getFreeze(address account) external returns( uint256 , uint256 , uint256 );
function getFreezeByIndex(uint256 index) external returns( uint256 , uint256 , uint256 );
function getAllFreeze() external returns(uint256[] memory, address[] memory ,uint256[] memory , uint256[] memory , uint256[] memory );
function getFreeze(address account) external view returns( uint256 , uint256 , uint256 );
function getFreezeByIndex(uint256 index) external view returns( uint256 , uint256 , uint256 );
function getAllFreeze() external view returns(uint256[] memory, address[] memory ,uint256[] memory , uint256[] memory , uint256[] memory );
function updateFund(address account,uint256 withdraw) external returns(bool);
function canWithdrawFunds(address account,uint256 withdraw,uint256 currentFund) external returns(bool);
function howMuchCanWithdraw(address account,uint256 currentFund) external returns(uint256);
function canWithdrawFunds(address account,uint256 withdraw,uint256 currentFund) external view returns(bool);
function howMuchCanWithdraw(address account,uint256 currentFund) external view returns(uint256);

}
14 changes: 7 additions & 7 deletions IWStaked.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ interface IWStaked{
function NotifyWithdrawFunds(address account, uint256 amount) external returns(uint256);
function NotifyActiveChanged(bool activeStatus) external returns(bool);

function StakeExist(address account) external returns (bool) ;
function StakeExist(address account) external view returns (bool) ;
function setAutoCompound(address account, bool active) external returns(uint256);
function addToStake(address account, uint256 addAmount) external returns(uint256);
function newStake(address account,uint256 amount ) external returns (uint256);
function getStake(address account) external returns( uint256 ,bool);
function getStake(address account) external view returns( uint256 ,bool);
function removeStake(address account) external;
function renewStake(address account, uint256 newAmount) external returns(uint256);
function getStakeCount() external returns(uint256) ;
function getLastIndexStakes() external returns (uint256) ;
function getStakeByIndex(uint256 index) external returns(address, uint256,bool,uint8) ;
function getAutoCompoundStatus(address account) external returns(bool);
function getStakeCount() external view returns(uint256) ;
function getLastIndexStakes() external view returns (uint256) ;
function getStakeByIndex(uint256 index) external view returns(address, uint256,bool,uint8) ;
function getAutoCompoundStatus(address account) external view returns(bool);
function removeAllStake() external returns(bool);
function balanceOf(address account) external returns(uint256) ;
function balanceOf(address account) external view returns(uint256) ;

}
6 changes: 3 additions & 3 deletions Investing.sol
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.6;

import "./../contracts/math/SafeMath.sol";
import "./../utils/Utils.sol";
import "./../utils/Owners.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/math/SafeMath.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Utils.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Owners.sol";


contract Investing is Owners{
Expand Down
2 changes: 1 addition & 1 deletion Pausabled.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.6;

import "./../utils/Owners.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Owners.sol";

contract Pausabled is Owners{

Expand Down
8 changes: 4 additions & 4 deletions StakeManager.sol
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.6;

import "./../contracts/math/SafeMath.sol";
import "./../contracts/token/ERC20/ERC20.sol";
import "./../utils/Utils.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/math/SafeMath.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/token/ERC20/ERC20.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Utils.sol";

import "./../utils/Owners.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Owners.sol";


contract StakeManager is Owners, ERC20{
Expand Down
28 changes: 14 additions & 14 deletions woonklyPOS.sol
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.6;

import "./../contracts/math/SafeMath.sol";
import "./../contracts/token/ERC20/ERC20.sol";
import "./../contracts/utils/ReentrancyGuard.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/math/SafeMath.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/token/ERC20/ERC20.sol";
import "https://github.com/Woonkly/OpenZeppelinBaseContracts/contracts/utils/ReentrancyGuard.sol";

import "./../utils/Utils.sol";
import "https://github.com/Woonkly/MartinHSolUtils/Utils.sol";

import "./Pausabled.sol";
import "./Erc20Manager.sol";
import "./StakeManager.sol";
import "./IWStaked.sol";
import "./IInvestiable.sol";
import "https://github.com/Woonkly/STAKESmartContractPreRelease/Pausabled.sol";
import "https://github.com/Woonkly/STAKESmartContractPreRelease/Erc20Manager.sol";
import "https://github.com/Woonkly/STAKESmartContractPreRelease/StakeManager.sol";
import "https://github.com/Woonkly/STAKESmartContractPreRelease/IWStaked.sol";
import "https://github.com/Woonkly/STAKESmartContractPreRelease/IInvestiable.sol";


contract WOOPStake is Owners,Pausabled,Erc20Manager,ReentrancyGuard {
Expand Down Expand Up @@ -541,7 +541,7 @@ contract WOOPStake is Owners,Pausabled,Erc20Manager,ReentrancyGuard {



function getCalcRewardAmount(address account, uint256 amount) public returns(uint256,uint256){
function getCalcRewardAmount(address account, uint256 amount) public view returns(uint256,uint256){

if(!_stakes.StakeExist(account)) return (0,0);

Expand Down Expand Up @@ -603,7 +603,7 @@ struct Stake {



function calcTotalRewards(uint256 amount) public returns (uint256){
function calcTotalRewards(uint256 amount) public view returns (uint256){
uint256 remainder;
uint256 woopsRewards;
uint256 ind=0;
Expand Down Expand Up @@ -1043,7 +1043,7 @@ struct Stake {



function getSolvencyCOIN() public returns(bool,uint256){
function getSolvencyCOIN() public view returns(bool,uint256){
uint256 ind=0;
uint256 funds=0;
uint256 rews=0;
Expand Down Expand Up @@ -1075,7 +1075,7 @@ struct Stadistic{



function getSolvency(address sc) public returns(bool,uint256){
function getSolvency(address sc) public view returns(bool,uint256){

Stadistic memory s;

Expand All @@ -1096,7 +1096,7 @@ struct Stadistic{



function getStatistics(address sc) public returns(uint256,uint256,uint256,uint256,uint256){
function getStatistics(address sc) public view returns(uint256,uint256,uint256,uint256,uint256){


uint256 fund;
Expand Down

0 comments on commit 779522d

Please sign in to comment.