Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

483 484 fix #488

Merged
merged 6 commits into from
Dec 21, 2018
Merged

483 484 fix #488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b307102
Removed the Redundant functions from eternal storage contract as ment…
dev1644 Dec 20, 2018
447a7e5
Removed the Redundant functions from eternal storage contract as ment…
dev1644 Dec 20, 2018
32f1b10
Merge branch 'dev-2.1.0' into 483-484-fix
maxsam4 Dec 21, 2018
8101299
Merge branch 'dev-2.1.0' into 483-484-fix
maxsam4 Dec 21, 2018
d10960b
Merge branch 'dev-2.1.0' into 483-484-fix
maxsam4 Dec 21, 2018
b1bb728
Merge branch 'dev-2.1.0' into 483-484-fix
maxsam4 Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions contracts/ModuleRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
}

function initialize(address _polymathRegistry, address _owner) external payable {
require(!getBool(Encoder.getKey("initialised")),"already initialized");
require(!getBoolValues(Encoder.getKey("initialised")),"already initialized");
require(_owner != address(0) && _polymathRegistry != address(0), "0x address is invalid");
set(Encoder.getKey("polymathRegistry"), _polymathRegistry);
set(Encoder.getKey("owner"), _owner);
Expand All @@ -122,11 +122,11 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
*/
function useModule(address _moduleFactory) external {
// This if statement is required to be able to add modules from the token proxy contract during deployment
if (ISecurityTokenRegistry(getAddress(Encoder.getKey("securityTokenRegistry"))).isSecurityToken(msg.sender)) {
if (IFeatureRegistry(getAddress(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed")) {
require(getBool(Encoder.getKey("verified", _moduleFactory)) || IOwnable(_moduleFactory).owner() == IOwnable(msg.sender).owner(),"ModuleFactory must be verified or SecurityToken owner must be ModuleFactory owner");
if (ISecurityTokenRegistry(getAddressValues(Encoder.getKey("securityTokenRegistry"))).isSecurityToken(msg.sender)) {
if (IFeatureRegistry(getAddressValues(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed")) {
require(getBoolValues(Encoder.getKey("verified", _moduleFactory)) || IOwnable(_moduleFactory).owner() == IOwnable(msg.sender).owner(),"ModuleFactory must be verified or SecurityToken owner must be ModuleFactory owner");
} else {
require(getBool(Encoder.getKey("verified", _moduleFactory)), "ModuleFactory must be verified");
require(getBoolValues(Encoder.getKey("verified", _moduleFactory)), "ModuleFactory must be verified");
}
require(_isCompatibleModule(_moduleFactory, msg.sender), "Version should within the compatible range of ST");
pushArray(Encoder.getKey("reputation", _moduleFactory), msg.sender);
Expand All @@ -148,12 +148,12 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @param _moduleFactory is the address of the module factory to be registered
*/
function registerModule(address _moduleFactory) external whenNotPausedOrOwner {
if (IFeatureRegistry(getAddress(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed")) {
if (IFeatureRegistry(getAddressValues(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed")) {
require(msg.sender == IOwnable(_moduleFactory).owner() || msg.sender == owner(),"msg.sender must be the Module Factory owner or registry curator");
} else {
require(msg.sender == owner(), "Only owner allowed to register modules");
}
require(getUint(Encoder.getKey("registry", _moduleFactory)) == 0, "Module factory should not be pre-registered");
require(getUintValues(Encoder.getKey("registry", _moduleFactory)) == 0, "Module factory should not be pre-registered");
IModuleFactory moduleFactory = IModuleFactory(_moduleFactory);
//Enforce type uniqueness
uint256 i;
Expand Down Expand Up @@ -181,14 +181,14 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @param _moduleFactory is the address of the module factory to be deleted from the registry
*/
function removeModule(address _moduleFactory) external whenNotPausedOrOwner {
uint256 moduleType = getUint(Encoder.getKey("registry", _moduleFactory));
uint256 moduleType = getUintValues(Encoder.getKey("registry", _moduleFactory));

require(moduleType != 0, "Module factory should be registered");
require(
msg.sender == IOwnable(_moduleFactory).owner() || msg.sender == owner(),
"msg.sender must be the Module Factory owner or registry curator"
);
uint256 index = getUint(Encoder.getKey("moduleListIndex", _moduleFactory));
uint256 index = getUintValues(Encoder.getKey("moduleListIndex", _moduleFactory));
uint256 last = getArrayAddress(Encoder.getKey("moduleList", moduleType)).length - 1;
address temp = getArrayAddress(Encoder.getKey("moduleList", moduleType))[last];

Expand Down Expand Up @@ -220,7 +220,7 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @return bool
*/
function verifyModule(address _moduleFactory, bool _verified) external onlyOwner {
require(getUint(Encoder.getKey("registry", _moduleFactory)) != uint256(0), "Module factory must be registered");
require(getUintValues(Encoder.getKey("registry", _moduleFactory)) != uint256(0), "Module factory must be registered");
set(Encoder.getKey("verified", _moduleFactory), _verified);
emit ModuleVerified(_moduleFactory, _verified);
}
Expand Down Expand Up @@ -303,15 +303,15 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
function getModulesByTypeAndToken(uint8 _moduleType, address _securityToken) public view returns (address[]) {
uint256 _len = getArrayAddress(Encoder.getKey("moduleList", uint256(_moduleType))).length;
address[] memory _addressList = getArrayAddress(Encoder.getKey("moduleList", uint256(_moduleType)));
bool _isCustomModuleAllowed = IFeatureRegistry(getAddress(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed");
bool _isCustomModuleAllowed = IFeatureRegistry(getAddressValues(Encoder.getKey("featureRegistry"))).getFeatureStatus("customModulesAllowed");
uint256 counter = 0;
for (uint256 i = 0; i < _len; i++) {
if (_isCustomModuleAllowed) {
if (IOwnable(_addressList[i]).owner() == IOwnable(_securityToken).owner() || getBool(Encoder.getKey("verified", _addressList[i])))
if (IOwnable(_addressList[i]).owner() == IOwnable(_securityToken).owner() || getBoolValues(Encoder.getKey("verified", _addressList[i])))
if(_isCompatibleModule(_addressList[i], _securityToken))
counter++;
}
else if (getBool(Encoder.getKey("verified", _addressList[i]))) {
else if (getBoolValues(Encoder.getKey("verified", _addressList[i]))) {
if(_isCompatibleModule(_addressList[i], _securityToken))
counter++;
}
Expand All @@ -320,14 +320,14 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
counter = 0;
for (uint256 j = 0; j < _len; j++) {
if (_isCustomModuleAllowed) {
if (IOwnable(_addressList[j]).owner() == IOwnable(_securityToken).owner() || getBool(Encoder.getKey("verified", _addressList[j]))) {
if (IOwnable(_addressList[j]).owner() == IOwnable(_securityToken).owner() || getBoolValues(Encoder.getKey("verified", _addressList[j]))) {
if(_isCompatibleModule(_addressList[j], _securityToken)) {
_tempArray[counter] = _addressList[j];
counter ++;
}
}
}
else if (getBool(Encoder.getKey("verified", _addressList[j]))) {
else if (getBoolValues(Encoder.getKey("verified", _addressList[j]))) {
if(_isCompatibleModule(_addressList[j], _securityToken)) {
_tempArray[counter] = _addressList[j];
counter ++;
Expand Down Expand Up @@ -370,7 +370,7 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @notice Stores the contract addresses of other key contracts from the PolymathRegistry
*/
function updateFromRegistry() external onlyOwner {
address _polymathRegistry = getAddress(Encoder.getKey("polymathRegistry"));
address _polymathRegistry = getAddressValues(Encoder.getKey("polymathRegistry"));
set(Encoder.getKey("securityTokenRegistry"), IPolymathRegistry(_polymathRegistry).getAddress("SecurityTokenRegistry"));
set(Encoder.getKey("featureRegistry"), IPolymathRegistry(_polymathRegistry).getAddress("FeatureRegistry"));
set(Encoder.getKey("polyToken"), IPolymathRegistry(_polymathRegistry).getAddress("PolyToken"));
Expand All @@ -391,14 +391,14 @@ contract ModuleRegistry is IModuleRegistry, EternalStorage {
* @return address owner
*/
function owner() public view returns(address) {
return getAddress(Encoder.getKey("owner"));
return getAddressValues(Encoder.getKey("owner"));
}

/**
* @notice Checks whether the contract operations is paused or not
* @return bool
*/
function isPaused() public view returns(bool) {
return getBool(Encoder.getKey("paused"));
return getBoolValues(Encoder.getKey("paused"));
}
}
Loading