Skip to content

Commit

Permalink
Pinned solidity version (#675)
Browse files Browse the repository at this point in the history
* Pinned solidity version

* Fix merge conflicts
  • Loading branch information
maxsam4 authored and adamdossa committed Jun 13, 2019
1 parent d29863c commit 3ff1d69
Show file tree
Hide file tree
Showing 166 changed files with 213 additions and 210 deletions.
2 changes: 1 addition & 1 deletion contracts/FeatureRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "./ReclaimTokens.sol";
import "./interfaces/IFeatureRegistry.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/Migrations.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

contract Migrations {
address public owner;
Expand Down
3 changes: 2 additions & 1 deletion contracts/ModuleRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
import "./interfaces/IModuleRegistry.sol";
Expand Down Expand Up @@ -346,6 +346,7 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @notice Returns the verified status, and reputation of the entered Module Factory
* @param _factoryAddress is the address of the module factory
* @return bool indicating whether module factory is verified
* @return address of factory owner
* @return address array which contains the list of securityTokens that use that module factory
*/
function getFactoryDetails(address _factoryAddress) external view returns(bool, address, address[] memory) {
Expand Down
2 changes: 1 addition & 1 deletion contracts/Pausable.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Utility contract to allow pausing and unpausing of certain functions
Expand Down
2 changes: 1 addition & 1 deletion contracts/PolymathRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "./ReclaimTokens.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/ReclaimTokens.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/STRGetter.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "./storage/EternalStorage.sol";
import "./interfaces/ISecurityToken.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/SecurityTokenRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/datastore/DataStore.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../interfaces/ISecurityToken.sol";
import "../interfaces/IOwnable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/datastore/DataStoreFactory.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "./DataStoreProxy.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/datastore/DataStoreProxy.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../proxy/Proxy.sol";
import "./DataStoreStorage.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/datastore/DataStoreStorage.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../interfaces/ISecurityToken.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/IMedianizer.sol
@@ -1,5 +1,5 @@
/* solium-disable */
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface to MakerDAO Medianizer contract
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ICheckPermission.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface ICheckPermission {
/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IDataStore.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IDataStore {
/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IFeatureRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for managing polymath feature switches
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IModule.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface that every module contract should implement
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IModuleFactory.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface that every module factory contract should implement
Expand Down
5 changes: 3 additions & 2 deletions contracts/interfaces/IModuleRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for the Polymath Module Registry contract
Expand Down Expand Up @@ -51,9 +51,10 @@ interface IModuleRegistry {
* @notice Returns the verified status, and reputation of the entered Module Factory
* @param _factoryAddress is the address of the module factory
* @return bool indicating whether module factory is verified
* @return address of factory owner
* @return address array which contains the list of securityTokens that use that module factory
*/
function getFactoryDetails(address _factoryAddress) external view returns(bool isVerified, address[] memory usingTokens);
function getFactoryDetails(address _factoryAddress) external view returns(bool isVerified, address factoryOwner, address[] memory usingTokens);

/**
* @notice Returns all the tags related to the a module type which are valid for the given token
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IOracle.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IOracle {
/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IOwnable.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Ownable
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IPoly.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title ERC20 interface
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IPolymathRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IPolymathRegistry {
/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ISTFactory.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for security token proxy deployment
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ISTO.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface to be implemented by all STO modules
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ISecurityToken.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for all security tokens
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ISecurityTokenRegistry.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for the Polymath Security Token Registry contract
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ITransferManager.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface to be implemented by all Transfer Manager modules
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IUSDTieredSTOProxy.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface for security token proxy deployment
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IUpgradableTokenFactory.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Interface to be implemented by upgradable token factories
Expand Down
3 changes: 2 additions & 1 deletion contracts/interfaces/IVoting.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IVoting {

Expand Down Expand Up @@ -47,4 +47,5 @@ interface IVoting {
* @return bool isActive
*/
function getBallotDetails(uint256 _ballotId) external view returns(uint256 quorum, uint256 totalSupplyAtCheckpoint, uint256 checkpointId, uint256 startTime, uint256 endTime, uint256 totalProposals, uint256 totalVoters, bool isActive);

}
2 changes: 1 addition & 1 deletion contracts/interfaces/token/IERC1410.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IERC1410 {

Expand Down
4 changes: 2 additions & 2 deletions contracts/interfaces/token/IERC1594.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Standard Interface of ERC1594
Expand Down Expand Up @@ -26,4 +26,4 @@ interface IERC1594 {
event Issued(address indexed _operator, address indexed _to, uint256 _value, bytes _data);
event Redeemed(address indexed _operator, address indexed _from, uint256 _value, bytes _data);

}
}
8 changes: 4 additions & 4 deletions contracts/interfaces/token/IERC1643.sol
@@ -1,19 +1,19 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

// @title IERC1643 Document Management (part of the ERC1400 Security Token Standards)
/// @dev See https://github.com/SecurityTokenStandard/EIP-Spec

interface IERC1643 {

// Document Management
//-- Included in interface but commented because getDocuement() & getAllDocuments() body is provided in the STGetter
//-- Included in interface but commented because getDocuement() & getAllDocuments() body is provided in the STGetter
// function getDocument(bytes32 _name) external view returns (string memory, bytes32, uint256);
// function getAllDocuments() external view returns (bytes32[] memory);
function setDocument(bytes32 _name, string calldata _uri, bytes32 _documentHash) external;
function removeDocument(bytes32 _name) external;

// Document Events
event DocumentRemoved(bytes32 indexed _name, string _uri, bytes32 _documentHash);
event DocumentUpdated(bytes32 indexed _name, string _uri, bytes32 _documentHash);

}
}
4 changes: 2 additions & 2 deletions contracts/interfaces/token/IERC1644.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

interface IERC1644 {

Expand All @@ -25,4 +25,4 @@ interface IERC1644 {
bytes _operatorData
);

}
}
2 changes: 1 addition & 1 deletion contracts/libraries/BokkyPooBahsDateTimeLibrary.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

// ----------------------------------------------------------------------------
// BokkyPooBah's DateTime Library v1.01
Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/DecimalMath.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "openzeppelin-solidity/contracts/math/SafeMath.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/Encoder.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

library Encoder {
function getKey(string memory _key) internal pure returns(bytes32) {
Expand Down
6 changes: 3 additions & 3 deletions contracts/libraries/StatusCodes.sol
@@ -1,9 +1,9 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

library StatusCodes {

// ERC1400 status code inspired from ERC1066
enum Status {
enum Status {
TransferFailure,
TransferSuccess,
InsufficientBalance,
Expand All @@ -18,4 +18,4 @@ library StatusCodes {
function code(Status _status) internal pure returns (byte) {
return byte(uint8(0x50) + (uint8(_status)));
}
}
}
2 changes: 1 addition & 1 deletion contracts/libraries/TokenLib.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../interfaces/IPoly.sol";
import "./StatusCodes.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/Util.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Utility contract for reusable code
Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/VersionUtils.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Helper library use to compare or validate the semantic versions
Expand Down
8 changes: 4 additions & 4 deletions contracts/libraries/VolumeRestrictionLib.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../interfaces/IDataStore.sol";
import "./BokkyPooBahsDateTimeLibrary.sol";
Expand Down Expand Up @@ -72,9 +72,9 @@ library VolumeRestrictionLib {
public
view
returns(bool)
{
{
// if restriction is to check whether the current transaction is performed within the 24 hours
// span after the last transaction performed by the user
// span after the last transaction performed by the user
if (BokkyPooBahsDateTimeLibrary.diffSeconds(_lastTradedTimestamp, now) < 86400) {
(,, uint256 lastTxDay) = BokkyPooBahsDateTimeLibrary.timestampToDate(_lastTradedTimestamp);
(,, uint256 currentTxDay) = BokkyPooBahsDateTimeLibrary.timestampToDate(now);
Expand Down Expand Up @@ -179,7 +179,7 @@ library VolumeRestrictionLib {
VolumeRestrictionTMStorage.TypeOfPeriod _currentTypeOfPeriod,
VolumeRestrictionTMStorage.TypeOfPeriod _callFrom,
uint256 _endTime
)
)
internal
pure
returns(VolumeRestrictionTMStorage.TypeOfPeriod)
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/Dummy/DummySTO.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../../modules/STO/STO.sol";
import "../../interfaces/ISecurityToken.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/Dummy/DummySTOFactory.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../../modules/UpgradableModuleFactory.sol";
import "./DummySTOProxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/Dummy/DummySTOProxy.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

import "../../proxy/OwnedUpgradeabilityProxy.sol";
import "../../Pausable.sol";
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/Dummy/DummySTOStorage.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

/**
* @title Contract used to store layout for the DummySTO storage
Expand All @@ -12,4 +12,4 @@ contract DummySTOStorage {

mapping (address => uint256) public investors;

}
}
2 changes: 1 addition & 1 deletion contracts/mocks/FunctionSigClash1.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

contract functionSigClash1 {
// function clash550254402() public {
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/FunctionSigClash2.sol
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity 0.5.8;

contract functionSigClash2 {
// function proxyOwner() public {
Expand Down

0 comments on commit 3ff1d69

Please sign in to comment.