From 0ad1d0e3aab6a12d5b2eb231fca2f21e0c4f1cb7 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 24 May 2019 16:40:49 +0530 Subject: [PATCH 1/2] Pinned solidity version --- contracts/FeatureRegistry.sol | 2 +- contracts/Migrations.sol | 2 +- contracts/ModuleRegistry.sol | 2 +- contracts/Pausable.sol | 2 +- contracts/PolymathRegistry.sol | 2 +- contracts/ReclaimTokens.sol | 2 +- contracts/STRGetter.sol | 2 +- contracts/SecurityTokenRegistry.sol | 2 +- contracts/datastore/DataStore.sol | 2 +- contracts/datastore/DataStoreFactory.sol | 2 +- contracts/datastore/DataStoreProxy.sol | 4 ++-- contracts/datastore/DataStoreStorage.sol | 2 +- contracts/external/IMedianizer.sol | 2 +- contracts/helpers/PolyToken.sol | 2 +- contracts/interfaces/IBoot.sol | 4 ++-- contracts/interfaces/ICheckPermission.sol | 2 +- contracts/interfaces/IDataStore.sol | 2 +- contracts/interfaces/IFeatureRegistry.sol | 2 +- contracts/interfaces/IModule.sol | 2 +- contracts/interfaces/IModuleFactory.sol | 2 +- contracts/interfaces/IModuleRegistry.sol | 2 +- contracts/interfaces/IOracle.sol | 2 +- contracts/interfaces/IOwnable.sol | 2 +- contracts/interfaces/IPoly.sol | 2 +- contracts/interfaces/IPolymathRegistry.sol | 2 +- contracts/interfaces/ISTFactory.sol | 6 ++--- contracts/interfaces/ISTO.sol | 2 +- contracts/interfaces/ISecurityToken.sol | 6 ++--- .../interfaces/ISecurityTokenRegistry.sol | 2 +- contracts/interfaces/ITransferManager.sol | 2 +- contracts/interfaces/IUSDTieredSTOProxy.sol | 2 +- .../interfaces/IUpgradableTokenFactory.sol | 2 +- contracts/interfaces/IVoting.sol | 6 ++--- contracts/interfaces/token/IERC1410.sol | 2 +- contracts/interfaces/token/IERC1594.sol | 4 ++-- contracts/interfaces/token/IERC1643.sol | 8 +++---- contracts/interfaces/token/IERC1644.sol | 4 ++-- .../libraries/BokkyPooBahsDateTimeLibrary.sol | 2 +- contracts/libraries/DecimalMath.sol | 2 +- contracts/libraries/Encoder.sol | 2 +- contracts/libraries/KindMath.sol | 4 ++-- contracts/libraries/TokenLib.sol | 2 +- contracts/libraries/Util.sol | 2 +- contracts/libraries/VersionUtils.sol | 2 +- contracts/libraries/VolumeRestrictionLib.sol | 8 +++---- contracts/mocks/Dummy/DummySTO.sol | 2 +- contracts/mocks/Dummy/DummySTOFactory.sol | 2 +- contracts/mocks/Dummy/DummySTOProxy.sol | 2 +- contracts/mocks/Dummy/DummySTOStorage.sol | 4 ++-- contracts/mocks/FunctionSigClash1.sol | 2 +- contracts/mocks/FunctionSigClash2.sol | 2 +- contracts/mocks/MockBurnFactory.sol | 2 +- contracts/mocks/MockCountTransferManager.sol | 2 +- contracts/mocks/MockFactory.sol | 2 +- contracts/mocks/MockModuleRegistry.sol | 2 +- contracts/mocks/MockOracle.sol | 2 +- contracts/mocks/MockPolyOracle.sol | 2 +- contracts/mocks/MockRedemptionManager.sol | 4 ++-- contracts/mocks/MockSTGetter.sol | 2 +- contracts/mocks/MockSecurityTokenLogic.sol | 2 +- contracts/mocks/MockWrongTypeFactory.sol | 2 +- contracts/mocks/PolyTokenFaucet.sol | 2 +- contracts/mocks/SecurityTokenMock.sol | 2 +- contracts/mocks/SecurityTokenRegistryMock.sol | 2 +- contracts/mocks/TestSTOFactory.sol | 2 +- contracts/modules/Burn/IBurn.sol | 2 +- .../Dividend/DividendCheckpoint.sol | 2 +- .../ERC20/ERC20DividendCheckpoint.sol | 2 +- .../ERC20/ERC20DividendCheckpointFactory.sol | 2 +- .../ERC20/ERC20DividendCheckpointProxy.sol | 2 +- .../ERC20/ERC20DividendCheckpointStorage.sol | 2 +- .../Ether/EtherDividendCheckpoint.sol | 2 +- .../Ether/EtherDividendCheckpointFactory.sol | 2 +- .../Ether/EtherDividendCheckpointProxy.sol | 2 +- contracts/modules/Checkpoint/ICheckpoint.sol | 2 +- .../Voting/PLCR/PLCRVotingCheckpoint.sol | 22 +++++++++---------- .../PLCR/PLCRVotingCheckpointFactory.sol | 4 ++-- .../Voting/PLCR/PLCRVotingCheckpointProxy.sol | 4 ++-- .../PLCR/PLCRVotingCheckpointStorage.sol | 4 ++-- .../Transparent/WeightedVoteCheckpoint.sol | 14 ++++++------ .../WeightedVoteCheckpointFactory.sol | 2 +- .../WeightedVoteCheckpointProxy.sol | 4 ++-- .../WeightedVoteCheckpointStorage.sol | 6 ++--- .../Checkpoint/Voting/VotingCheckpoint.sol | 4 ++-- .../Experimental/Burn/TrackedRedemption.sol | 2 +- .../Burn/TrackedRedemptionFactory.sol | 2 +- .../Mixed/ScheduledCheckpoint.sol | 4 ++-- .../Mixed/ScheduledCheckpointFactory.sol | 2 +- .../TransferManager/KYCTransferManager.sol | 2 +- .../KYCTransferManagerFactory.sol | 2 +- .../TransferManager/SignedTransferManager.sol | 2 +- .../SignedTransferManagerFactory.sol | 2 +- contracts/modules/Module.sol | 4 ++-- contracts/modules/ModuleFactory.sol | 2 +- .../GeneralPermissionManager.sol | 2 +- .../GeneralPermissionManagerFactory.sol | 2 +- .../GeneralPermissionManagerProxy.sol | 2 +- .../GeneralPermissionManagerStorage.sol | 2 +- .../PermissionManager/IPermissionManager.sol | 2 +- contracts/modules/STO/Capped/CappedSTO.sol | 2 +- .../modules/STO/Capped/CappedSTOFactory.sol | 2 +- .../modules/STO/Capped/CappedSTOProxy.sol | 2 +- .../modules/STO/Capped/CappedSTOStorage.sol | 4 ++-- contracts/modules/STO/PreSale/PreSaleSTO.sol | 2 +- .../modules/STO/PreSale/PreSaleSTOFactory.sol | 2 +- .../modules/STO/PreSale/PreSaleSTOProxy.sol | 2 +- .../modules/STO/PreSale/PreSaleSTOStorage.sol | 4 ++-- contracts/modules/STO/STO.sol | 2 +- .../modules/STO/USDTiered/USDTieredSTO.sol | 2 +- .../STO/USDTiered/USDTieredSTOFactory.sol | 2 +- .../STO/USDTiered/USDTieredSTOProxy.sol | 2 +- .../STO/USDTiered/USDTieredSTOStorage.sol | 2 +- .../BTM/BlacklistTransferManager.sol | 6 ++--- .../BTM/BlacklistTransferManagerFactory.sol | 2 +- .../BTM/BlacklistTransferManagerProxy.sol | 2 +- .../BTM/BlacklistTransferManagerStorage.sol | 2 +- .../CTM/CountTransferManager.sol | 2 +- .../CTM/CountTransferManagerFactory.sol | 2 +- .../CTM/CountTransferManagerProxy.sol | 2 +- .../CTM/CountTransferManagerStorage.sol | 2 +- .../GTM/GeneralTransferManager.sol | 2 +- .../GTM/GeneralTransferManagerFactory.sol | 2 +- .../GTM/GeneralTransferManagerProxy.sol | 2 +- .../GTM/GeneralTransferManagerStorage.sol | 2 +- .../LTM/LockUpTransferManager.sol | 2 +- .../LTM/LockUpTransferManagerFactory.sol | 2 +- .../LTM/LockUpTransferManagerProxy.sol | 2 +- .../LTM/LockUpTransferManagerStorage.sol | 2 +- .../MATM/ManualApprovalTransferManager.sol | 2 +- .../ManualApprovalTransferManagerFactory.sol | 2 +- .../ManualApprovalTransferManagerProxy.sol | 2 +- .../ManualApprovalTransferManagerStorage.sol | 2 +- .../PTM/PercentageTransferManager.sol | 2 +- .../PTM/PercentageTransferManagerFactory.sol | 2 +- .../PTM/PercentageTransferManagerProxy.sol | 2 +- .../PTM/PercentageTransferManagerStorage.sol | 2 +- .../TransferManager/TransferManager.sol | 2 +- .../VRTM/VolumeRestrictionTM.sol | 2 +- .../VRTM/VolumeRestrictionTMFactory.sol | 2 +- .../VRTM/VolumeRestrictionTMProxy.sol | 2 +- .../VRTM/VolumeRestrictionTMStorage.sol | 2 +- contracts/modules/UpgradableModuleFactory.sol | 2 +- .../modules/Wallet/VestingEscrowWallet.sol | 2 +- .../Wallet/VestingEscrowWalletFactory.sol | 2 +- .../Wallet/VestingEscrowWalletProxy.sol | 2 +- .../Wallet/VestingEscrowWalletStorage.sol | 4 ++-- contracts/modules/Wallet/Wallet.sol | 2 +- contracts/oracles/MakerDAOOracle.sol | 2 +- contracts/oracles/PolyOracle.sol | 2 +- contracts/oracles/StableOracle.sol | 2 +- contracts/proxy/ModuleRegistryProxy.sol | 2 +- contracts/proxy/OwnedProxy.sol | 2 +- contracts/proxy/OwnedUpgradeabilityProxy.sol | 2 +- contracts/proxy/Proxy.sol | 2 +- .../proxy/SecurityTokenRegistryProxy.sol | 2 +- contracts/proxy/UpgradeabilityProxy.sol | 2 +- contracts/storage/EternalStorage.sol | 2 +- .../Dividend/DividendCheckpointStorage.sol | 2 +- .../Voting/VotingCheckpointStorage.sol | 6 ++--- contracts/storage/modules/ModuleStorage.sol | 2 +- contracts/storage/modules/STO/ISTOStorage.sol | 4 ++-- contracts/storage/modules/STO/STOStorage.sol | 2 +- contracts/tokens/OZStorage.sol | 2 +- contracts/tokens/STFactory.sol | 6 ++--- contracts/tokens/STGetter.sol | 2 +- contracts/tokens/SecurityToken.sol | 2 +- contracts/tokens/SecurityTokenProxy.sol | 2 +- contracts/tokens/SecurityTokenStorage.sol | 2 +- 168 files changed, 222 insertions(+), 222 deletions(-) diff --git a/contracts/FeatureRegistry.sol b/contracts/FeatureRegistry.sol index 1fbbb2134..520e560f8 100644 --- a/contracts/FeatureRegistry.sol +++ b/contracts/FeatureRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./ReclaimTokens.sol"; import "./interfaces/IFeatureRegistry.sol"; diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index a15e3c71b..610cba54d 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract Migrations { address public owner; diff --git a/contracts/ModuleRegistry.sol b/contracts/ModuleRegistry.sol index 59a02af74..9ea49a3d1 100644 --- a/contracts/ModuleRegistry.sol +++ b/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"; diff --git a/contracts/Pausable.sol b/contracts/Pausable.sol index 184987439..717423b02 100644 --- a/contracts/Pausable.sol +++ b/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 diff --git a/contracts/PolymathRegistry.sol b/contracts/PolymathRegistry.sol index f80144b43..20b5a8bee 100644 --- a/contracts/PolymathRegistry.sol +++ b/contracts/PolymathRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./ReclaimTokens.sol"; diff --git a/contracts/ReclaimTokens.sol b/contracts/ReclaimTokens.sol index 75b8cb192..f14171027 100644 --- a/contracts/ReclaimTokens.sol +++ b/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"; diff --git a/contracts/STRGetter.sol b/contracts/STRGetter.sol index e81f90b40..6b0ffaf8c 100644 --- a/contracts/STRGetter.sol +++ b/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"; diff --git a/contracts/SecurityTokenRegistry.sol b/contracts/SecurityTokenRegistry.sol index f16baab30..5e9d015d2 100644 --- a/contracts/SecurityTokenRegistry.sol +++ b/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"; diff --git a/contracts/datastore/DataStore.sol b/contracts/datastore/DataStore.sol index 50a397838..f0e7ee0fe 100644 --- a/contracts/datastore/DataStore.sol +++ b/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"; diff --git a/contracts/datastore/DataStoreFactory.sol b/contracts/datastore/DataStoreFactory.sol index 3b088f999..1281ac755 100644 --- a/contracts/datastore/DataStoreFactory.sol +++ b/contracts/datastore/DataStoreFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./DataStoreProxy.sol"; diff --git a/contracts/datastore/DataStoreProxy.sol b/contracts/datastore/DataStoreProxy.sol index ea88a8f46..064d628ea 100644 --- a/contracts/datastore/DataStoreProxy.sol +++ b/contracts/datastore/DataStoreProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../proxy/OwnedProxy.sol"; import "./DataStoreStorage.sol"; @@ -14,7 +14,7 @@ contract DataStoreProxy is DataStoreStorage, OwnedProxy { * @param _implementation representing the address of the new implementation to be set */ constructor( - address _securityToken, + address _securityToken, address _implementation ) public diff --git a/contracts/datastore/DataStoreStorage.sol b/contracts/datastore/DataStoreStorage.sol index 64423f39d..33f9bc52c 100644 --- a/contracts/datastore/DataStoreStorage.sol +++ b/contracts/datastore/DataStoreStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/ISecurityToken.sol"; diff --git a/contracts/external/IMedianizer.sol b/contracts/external/IMedianizer.sol index aebe8f77a..94541a5ed 100644 --- a/contracts/external/IMedianizer.sol +++ b/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 diff --git a/contracts/helpers/PolyToken.sol b/contracts/helpers/PolyToken.sol index 5230276e3..9b722153d 100644 --- a/contracts/helpers/PolyToken.sol +++ b/contracts/helpers/PolyToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IPoly.sol"; diff --git a/contracts/interfaces/IBoot.sol b/contracts/interfaces/IBoot.sol index 34d3c3fc1..b18ca841b 100644 --- a/contracts/interfaces/IBoot.sol +++ b/contracts/interfaces/IBoot.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IBoot { /** @@ -7,4 +7,4 @@ interface IBoot { */ function getInitFunction() external pure returns(bytes4); -} \ No newline at end of file +} diff --git a/contracts/interfaces/ICheckPermission.sol b/contracts/interfaces/ICheckPermission.sol index 2e14fa5b9..ac2520713 100644 --- a/contracts/interfaces/ICheckPermission.sol +++ b/contracts/interfaces/ICheckPermission.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface ICheckPermission { /** diff --git a/contracts/interfaces/IDataStore.sol b/contracts/interfaces/IDataStore.sol index 33df6b934..331e56748 100644 --- a/contracts/interfaces/IDataStore.sol +++ b/contracts/interfaces/IDataStore.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IDataStore { /** diff --git a/contracts/interfaces/IFeatureRegistry.sol b/contracts/interfaces/IFeatureRegistry.sol index 563a1a9b8..f56e27acd 100644 --- a/contracts/interfaces/IFeatureRegistry.sol +++ b/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 diff --git a/contracts/interfaces/IModule.sol b/contracts/interfaces/IModule.sol index 3bfc2dcda..f04453752 100644 --- a/contracts/interfaces/IModule.sol +++ b/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 diff --git a/contracts/interfaces/IModuleFactory.sol b/contracts/interfaces/IModuleFactory.sol index 040ad8b30..e4b7868df 100644 --- a/contracts/interfaces/IModuleFactory.sol +++ b/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 diff --git a/contracts/interfaces/IModuleRegistry.sol b/contracts/interfaces/IModuleRegistry.sol index a1bff3dcb..60e28a395 100644 --- a/contracts/interfaces/IModuleRegistry.sol +++ b/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 diff --git a/contracts/interfaces/IOracle.sol b/contracts/interfaces/IOracle.sol index 704814a5a..11aa42bc1 100644 --- a/contracts/interfaces/IOracle.sol +++ b/contracts/interfaces/IOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IOracle { /** diff --git a/contracts/interfaces/IOwnable.sol b/contracts/interfaces/IOwnable.sol index 9f36abea6..abccfc659 100644 --- a/contracts/interfaces/IOwnable.sol +++ b/contracts/interfaces/IOwnable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Ownable diff --git a/contracts/interfaces/IPoly.sol b/contracts/interfaces/IPoly.sol index 0de0cc753..4c936d982 100644 --- a/contracts/interfaces/IPoly.sol +++ b/contracts/interfaces/IPoly.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title ERC20 interface diff --git a/contracts/interfaces/IPolymathRegistry.sol b/contracts/interfaces/IPolymathRegistry.sol index 91a057d54..f137b93cb 100644 --- a/contracts/interfaces/IPolymathRegistry.sol +++ b/contracts/interfaces/IPolymathRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IPolymathRegistry { /** diff --git a/contracts/interfaces/ISTFactory.sol b/contracts/interfaces/ISTFactory.sol index d5d01f79c..0a58e3908 100644 --- a/contracts/interfaces/ISTFactory.sol +++ b/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 @@ -25,7 +25,7 @@ interface ISTFactory { bool _divisible, address _treasuryWallet, address _polymathRegistry - ) - external + ) + external returns(address); } diff --git a/contracts/interfaces/ISTO.sol b/contracts/interfaces/ISTO.sol index 248274e39..7673ca6e3 100644 --- a/contracts/interfaces/ISTO.sol +++ b/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 diff --git a/contracts/interfaces/ISecurityToken.sol b/contracts/interfaces/ISecurityToken.sol index 7fba2be46..6e0de5323 100644 --- a/contracts/interfaces/ISecurityToken.sol +++ b/contracts/interfaces/ISecurityToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Interface for all security tokens @@ -571,7 +571,7 @@ interface ISecurityToken { * but it doesn't mean we operator is allowed to transfer the LOCKED partition values. * Logic for this restriction is written in `operatorTransferByPartition()` function. * @param _operator An address which is being authorised. - */ + */ function authorizeOperator(address _operator) external; /** @@ -614,7 +614,7 @@ interface ISecurityToken { uint256 _value, bytes calldata _data, bytes calldata _operatorData - ) + ) external returns (bytes32); diff --git a/contracts/interfaces/ISecurityTokenRegistry.sol b/contracts/interfaces/ISecurityTokenRegistry.sol index 3f8acf8ed..17b50078d 100644 --- a/contracts/interfaces/ISecurityTokenRegistry.sol +++ b/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 diff --git a/contracts/interfaces/ITransferManager.sol b/contracts/interfaces/ITransferManager.sol index 63d652207..94756351f 100644 --- a/contracts/interfaces/ITransferManager.sol +++ b/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 diff --git a/contracts/interfaces/IUSDTieredSTOProxy.sol b/contracts/interfaces/IUSDTieredSTOProxy.sol index bcbf2b2d9..8871c9857 100644 --- a/contracts/interfaces/IUSDTieredSTOProxy.sol +++ b/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 diff --git a/contracts/interfaces/IUpgradableTokenFactory.sol b/contracts/interfaces/IUpgradableTokenFactory.sol index b5bfe3156..a30039e32 100644 --- a/contracts/interfaces/IUpgradableTokenFactory.sol +++ b/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 diff --git a/contracts/interfaces/IVoting.sol b/contracts/interfaces/IVoting.sol index 915f1bd89..7d75e7d7d 100644 --- a/contracts/interfaces/IVoting.sol +++ b/contracts/interfaces/IVoting.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IVoting { @@ -44,7 +44,7 @@ interface IVoting { * @return uint256 endTime * @return uint256 totalProposals * @return uint256 totalVoters - * @return bool isActive + * @return bool isActive */ function getBallotDetails(uint256 _ballotId) external view returns(uint256, uint256, uint256, uint256, uint256, uint256, uint256, bool); -} \ No newline at end of file +} diff --git a/contracts/interfaces/token/IERC1410.sol b/contracts/interfaces/token/IERC1410.sol index a3bee2445..96a5d0bf8 100644 --- a/contracts/interfaces/token/IERC1410.sol +++ b/contracts/interfaces/token/IERC1410.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IERC1410 { diff --git a/contracts/interfaces/token/IERC1594.sol b/contracts/interfaces/token/IERC1594.sol index 3ad774e3e..79cf13830 100644 --- a/contracts/interfaces/token/IERC1594.sol +++ b/contracts/interfaces/token/IERC1594.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Standard Interface of ERC1594 @@ -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); -} \ No newline at end of file +} diff --git a/contracts/interfaces/token/IERC1643.sol b/contracts/interfaces/token/IERC1643.sol index 4c929defa..33ad85635 100644 --- a/contracts/interfaces/token/IERC1643.sol +++ b/contracts/interfaces/token/IERC1643.sol @@ -1,4 +1,4 @@ -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 @@ -6,14 +6,14 @@ pragma solidity ^0.5.0; 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); -} \ No newline at end of file +} diff --git a/contracts/interfaces/token/IERC1644.sol b/contracts/interfaces/token/IERC1644.sol index d03e1cf30..2367d3df9 100644 --- a/contracts/interfaces/token/IERC1644.sol +++ b/contracts/interfaces/token/IERC1644.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; interface IERC1644 { @@ -25,4 +25,4 @@ interface IERC1644 { bytes _operatorData ); -} \ No newline at end of file +} diff --git a/contracts/libraries/BokkyPooBahsDateTimeLibrary.sol b/contracts/libraries/BokkyPooBahsDateTimeLibrary.sol index 01e437577..6af25046a 100644 --- a/contracts/libraries/BokkyPooBahsDateTimeLibrary.sol +++ b/contracts/libraries/BokkyPooBahsDateTimeLibrary.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; // ---------------------------------------------------------------------------- // BokkyPooBah's DateTime Library v1.01 diff --git a/contracts/libraries/DecimalMath.sol b/contracts/libraries/DecimalMath.sol index 92abcc7de..4b32d8912 100644 --- a/contracts/libraries/DecimalMath.sol +++ b/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"; diff --git a/contracts/libraries/Encoder.sol b/contracts/libraries/Encoder.sol index b3cf9124d..67647264a 100644 --- a/contracts/libraries/Encoder.sol +++ b/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) { diff --git a/contracts/libraries/KindMath.sol b/contracts/libraries/KindMath.sol index e9de30c65..a1339f7a3 100644 --- a/contracts/libraries/KindMath.sol +++ b/contracts/libraries/KindMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title KindMath @@ -21,7 +21,7 @@ library KindMath { uint256 c = a * b; if (c / a == b) return true; - else + else return false; } diff --git a/contracts/libraries/TokenLib.sol b/contracts/libraries/TokenLib.sol index e0f318fa9..1b42fe51b 100644 --- a/contracts/libraries/TokenLib.sol +++ b/contracts/libraries/TokenLib.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IPoly.sol"; import "../modules/UpgradableModuleFactory.sol"; diff --git a/contracts/libraries/Util.sol b/contracts/libraries/Util.sol index b502ca305..04ed231cb 100644 --- a/contracts/libraries/Util.sol +++ b/contracts/libraries/Util.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Utility contract for reusable code diff --git a/contracts/libraries/VersionUtils.sol b/contracts/libraries/VersionUtils.sol index fa4fc5c56..3cbc9abf4 100644 --- a/contracts/libraries/VersionUtils.sol +++ b/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 diff --git a/contracts/libraries/VolumeRestrictionLib.sol b/contracts/libraries/VolumeRestrictionLib.sol index 3672f216e..f53fd4b08 100644 --- a/contracts/libraries/VolumeRestrictionLib.sol +++ b/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"; @@ -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); @@ -179,7 +179,7 @@ library VolumeRestrictionLib { VolumeRestrictionTMStorage.TypeOfPeriod _currentTypeOfPeriod, VolumeRestrictionTMStorage.TypeOfPeriod _callFrom, uint256 _endTime - ) + ) internal pure returns(VolumeRestrictionTMStorage.TypeOfPeriod) diff --git a/contracts/mocks/Dummy/DummySTO.sol b/contracts/mocks/Dummy/DummySTO.sol index 59a3c2904..22e5a7004 100644 --- a/contracts/mocks/Dummy/DummySTO.sol +++ b/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"; diff --git a/contracts/mocks/Dummy/DummySTOFactory.sol b/contracts/mocks/Dummy/DummySTOFactory.sol index 640d0a7d7..65c3b8e4b 100644 --- a/contracts/mocks/Dummy/DummySTOFactory.sol +++ b/contracts/mocks/Dummy/DummySTOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../modules/UpgradableModuleFactory.sol"; import "../../libraries/Util.sol"; diff --git a/contracts/mocks/Dummy/DummySTOProxy.sol b/contracts/mocks/Dummy/DummySTOProxy.sol index 1f7d44620..0085484b6 100644 --- a/contracts/mocks/Dummy/DummySTOProxy.sol +++ b/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"; diff --git a/contracts/mocks/Dummy/DummySTOStorage.sol b/contracts/mocks/Dummy/DummySTOStorage.sol index 922a2836f..718301677 100644 --- a/contracts/mocks/Dummy/DummySTOStorage.sol +++ b/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 @@ -12,4 +12,4 @@ contract DummySTOStorage { mapping (address => uint256) public investors; -} \ No newline at end of file +} diff --git a/contracts/mocks/FunctionSigClash1.sol b/contracts/mocks/FunctionSigClash1.sol index b334f5a00..651d64e38 100644 --- a/contracts/mocks/FunctionSigClash1.sol +++ b/contracts/mocks/FunctionSigClash1.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract functionSigClash1 { // function clash550254402() public { diff --git a/contracts/mocks/FunctionSigClash2.sol b/contracts/mocks/FunctionSigClash2.sol index 10a6bd951..c41e1d61a 100644 --- a/contracts/mocks/FunctionSigClash2.sol +++ b/contracts/mocks/FunctionSigClash2.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract functionSigClash2 { // function proxyOwner() public { diff --git a/contracts/mocks/MockBurnFactory.sol b/contracts/mocks/MockBurnFactory.sol index cc86e52e2..052c888c0 100644 --- a/contracts/mocks/MockBurnFactory.sol +++ b/contracts/mocks/MockBurnFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./MockRedemptionManager.sol"; import "../modules/Experimental/Burn/TrackedRedemptionFactory.sol"; diff --git a/contracts/mocks/MockCountTransferManager.sol b/contracts/mocks/MockCountTransferManager.sol index f3b3ee313..7a1a1d554 100644 --- a/contracts/mocks/MockCountTransferManager.sol +++ b/contracts/mocks/MockCountTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../modules/TransferManager/CTM/CountTransferManager.sol"; diff --git a/contracts/mocks/MockFactory.sol b/contracts/mocks/MockFactory.sol index 3c97c7734..2200f1604 100644 --- a/contracts/mocks/MockFactory.sol +++ b/contracts/mocks/MockFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./Dummy/DummySTOFactory.sol"; diff --git a/contracts/mocks/MockModuleRegistry.sol b/contracts/mocks/MockModuleRegistry.sol index 8dccc7bf6..dbce5fab8 100644 --- a/contracts/mocks/MockModuleRegistry.sol +++ b/contracts/mocks/MockModuleRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../ModuleRegistry.sol"; diff --git a/contracts/mocks/MockOracle.sol b/contracts/mocks/MockOracle.sol index 511c1ef5b..2ef7d5383 100644 --- a/contracts/mocks/MockOracle.sol +++ b/contracts/mocks/MockOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IOracle.sol"; diff --git a/contracts/mocks/MockPolyOracle.sol b/contracts/mocks/MockPolyOracle.sol index 15041a42d..aae3b96f6 100644 --- a/contracts/mocks/MockPolyOracle.sol +++ b/contracts/mocks/MockPolyOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../oracles/PolyOracle.sol"; diff --git a/contracts/mocks/MockRedemptionManager.sol b/contracts/mocks/MockRedemptionManager.sol index afd998ed5..9bcab6c44 100644 --- a/contracts/mocks/MockRedemptionManager.sol +++ b/contracts/mocks/MockRedemptionManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../modules/Experimental/Burn/TrackedRedemption.sol"; @@ -7,7 +7,7 @@ import "../modules/Experimental/Burn/TrackedRedemption.sol"; */ contract MockRedemptionManager is TrackedRedemption { mapping(address => uint256) tokenToRedeem; - mapping(address => mapping(bytes32 => uint256)) redeemedTokensByPartition; + mapping(address => mapping(bytes32 => uint256)) redeemedTokensByPartition; event RedeemedTokenByOwner(address _investor, address _byWhoom, uint256 _value); event RedeemedTokensByPartition(address indexed _investor, address indexed _operator, bytes32 _partition, uint256 _value, bytes _data, bytes _operatorData); diff --git a/contracts/mocks/MockSTGetter.sol b/contracts/mocks/MockSTGetter.sol index 4e7acdedb..249e38920 100644 --- a/contracts/mocks/MockSTGetter.sol +++ b/contracts/mocks/MockSTGetter.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../tokens/STGetter.sol"; diff --git a/contracts/mocks/MockSecurityTokenLogic.sol b/contracts/mocks/MockSecurityTokenLogic.sol index 814ab7bbb..65c275f4d 100644 --- a/contracts/mocks/MockSecurityTokenLogic.sol +++ b/contracts/mocks/MockSecurityTokenLogic.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../tokens/SecurityToken.sol"; diff --git a/contracts/mocks/MockWrongTypeFactory.sol b/contracts/mocks/MockWrongTypeFactory.sol index 4694e15d7..6ab793c9c 100644 --- a/contracts/mocks/MockWrongTypeFactory.sol +++ b/contracts/mocks/MockWrongTypeFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./MockBurnFactory.sol"; import "../modules/ModuleFactory.sol"; diff --git a/contracts/mocks/PolyTokenFaucet.sol b/contracts/mocks/PolyTokenFaucet.sol index 4ebd9863f..78f02b563 100644 --- a/contracts/mocks/PolyTokenFaucet.sol +++ b/contracts/mocks/PolyTokenFaucet.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/contracts/mocks/SecurityTokenMock.sol b/contracts/mocks/SecurityTokenMock.sol index 9f3b6a1d2..6fdd949e2 100644 --- a/contracts/mocks/SecurityTokenMock.sol +++ b/contracts/mocks/SecurityTokenMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../tokens/SecurityToken.sol"; diff --git a/contracts/mocks/SecurityTokenRegistryMock.sol b/contracts/mocks/SecurityTokenRegistryMock.sol index 2ec9d8edd..1dfd3b65c 100644 --- a/contracts/mocks/SecurityTokenRegistryMock.sol +++ b/contracts/mocks/SecurityTokenRegistryMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../SecurityTokenRegistry.sol"; diff --git a/contracts/mocks/TestSTOFactory.sol b/contracts/mocks/TestSTOFactory.sol index 0f90bb183..147f10869 100644 --- a/contracts/mocks/TestSTOFactory.sol +++ b/contracts/mocks/TestSTOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./Dummy/DummySTOFactory.sol"; diff --git a/contracts/modules/Burn/IBurn.sol b/contracts/modules/Burn/IBurn.sol index 64a9b7de9..d40e046d1 100644 --- a/contracts/modules/Burn/IBurn.sol +++ b/contracts/modules/Burn/IBurn.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Interface to be implemented by all checkpoint modules diff --git a/contracts/modules/Checkpoint/Dividend/DividendCheckpoint.sol b/contracts/modules/Checkpoint/Dividend/DividendCheckpoint.sol index 324d53e5a..dee07b225 100644 --- a/contracts/modules/Checkpoint/Dividend/DividendCheckpoint.sol +++ b/contracts/modules/Checkpoint/Dividend/DividendCheckpoint.sol @@ -5,7 +5,7 @@ * the function may fail. If this happens investors can pull their dividends, or the Issuer * can use pushDividendPaymentToAddresses to provide an explict address list in batches */ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import ".././ICheckpoint.sol"; import "../../../storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpoint.sol b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpoint.sol index a8ff1c397..a0fbc36aa 100644 --- a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpoint.sol +++ b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../DividendCheckpoint.sol"; import "./ERC20DividendCheckpointStorage.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointFactory.sol b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointFactory.sol index 1443d7a1f..5368bfbdb 100644 --- a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointFactory.sol +++ b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./ERC20DividendCheckpointProxy.sol"; import "../../../../libraries/Util.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointProxy.sol b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointProxy.sol index 7b13a2bf8..4b060eae1 100644 --- a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointProxy.sol +++ b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./ERC20DividendCheckpointStorage.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointStorage.sol b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointStorage.sol index 1c6bca68c..d83fcde56 100644 --- a/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointStorage.sol +++ b/contracts/modules/Checkpoint/Dividend/ERC20/ERC20DividendCheckpointStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title It holds the storage variables related to ERC20DividendCheckpoint module diff --git a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpoint.sol b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpoint.sol index 419467950..f04a0abb2 100644 --- a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpoint.sol +++ b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../DividendCheckpoint.sol"; import "../../../../interfaces/IOwnable.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointFactory.sol b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointFactory.sol index 97eda239a..014fe9c27 100644 --- a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointFactory.sol +++ b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./EtherDividendCheckpointProxy.sol"; import "../../../../libraries/Util.sol"; diff --git a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointProxy.sol b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointProxy.sol index 3e97b585d..953d6456e 100644 --- a/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointProxy.sol +++ b/contracts/modules/Checkpoint/Dividend/Ether/EtherDividendCheckpointProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../../proxy/OwnedUpgradeabilityProxy.sol"; import "../../../../storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol"; diff --git a/contracts/modules/Checkpoint/ICheckpoint.sol b/contracts/modules/Checkpoint/ICheckpoint.sol index f7b10b77d..4f845fa98 100644 --- a/contracts/modules/Checkpoint/ICheckpoint.sol +++ b/contracts/modules/Checkpoint/ICheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Interface to be implemented by all checkpoint modules diff --git a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpoint.sol b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpoint.sol index a08677222..7af068726 100644 --- a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpoint.sol +++ b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../VotingCheckpoint.sol"; import "./PLCRVotingCheckpointStorage.sol"; @@ -34,7 +34,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { Module(_securityToken, _polyAddress) { - } + } /** * @notice Use to create the ballot @@ -48,7 +48,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { uint256 _revealDuration, uint256 _noOfProposals, uint256 _proposedQuorum - ) + ) external withPerm(ADMIN) { @@ -98,7 +98,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { require(_proposedQuorum <= 100 * 10 ** 16, "Invalid quorum percentage"); // not more than 100 % // Overflow check require( - uint64(_commitDuration) == _commitDuration && + uint64(_commitDuration) == _commitDuration && uint64(_revealDuration) == _revealDuration && uint64(_startTime) == _startTime && uint24(_totalProposals) == _totalProposals, @@ -203,12 +203,12 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { * Use to check whether the voter is allowed to vote or not * @param _ballotId The index of the target ballot * @param _voter Address of the voter - * @return bool + * @return bool */ function isVoterAllowed(uint256 _ballotId, address _voter) public view returns(bool) { bool allowed = (ballots[_ballotId].exemptedVoters[_voter] || (defaultExemptIndex[_voter] != 0)); return !allowed; - } + } /** * @notice Allows the token issuer to set the active stats of a ballot @@ -265,7 +265,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { ) { if (_ballotId >= ballots.length) return (new uint256[](0), new uint256[](0), 0, false, 0); - + Ballot storage ballot = ballots[_ballotId]; uint256 i = 0; uint256 counter = 0; @@ -288,7 +288,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { counter ++; } } - + tieWith = new uint256[](counter); if (counter > 0) { counter = 0; @@ -296,7 +296,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { if (maxWeight == ballot.proposalToVotes[i + 1] && (i + 1) != winningProposal) { tieWith[counter] = i + 1; counter ++; - } + } } } totalVotes = uint256(ballot.totalVoters); @@ -323,7 +323,7 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { * @return uint256 endTime * @return uint256 totalProposals * @return uint256 totalVoters - * @return bool isActive + * @return bool isActive */ function getBallotDetails(uint256 _ballotId) external view returns(uint256, uint256, uint256, uint256, uint256, uint256, uint256, bool) { Ballot memory ballot = ballots[_ballotId]; @@ -375,4 +375,4 @@ contract PLCRVotingCheckpoint is PLCRVotingCheckpointStorage, VotingCheckpoint { require(ballots.length > _ballotId, "Index out of bound"); } -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointFactory.sol b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointFactory.sol index cb0f07efe..915aaa4ec 100644 --- a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointFactory.sol +++ b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./PLCRVotingCheckpointProxy.sol"; import "../../../../libraries/Util.sol"; @@ -50,4 +50,4 @@ contract PLCRVotingCheckpointFactory is UpgradableModuleFactory { _initializeModule(plcrVotingCheckpoint, _data); return plcrVotingCheckpoint; } -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointProxy.sol b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointProxy.sol index f225511c1..d206b51fc 100644 --- a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointProxy.sol +++ b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../../Pausable.sol"; import "./PLCRVotingCheckpointStorage.sol"; @@ -29,4 +29,4 @@ contract PLCRVotingCheckpointProxy is PLCRVotingCheckpointStorage, VotingCheckpo _upgradeTo(_version, _implementation); } -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointStorage.sol b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointStorage.sol index 99be4a0c6..a4e217e04 100644 --- a/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointStorage.sol +++ b/contracts/modules/Checkpoint/Voting/PLCR/PLCRVotingCheckpointStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract PLCRVotingCheckpointStorage { @@ -24,4 +24,4 @@ contract PLCRVotingCheckpointStorage { } Ballot[] ballots; -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpoint.sol b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpoint.sol index 04a1b7828..bc186a5e0 100644 --- a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpoint.sol +++ b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../VotingCheckpoint.sol"; import "./WeightedVoteCheckpointStorage.sol"; @@ -63,7 +63,7 @@ contract WeightedVoteCheckpoint is WeightedVoteCheckpointStorage, VotingCheckpoi uint256 _startTime, uint256 _endTime, uint256 _noOfProposals - ) + ) internal { require(_noOfProposals > 1, "Incorrect proposals no"); @@ -155,12 +155,12 @@ contract WeightedVoteCheckpoint is WeightedVoteCheckpointStorage, VotingCheckpoi * Use to check whether the voter is allowed to vote or not * @param _ballotId The index of the target ballot * @param _voter Address of the voter - * @return bool + * @return bool */ function isVoterAllowed(uint256 _ballotId, address _voter) public view returns(bool) { bool allowed = (ballots[_ballotId].exemptedVoters[_voter] || (defaultExemptIndex[_voter] != 0)); return !allowed; - } + } /** * @notice Allows the token issuer to set the active stats of a ballot @@ -216,7 +216,7 @@ contract WeightedVoteCheckpoint is WeightedVoteCheckpointStorage, VotingCheckpoi counter ++; } } - + tieWith = new uint256[](counter); if (counter > 0) { counter = 0; @@ -224,7 +224,7 @@ contract WeightedVoteCheckpoint is WeightedVoteCheckpointStorage, VotingCheckpoi if (maxWeight == ballot.proposalToVotes[i + 1] && (i + 1) != winningProposal) { tieWith[counter] = i + 1; counter ++; - } + } } } totalVotes = uint256(ballot.totalVoters); @@ -251,7 +251,7 @@ contract WeightedVoteCheckpoint is WeightedVoteCheckpointStorage, VotingCheckpoi * @return uint256 endTime * @return uint256 totalProposals * @return uint256 totalVoters - * @return bool isActive + * @return bool isActive */ function getBallotDetails(uint256 _ballotId) external view returns(uint256, uint256, uint256, uint256, uint256, uint256, uint256, bool) { Ballot memory ballot = ballots[_ballotId]; diff --git a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointFactory.sol b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointFactory.sol index 65c530b6a..4eadd22a5 100644 --- a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointFactory.sol +++ b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./WeightedVoteCheckpointProxy.sol"; import "../../../../libraries/Util.sol"; diff --git a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointProxy.sol b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointProxy.sol index b926b0371..da71404ed 100644 --- a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointProxy.sol +++ b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../../Pausable.sol"; import "./WeightedVoteCheckpointStorage.sol"; @@ -29,4 +29,4 @@ contract WeightedVoteCheckpointProxy is WeightedVoteCheckpointStorage, VotingChe _upgradeTo(_version, _implementation); } -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointStorage.sol b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointStorage.sol index 776427102..fec3cf97f 100644 --- a/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointStorage.sol +++ b/contracts/modules/Checkpoint/Voting/Transparent/WeightedVoteCheckpointStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract WeightedVoteCheckpointStorage { @@ -8,7 +8,7 @@ contract WeightedVoteCheckpointStorage { uint64 startTime; // Timestamp at which ballot will come into effect uint64 endTime; // Timestamp at which ballot will no more into effect uint64 totalProposals; // Count of proposals allowed for a given ballot - uint56 totalVoters; // Count of voters who vote for the given ballot + uint56 totalVoters; // Count of voters who vote for the given ballot bool isActive; // flag used to turn off/on the ballot mapping(uint256 => uint256) proposalToVotes; // Mapping for proposal to total weight collected by the proposal mapping(address => uint256) investorToProposal; // mapping for storing vote details of a voter @@ -16,4 +16,4 @@ contract WeightedVoteCheckpointStorage { } Ballot[] ballots; -} \ No newline at end of file +} diff --git a/contracts/modules/Checkpoint/Voting/VotingCheckpoint.sol b/contracts/modules/Checkpoint/Voting/VotingCheckpoint.sol index 77ae226ea..c938bb47c 100644 --- a/contracts/modules/Checkpoint/Voting/VotingCheckpoint.sol +++ b/contracts/modules/Checkpoint/Voting/VotingCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../interfaces/IVoting.sol"; import "../../Module.sol"; @@ -53,4 +53,4 @@ contract VotingCheckpoint is VotingCheckpointStorage, ICheckpoint, IVoting, Modu function getDefaultExemptionVotersList() external view returns(address[] memory) { return defaultExemptedVoters; } -} \ No newline at end of file +} diff --git a/contracts/modules/Experimental/Burn/TrackedRedemption.sol b/contracts/modules/Experimental/Burn/TrackedRedemption.sol index 4f6c1d4ce..7edf4809e 100644 --- a/contracts/modules/Experimental/Burn/TrackedRedemption.sol +++ b/contracts/modules/Experimental/Burn/TrackedRedemption.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../Burn/IBurn.sol"; import "../../Module.sol"; diff --git a/contracts/modules/Experimental/Burn/TrackedRedemptionFactory.sol b/contracts/modules/Experimental/Burn/TrackedRedemptionFactory.sol index db7da70ef..4f1ad14bd 100644 --- a/contracts/modules/Experimental/Burn/TrackedRedemptionFactory.sol +++ b/contracts/modules/Experimental/Burn/TrackedRedemptionFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./TrackedRedemption.sol"; import "../../ModuleFactory.sol"; diff --git a/contracts/modules/Experimental/Mixed/ScheduledCheckpoint.sol b/contracts/modules/Experimental/Mixed/ScheduledCheckpoint.sol index 280822529..67fb7b88c 100644 --- a/contracts/modules/Experimental/Mixed/ScheduledCheckpoint.sol +++ b/contracts/modules/Experimental/Mixed/ScheduledCheckpoint.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./../../Checkpoint/ICheckpoint.sol"; import "../../TransferManager/TransferManager.sol"; @@ -194,7 +194,7 @@ contract ScheduledCheckpoint is ICheckpoint, TransferManager { _update(names[i]); } } - + /** * @notice Return the permissions flag that are associated with CountTransferManager */ diff --git a/contracts/modules/Experimental/Mixed/ScheduledCheckpointFactory.sol b/contracts/modules/Experimental/Mixed/ScheduledCheckpointFactory.sol index 99ddf7b8e..5c6cb3142 100644 --- a/contracts/modules/Experimental/Mixed/ScheduledCheckpointFactory.sol +++ b/contracts/modules/Experimental/Mixed/ScheduledCheckpointFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./ScheduledCheckpoint.sol"; import "../../ModuleFactory.sol"; diff --git a/contracts/modules/Experimental/TransferManager/KYCTransferManager.sol b/contracts/modules/Experimental/TransferManager/KYCTransferManager.sol index 3de147d50..c30ad4699 100644 --- a/contracts/modules/Experimental/TransferManager/KYCTransferManager.sol +++ b/contracts/modules/Experimental/TransferManager/KYCTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../TransferManager/TransferManager.sol"; import "../../../interfaces/ISecurityToken.sol"; diff --git a/contracts/modules/Experimental/TransferManager/KYCTransferManagerFactory.sol b/contracts/modules/Experimental/TransferManager/KYCTransferManagerFactory.sol index a0c0912cb..3b069bf52 100644 --- a/contracts/modules/Experimental/TransferManager/KYCTransferManagerFactory.sol +++ b/contracts/modules/Experimental/TransferManager/KYCTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./KYCTransferManager.sol"; import "./../../ModuleFactory.sol"; diff --git a/contracts/modules/Experimental/TransferManager/SignedTransferManager.sol b/contracts/modules/Experimental/TransferManager/SignedTransferManager.sol index f6ad9fc3f..0e2e80b87 100644 --- a/contracts/modules/Experimental/TransferManager/SignedTransferManager.sol +++ b/contracts/modules/Experimental/TransferManager/SignedTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../TransferManager/TransferManager.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/contracts/modules/Experimental/TransferManager/SignedTransferManagerFactory.sol b/contracts/modules/Experimental/TransferManager/SignedTransferManagerFactory.sol index 74826a9d9..107255cb2 100644 --- a/contracts/modules/Experimental/TransferManager/SignedTransferManagerFactory.sol +++ b/contracts/modules/Experimental/TransferManager/SignedTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./SignedTransferManager.sol"; import "../../ModuleFactory.sol"; diff --git a/contracts/modules/Module.sol b/contracts/modules/Module.sol index 21a33a7f6..e1dd57841 100644 --- a/contracts/modules/Module.sol +++ b/contracts/modules/Module.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IModule.sol"; import "../Pausable.sol"; @@ -106,5 +106,5 @@ contract Module is IModule, ModuleStorage, Pausable { function reclaimETH() external { _onlySecurityTokenOwner(); msg.sender.transfer(address(this).balance); - } + } } diff --git a/contracts/modules/ModuleFactory.sol b/contracts/modules/ModuleFactory.sol index 676d9773f..a329fa15d 100644 --- a/contracts/modules/ModuleFactory.sol +++ b/contracts/modules/ModuleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../libraries/VersionUtils.sol"; import "../libraries/Util.sol"; diff --git a/contracts/modules/PermissionManager/GeneralPermissionManager.sol b/contracts/modules/PermissionManager/GeneralPermissionManager.sol index c6b93cb32..5912aaf73 100644 --- a/contracts/modules/PermissionManager/GeneralPermissionManager.sol +++ b/contracts/modules/PermissionManager/GeneralPermissionManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./IPermissionManager.sol"; import "../Module.sol"; diff --git a/contracts/modules/PermissionManager/GeneralPermissionManagerFactory.sol b/contracts/modules/PermissionManager/GeneralPermissionManagerFactory.sol index 6a95b2473..f97bfbc2b 100644 --- a/contracts/modules/PermissionManager/GeneralPermissionManagerFactory.sol +++ b/contracts/modules/PermissionManager/GeneralPermissionManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../UpgradableModuleFactory.sol"; import "./GeneralPermissionManagerProxy.sol"; diff --git a/contracts/modules/PermissionManager/GeneralPermissionManagerProxy.sol b/contracts/modules/PermissionManager/GeneralPermissionManagerProxy.sol index bd721c887..6272eb908 100644 --- a/contracts/modules/PermissionManager/GeneralPermissionManagerProxy.sol +++ b/contracts/modules/PermissionManager/GeneralPermissionManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../proxy/OwnedUpgradeabilityProxy.sol"; import "../../Pausable.sol"; diff --git a/contracts/modules/PermissionManager/GeneralPermissionManagerStorage.sol b/contracts/modules/PermissionManager/GeneralPermissionManagerStorage.sol index a0e55021a..a9559c08f 100644 --- a/contracts/modules/PermissionManager/GeneralPermissionManagerStorage.sol +++ b/contracts/modules/PermissionManager/GeneralPermissionManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the GeneralPermissionManager storage diff --git a/contracts/modules/PermissionManager/IPermissionManager.sol b/contracts/modules/PermissionManager/IPermissionManager.sol index f1fdc69b5..9872e53d5 100644 --- a/contracts/modules/PermissionManager/IPermissionManager.sol +++ b/contracts/modules/PermissionManager/IPermissionManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Interface to be implemented by all permission manager modules diff --git a/contracts/modules/STO/Capped/CappedSTO.sol b/contracts/modules/STO/Capped/CappedSTO.sol index adc89d5a9..6ab303b6f 100644 --- a/contracts/modules/STO/Capped/CappedSTO.sol +++ b/contracts/modules/STO/Capped/CappedSTO.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../STO.sol"; import "openzeppelin-solidity/contracts/utils/ReentrancyGuard.sol"; diff --git a/contracts/modules/STO/Capped/CappedSTOFactory.sol b/contracts/modules/STO/Capped/CappedSTOFactory.sol index a724c60d3..e49bcb021 100644 --- a/contracts/modules/STO/Capped/CappedSTOFactory.sol +++ b/contracts/modules/STO/Capped/CappedSTOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "../../../libraries/Util.sol"; diff --git a/contracts/modules/STO/Capped/CappedSTOProxy.sol b/contracts/modules/STO/Capped/CappedSTOProxy.sol index 09b64ccba..7abafe7f3 100644 --- a/contracts/modules/STO/Capped/CappedSTOProxy.sol +++ b/contracts/modules/STO/Capped/CappedSTOProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "../../../Pausable.sol"; diff --git a/contracts/modules/STO/Capped/CappedSTOStorage.sol b/contracts/modules/STO/Capped/CappedSTOStorage.sol index 7ddeea403..f5c0fabef 100644 --- a/contracts/modules/STO/Capped/CappedSTOStorage.sol +++ b/contracts/modules/STO/Capped/CappedSTOStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the CappedSTO storage @@ -16,4 +16,4 @@ contract CappedSTOStorage { mapping (address => uint256) public investors; -} \ No newline at end of file +} diff --git a/contracts/modules/STO/PreSale/PreSaleSTO.sol b/contracts/modules/STO/PreSale/PreSaleSTO.sol index 5a1656709..863127f47 100644 --- a/contracts/modules/STO/PreSale/PreSaleSTO.sol +++ b/contracts/modules/STO/PreSale/PreSaleSTO.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../STO.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/contracts/modules/STO/PreSale/PreSaleSTOFactory.sol b/contracts/modules/STO/PreSale/PreSaleSTOFactory.sol index cee2e5409..a0b037af6 100644 --- a/contracts/modules/STO/PreSale/PreSaleSTOFactory.sol +++ b/contracts/modules/STO/PreSale/PreSaleSTOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "../../../libraries/Util.sol"; diff --git a/contracts/modules/STO/PreSale/PreSaleSTOProxy.sol b/contracts/modules/STO/PreSale/PreSaleSTOProxy.sol index 1de8630d2..c2d3268ad 100644 --- a/contracts/modules/STO/PreSale/PreSaleSTOProxy.sol +++ b/contracts/modules/STO/PreSale/PreSaleSTOProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "../../../Pausable.sol"; diff --git a/contracts/modules/STO/PreSale/PreSaleSTOStorage.sol b/contracts/modules/STO/PreSale/PreSaleSTOStorage.sol index f1b008259..8ff56cd77 100644 --- a/contracts/modules/STO/PreSale/PreSaleSTOStorage.sol +++ b/contracts/modules/STO/PreSale/PreSaleSTOStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the PreSaleSTO storage @@ -7,4 +7,4 @@ contract PreSaleSTOStorage { mapping (address => uint256) public investors; -} \ No newline at end of file +} diff --git a/contracts/modules/STO/STO.sol b/contracts/modules/STO/STO.sol index d80c9d139..c1ca2606a 100644 --- a/contracts/modules/STO/STO.sol +++ b/contracts/modules/STO/STO.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../Module.sol"; import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/modules/STO/USDTiered/USDTieredSTO.sol b/contracts/modules/STO/USDTiered/USDTieredSTO.sol index 67b2fc6f1..1bc3a1267 100644 --- a/contracts/modules/STO/USDTiered/USDTieredSTO.sol +++ b/contracts/modules/STO/USDTiered/USDTieredSTO.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../STO.sol"; import "../../../interfaces/IPolymathRegistry.sol"; diff --git a/contracts/modules/STO/USDTiered/USDTieredSTOFactory.sol b/contracts/modules/STO/USDTiered/USDTieredSTOFactory.sol index f0810a677..fc20d8537 100644 --- a/contracts/modules/STO/USDTiered/USDTieredSTOFactory.sol +++ b/contracts/modules/STO/USDTiered/USDTieredSTOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../interfaces/IBoot.sol"; import "./USDTieredSTOProxy.sol"; diff --git a/contracts/modules/STO/USDTiered/USDTieredSTOProxy.sol b/contracts/modules/STO/USDTiered/USDTieredSTOProxy.sol index c091d78ac..4bb3caf5d 100644 --- a/contracts/modules/STO/USDTiered/USDTieredSTOProxy.sol +++ b/contracts/modules/STO/USDTiered/USDTieredSTOProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./USDTieredSTOStorage.sol"; diff --git a/contracts/modules/STO/USDTiered/USDTieredSTOStorage.sol b/contracts/modules/STO/USDTiered/USDTieredSTOStorage.sol index 75a1f6d1c..ce61103c3 100644 --- a/contracts/modules/STO/USDTiered/USDTieredSTOStorage.sol +++ b/contracts/modules/STO/USDTiered/USDTieredSTOStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the USDTieredSTO storage diff --git a/contracts/modules/TransferManager/BTM/BlacklistTransferManager.sol b/contracts/modules/TransferManager/BTM/BlacklistTransferManager.sol index aa1ab5ff9..a797b6779 100644 --- a/contracts/modules/TransferManager/BTM/BlacklistTransferManager.sol +++ b/contracts/modules/TransferManager/BTM/BlacklistTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../TransferManager.sol"; import "./BlacklistTransferManagerStorage.sol"; @@ -443,11 +443,11 @@ contract BlacklistTransferManager is BlacklistTransferManagerStorage, TransferMa uint256 currentBalance = (msg.sender == securityToken) ? (IERC20(securityToken).balanceOf(_tokenHolder)).add(_additionalBalance) : IERC20(securityToken).balanceOf(_tokenHolder); if (paused && _partition == UNLOCKED) return currentBalance; - + (Result success, ) = verifyTransfer(_tokenHolder, address(0), 0, "0x0"); if ((_partition == LOCKED && success == Result.INVALID) || (_partition == UNLOCKED && success != Result.INVALID)) return currentBalance; - else + else return 0; } diff --git a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerFactory.sol b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerFactory.sol index 44e227554..ed1d7563b 100644 --- a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "./BlacklistTransferManagerProxy.sol"; diff --git a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerProxy.sol b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerProxy.sol index fc99fc4d5..8914ba0fa 100644 --- a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./BlacklistTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerStorage.sol b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerStorage.sol index c8f460164..229c1a994 100644 --- a/contracts/modules/TransferManager/BTM/BlacklistTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/BTM/BlacklistTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the CountTransferManager storage diff --git a/contracts/modules/TransferManager/CTM/CountTransferManager.sol b/contracts/modules/TransferManager/CTM/CountTransferManager.sol index ab3e3d743..6b244d5af 100644 --- a/contracts/modules/TransferManager/CTM/CountTransferManager.sol +++ b/contracts/modules/TransferManager/CTM/CountTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../TransferManager.sol"; import "./CountTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/CTM/CountTransferManagerFactory.sol b/contracts/modules/TransferManager/CTM/CountTransferManagerFactory.sol index 397aca56a..92334c580 100644 --- a/contracts/modules/TransferManager/CTM/CountTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/CTM/CountTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "./CountTransferManagerProxy.sol"; diff --git a/contracts/modules/TransferManager/CTM/CountTransferManagerProxy.sol b/contracts/modules/TransferManager/CTM/CountTransferManagerProxy.sol index 488f78dc8..8a302309b 100644 --- a/contracts/modules/TransferManager/CTM/CountTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/CTM/CountTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./CountTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/CTM/CountTransferManagerStorage.sol b/contracts/modules/TransferManager/CTM/CountTransferManagerStorage.sol index bc755d301..cd262a4ab 100644 --- a/contracts/modules/TransferManager/CTM/CountTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/CTM/CountTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the CountTransferManager storage diff --git a/contracts/modules/TransferManager/GTM/GeneralTransferManager.sol b/contracts/modules/TransferManager/GTM/GeneralTransferManager.sol index 874e47263..1cada4165 100644 --- a/contracts/modules/TransferManager/GTM/GeneralTransferManager.sol +++ b/contracts/modules/TransferManager/GTM/GeneralTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../TransferManager.sol"; import "../../../libraries/Encoder.sol"; diff --git a/contracts/modules/TransferManager/GTM/GeneralTransferManagerFactory.sol b/contracts/modules/TransferManager/GTM/GeneralTransferManagerFactory.sol index 3d4e15b85..8674a5216 100644 --- a/contracts/modules/TransferManager/GTM/GeneralTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/GTM/GeneralTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./GeneralTransferManagerProxy.sol"; import "../../UpgradableModuleFactory.sol"; diff --git a/contracts/modules/TransferManager/GTM/GeneralTransferManagerProxy.sol b/contracts/modules/TransferManager/GTM/GeneralTransferManagerProxy.sol index fd44b9fbf..3cde10800 100644 --- a/contracts/modules/TransferManager/GTM/GeneralTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/GTM/GeneralTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./GeneralTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/GTM/GeneralTransferManagerStorage.sol b/contracts/modules/TransferManager/GTM/GeneralTransferManagerStorage.sol index 4e61eb75f..911af513c 100644 --- a/contracts/modules/TransferManager/GTM/GeneralTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/GTM/GeneralTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Transfer Manager module for core transfer validation functionality diff --git a/contracts/modules/TransferManager/LTM/LockUpTransferManager.sol b/contracts/modules/TransferManager/LTM/LockUpTransferManager.sol index 22c40da48..ac9d9eb5e 100644 --- a/contracts/modules/TransferManager/LTM/LockUpTransferManager.sol +++ b/contracts/modules/TransferManager/LTM/LockUpTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../TransferManager/TransferManager.sol"; import "./LockUpTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/LTM/LockUpTransferManagerFactory.sol b/contracts/modules/TransferManager/LTM/LockUpTransferManagerFactory.sol index b0ce1b000..113d06f97 100644 --- a/contracts/modules/TransferManager/LTM/LockUpTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/LTM/LockUpTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./LockUpTransferManagerProxy.sol"; import "../../UpgradableModuleFactory.sol"; diff --git a/contracts/modules/TransferManager/LTM/LockUpTransferManagerProxy.sol b/contracts/modules/TransferManager/LTM/LockUpTransferManagerProxy.sol index cd198f478..8d627cc73 100644 --- a/contracts/modules/TransferManager/LTM/LockUpTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/LTM/LockUpTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./LockUpTransferManagerStorage.sol"; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; diff --git a/contracts/modules/TransferManager/LTM/LockUpTransferManagerStorage.sol b/contracts/modules/TransferManager/LTM/LockUpTransferManagerStorage.sol index c24bee80e..aaaf855da 100644 --- a/contracts/modules/TransferManager/LTM/LockUpTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/LTM/LockUpTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Wallet for core vesting escrow functionality diff --git a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManager.sol b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManager.sol index 1d44d6d6a..c63e03a3c 100644 --- a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManager.sol +++ b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../TransferManager.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerFactory.sol b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerFactory.sol index 0d671a388..300df118d 100644 --- a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "./ManualApprovalTransferManagerProxy.sol"; diff --git a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerProxy.sol b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerProxy.sol index 74e19d75c..c2997b254 100644 --- a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./ManualApprovalTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerStorage.sol b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerStorage.sol index e4a5aa6c6..b97293968 100644 --- a/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/MATM/ManualApprovalTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the ManualApprovalTransferManager storage diff --git a/contracts/modules/TransferManager/PTM/PercentageTransferManager.sol b/contracts/modules/TransferManager/PTM/PercentageTransferManager.sol index 5f3971b11..f4efd9802 100644 --- a/contracts/modules/TransferManager/PTM/PercentageTransferManager.sol +++ b/contracts/modules/TransferManager/PTM/PercentageTransferManager.sol @@ -5,7 +5,7 @@ * higher than the intended limit. */ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../TransferManager.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/contracts/modules/TransferManager/PTM/PercentageTransferManagerFactory.sol b/contracts/modules/TransferManager/PTM/PercentageTransferManagerFactory.sol index b9c782b09..27d23853b 100644 --- a/contracts/modules/TransferManager/PTM/PercentageTransferManagerFactory.sol +++ b/contracts/modules/TransferManager/PTM/PercentageTransferManagerFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../UpgradableModuleFactory.sol"; import "../../../libraries/Util.sol"; diff --git a/contracts/modules/TransferManager/PTM/PercentageTransferManagerProxy.sol b/contracts/modules/TransferManager/PTM/PercentageTransferManagerProxy.sol index 2aaac7809..840da18b2 100644 --- a/contracts/modules/TransferManager/PTM/PercentageTransferManagerProxy.sol +++ b/contracts/modules/TransferManager/PTM/PercentageTransferManagerProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./PercentageTransferManagerStorage.sol"; diff --git a/contracts/modules/TransferManager/PTM/PercentageTransferManagerStorage.sol b/contracts/modules/TransferManager/PTM/PercentageTransferManagerStorage.sol index c5a8c8976..018d2134f 100644 --- a/contracts/modules/TransferManager/PTM/PercentageTransferManagerStorage.sol +++ b/contracts/modules/TransferManager/PTM/PercentageTransferManagerStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Contract used to store layout for the PercentageTransferManager storage diff --git a/contracts/modules/TransferManager/TransferManager.sol b/contracts/modules/TransferManager/TransferManager.sol index 45a34a2ad..f5384ee73 100644 --- a/contracts/modules/TransferManager/TransferManager.sol +++ b/contracts/modules/TransferManager/TransferManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../Module.sol"; import "../../interfaces/ITransferManager.sol"; diff --git a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTM.sol b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTM.sol index 12bef17d8..b1dbe36d8 100644 --- a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTM.sol +++ b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTM.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/math/Math.sol"; diff --git a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMFactory.sol b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMFactory.sol index a9f3c3939..8b57e2a97 100644 --- a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMFactory.sol +++ b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./VolumeRestrictionTMProxy.sol"; import "../../UpgradableModuleFactory.sol"; diff --git a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMProxy.sol b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMProxy.sol index 4fcb37f1c..f084e8c02 100644 --- a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMProxy.sol +++ b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../../proxy/OwnedUpgradeabilityProxy.sol"; import "./VolumeRestrictionTMStorage.sol"; diff --git a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMStorage.sol b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMStorage.sol index 293aa5810..febd4fc10 100644 --- a/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMStorage.sol +++ b/contracts/modules/TransferManager/VRTM/VolumeRestrictionTMStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Storage layout for VolumeRestrictionTM diff --git a/contracts/modules/UpgradableModuleFactory.sol b/contracts/modules/UpgradableModuleFactory.sol index 01dab6430..540d6638f 100644 --- a/contracts/modules/UpgradableModuleFactory.sol +++ b/contracts/modules/UpgradableModuleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./ModuleFactory.sol"; import "../interfaces/IModuleRegistry.sol"; diff --git a/contracts/modules/Wallet/VestingEscrowWallet.sol b/contracts/modules/Wallet/VestingEscrowWallet.sol index 565944646..70ea3fe4b 100644 --- a/contracts/modules/Wallet/VestingEscrowWallet.sol +++ b/contracts/modules/Wallet/VestingEscrowWallet.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; import "./Wallet.sol"; diff --git a/contracts/modules/Wallet/VestingEscrowWalletFactory.sol b/contracts/modules/Wallet/VestingEscrowWalletFactory.sol index c2bfb2ece..dda6424d3 100644 --- a/contracts/modules/Wallet/VestingEscrowWalletFactory.sol +++ b/contracts/modules/Wallet/VestingEscrowWalletFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./VestingEscrowWalletProxy.sol"; import "../../interfaces/IBoot.sol"; diff --git a/contracts/modules/Wallet/VestingEscrowWalletProxy.sol b/contracts/modules/Wallet/VestingEscrowWalletProxy.sol index b3073e5e2..05b74c77d 100644 --- a/contracts/modules/Wallet/VestingEscrowWalletProxy.sol +++ b/contracts/modules/Wallet/VestingEscrowWalletProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../../proxy/OwnedUpgradeabilityProxy.sol"; import "./VestingEscrowWalletStorage.sol"; diff --git a/contracts/modules/Wallet/VestingEscrowWalletStorage.sol b/contracts/modules/Wallet/VestingEscrowWalletStorage.sol index 98c0e50ec..1c8b27a9f 100644 --- a/contracts/modules/Wallet/VestingEscrowWalletStorage.sol +++ b/contracts/modules/Wallet/VestingEscrowWalletStorage.sol @@ -1,10 +1,10 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Wallet for core vesting escrow functionality */ contract VestingEscrowWalletStorage { - + struct Schedule { // Name of the template bytes32 templateName; diff --git a/contracts/modules/Wallet/Wallet.sol b/contracts/modules/Wallet/Wallet.sol index 0e89bb8e0..0b8b48002 100644 --- a/contracts/modules/Wallet/Wallet.sol +++ b/contracts/modules/Wallet/Wallet.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../Module.sol"; diff --git a/contracts/oracles/MakerDAOOracle.sol b/contracts/oracles/MakerDAOOracle.sol index f28c9e965..71661e446 100644 --- a/contracts/oracles/MakerDAOOracle.sol +++ b/contracts/oracles/MakerDAOOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IOracle.sol"; import "../external/IMedianizer.sol"; diff --git a/contracts/oracles/PolyOracle.sol b/contracts/oracles/PolyOracle.sol index 7345e5395..367f19b0c 100644 --- a/contracts/oracles/PolyOracle.sol +++ b/contracts/oracles/PolyOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../external/oraclizeAPI.sol"; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; diff --git a/contracts/oracles/StableOracle.sol b/contracts/oracles/StableOracle.sol index 3dabf26d2..aaa8014e5 100644 --- a/contracts/oracles/StableOracle.sol +++ b/contracts/oracles/StableOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../interfaces/IOracle.sol"; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; diff --git a/contracts/proxy/ModuleRegistryProxy.sol b/contracts/proxy/ModuleRegistryProxy.sol index 168905a56..9c286993f 100644 --- a/contracts/proxy/ModuleRegistryProxy.sol +++ b/contracts/proxy/ModuleRegistryProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../storage/EternalStorage.sol"; import "./OwnedUpgradeabilityProxy.sol"; diff --git a/contracts/proxy/OwnedProxy.sol b/contracts/proxy/OwnedProxy.sol index efadc00cf..c0ec6f75e 100644 --- a/contracts/proxy/OwnedProxy.sol +++ b/contracts/proxy/OwnedProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./Proxy.sol"; diff --git a/contracts/proxy/OwnedUpgradeabilityProxy.sol b/contracts/proxy/OwnedUpgradeabilityProxy.sol index f81fc289d..7e3b837f2 100644 --- a/contracts/proxy/OwnedUpgradeabilityProxy.sol +++ b/contracts/proxy/OwnedUpgradeabilityProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./UpgradeabilityProxy.sol"; diff --git a/contracts/proxy/Proxy.sol b/contracts/proxy/Proxy.sol index ac9d471ca..aa19442ca 100644 --- a/contracts/proxy/Proxy.sol +++ b/contracts/proxy/Proxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Proxy diff --git a/contracts/proxy/SecurityTokenRegistryProxy.sol b/contracts/proxy/SecurityTokenRegistryProxy.sol index 906797985..4a30439e8 100644 --- a/contracts/proxy/SecurityTokenRegistryProxy.sol +++ b/contracts/proxy/SecurityTokenRegistryProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../storage/EternalStorage.sol"; import "./OwnedUpgradeabilityProxy.sol"; diff --git a/contracts/proxy/UpgradeabilityProxy.sol b/contracts/proxy/UpgradeabilityProxy.sol index dc702dae9..59949f90d 100644 --- a/contracts/proxy/UpgradeabilityProxy.sol +++ b/contracts/proxy/UpgradeabilityProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./Proxy.sol"; import "openzeppelin-solidity/contracts/utils/Address.sol"; diff --git a/contracts/storage/EternalStorage.sol b/contracts/storage/EternalStorage.sol index a3b914b60..e7ff6acb5 100644 --- a/contracts/storage/EternalStorage.sol +++ b/contracts/storage/EternalStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract EternalStorage { /// @notice Internal mappings used to store all kinds on data into the contract diff --git a/contracts/storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol b/contracts/storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol index eeafa0743..94fc0962b 100644 --- a/contracts/storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol +++ b/contracts/storage/modules/Checkpoint/Dividend/DividendCheckpointStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Holds the storage variable for the DividendCheckpoint modules (i.e ERC20, Ether) diff --git a/contracts/storage/modules/Checkpoint/Voting/VotingCheckpointStorage.sol b/contracts/storage/modules/Checkpoint/Voting/VotingCheckpointStorage.sol index 868e9d4db..d4b728572 100644 --- a/contracts/storage/modules/Checkpoint/Voting/VotingCheckpointStorage.sol +++ b/contracts/storage/modules/Checkpoint/Voting/VotingCheckpointStorage.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract VotingCheckpointStorage { mapping(address => uint256) defaultExemptIndex; address[] defaultExemptedVoters; - -} \ No newline at end of file + +} diff --git a/contracts/storage/modules/ModuleStorage.sol b/contracts/storage/modules/ModuleStorage.sol index 6acedde99..3f8c67ff0 100644 --- a/contracts/storage/modules/ModuleStorage.sol +++ b/contracts/storage/modules/ModuleStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; /** diff --git a/contracts/storage/modules/STO/ISTOStorage.sol b/contracts/storage/modules/STO/ISTOStorage.sol index 4ff7b9294..ccddb7e7f 100644 --- a/contracts/storage/modules/STO/ISTOStorage.sol +++ b/contracts/storage/modules/STO/ISTOStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Storage layout for the ISTO contract @@ -21,4 +21,4 @@ contract ISTOStorage { // Final amount of tokens sold uint256 public totalTokensSold; -} \ No newline at end of file +} diff --git a/contracts/storage/modules/STO/STOStorage.sol b/contracts/storage/modules/STO/STOStorage.sol index 87ae2c3e0..e28a932fc 100644 --- a/contracts/storage/modules/STO/STOStorage.sol +++ b/contracts/storage/modules/STO/STOStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; /** * @title Storage layout for the STO contract diff --git a/contracts/tokens/OZStorage.sol b/contracts/tokens/OZStorage.sol index 01e415c0a..cd5b96bb1 100644 --- a/contracts/tokens/OZStorage.sol +++ b/contracts/tokens/OZStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract OZStorage { diff --git a/contracts/tokens/STFactory.sol b/contracts/tokens/STFactory.sol index ad69c74cf..c248ccc44 100644 --- a/contracts/tokens/STFactory.sol +++ b/contracts/tokens/STFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./SecurityTokenProxy.sol"; import "../proxy/OwnedUpgradeabilityProxy.sol"; @@ -50,8 +50,8 @@ contract STFactory is ISTFactory, Ownable { string memory _version, address _logicContract, bytes memory _initializationData - ) - public + ) + public { require(_logicContract != address(0), "Invalid Address"); require(_transferManagerFactory != address(0), "Invalid Address"); diff --git a/contracts/tokens/STGetter.sol b/contracts/tokens/STGetter.sol index 19960f4be..5ebf087f6 100644 --- a/contracts/tokens/STGetter.sol +++ b/contracts/tokens/STGetter.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "./OZStorage.sol"; import "./SecurityTokenStorage.sol"; diff --git a/contracts/tokens/SecurityToken.sol b/contracts/tokens/SecurityToken.sol index 65ab132d9..e9f029cb0 100644 --- a/contracts/tokens/SecurityToken.sol +++ b/contracts/tokens/SecurityToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../proxy/Proxy.sol"; import "../PolymathRegistry.sol"; diff --git a/contracts/tokens/SecurityTokenProxy.sol b/contracts/tokens/SecurityTokenProxy.sol index 1f20040e4..2dff257bf 100644 --- a/contracts/tokens/SecurityTokenProxy.sol +++ b/contracts/tokens/SecurityTokenProxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; import "../proxy/OwnedUpgradeabilityProxy.sol"; import "./OZStorage.sol"; diff --git a/contracts/tokens/SecurityTokenStorage.sol b/contracts/tokens/SecurityTokenStorage.sol index d6e2d2c96..f68a972d3 100644 --- a/contracts/tokens/SecurityTokenStorage.sol +++ b/contracts/tokens/SecurityTokenStorage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity 0.5.8; contract SecurityTokenStorage { From 9cec1f3f145110a8c9074c79cb3b330dc81b8a6a Mon Sep 17 00:00:00 2001 From: Adam Dossa Date: Wed, 12 Jun 2019 21:51:41 -0400 Subject: [PATCH 2/2] Fix merge conflicts --- contracts/ModuleRegistry.sol | 1 + contracts/interfaces/IModuleRegistry.sol | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contracts/ModuleRegistry.sol b/contracts/ModuleRegistry.sol index 7621f36c5..5c2992aa9 100644 --- a/contracts/ModuleRegistry.sol +++ b/contracts/ModuleRegistry.sol @@ -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) { diff --git a/contracts/interfaces/IModuleRegistry.sol b/contracts/interfaces/IModuleRegistry.sol index 0ab9cd426..0efea56aa 100644 --- a/contracts/interfaces/IModuleRegistry.sol +++ b/contracts/interfaces/IModuleRegistry.sol @@ -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