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.

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

add .prettierrc [solidity formatter] #115

Merged
merged 3 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 59 additions & 3 deletions wemix/bind/gen_ballotStorage_abi.go

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wemix/bind/gen_envStorage_abi.go

Large diffs are not rendered by default.

373 changes: 353 additions & 20 deletions wemix/bind/gen_gov_abi.go

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wemix/bind/gen_ncpExit_abi.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wemix/bind/gen_registry_abi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wemix/bind/gen_staking_abi.go

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions wemix/governance-contract/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify which plugin is used:

"plugins": ["prettier-plugin-solidity"],

"overrides": [
{
"files": "*.sol",
"options": {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify which parser is used:

"parser": "solidity-parse",

"printWidth": 150,
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": true
}
}
]
}
158 changes: 79 additions & 79 deletions wemix/governance-contract/contracts/GovChecker.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,83 +10,83 @@ import "./interface/IGov.sol";
* @dev GovChecker Contract that uses Registry contract
*/
contract GovChecker is OwnableUpgradeable {
IRegistry public reg;

bytes32 public constant GOV_NAME = "GovernanceContract";
bytes32 public constant STAKING_NAME = "Staking";
bytes32 public constant BALLOT_STORAGE_NAME = "BallotStorage";
bytes32 public constant ENV_STORAGE_NAME = "EnvStorage";
bytes32 public constant REWARD_POOL_NAME = "RewardPool";
bytes32 public constant MAINTENANCE_NAME = "Maintenance";
bytes32 public constant ECOSYSTEM_NAME = "Ecosystem";
bytes32 public constant STAKING_REWARD_NAME = "StakingReward";

/*
* @dev Function to set registry address. Contract that wants to use registry should setRegistry first.
* @param _addr address of registry
* @return A boolean that indicates if the operation was successful.
*/
event SetRegistry(address indexed addr);

function setRegistry(address _addr) public onlyOwner {
require(_addr != address(0), "Address should be non-zero");
reg = IRegistry(_addr);
emit SetRegistry(_addr);
}

modifier onlyGov() {
require(getGovAddress() == msg.sender, "No Permission");
_;
}

modifier onlyGovMem() {
require(IGov(getGovAddress()).isMember(msg.sender), "No Permission");
_;
}

modifier onlyGovStaker() {
require(IGov(getGovAddress()).isStaker(msg.sender), "No Permission");
_;
}

modifier anyGov() {
require(getGovAddress() == msg.sender || IGov(getGovAddress()).isMember(msg.sender), "No Permission");
_;
}

function getContractAddress(bytes32 name) internal view returns (address) {
return reg.getContractAddress(name);
}

function getGovAddress() internal view returns (address) {
return getContractAddress(GOV_NAME);
}

function getStakingAddress() internal view returns (address) {
return getContractAddress(STAKING_NAME);
}

function getBallotStorageAddress() internal view returns (address) {
return getContractAddress(BALLOT_STORAGE_NAME);
}

function getEnvStorageAddress() internal view returns (address) {
return getContractAddress(ENV_STORAGE_NAME);
}

function getRewardPoolAddress() internal view returns (address) {
return getContractAddress(REWARD_POOL_NAME);
}

function getEcosystemAddress() internal view returns (address) {
return getContractAddress(ECOSYSTEM_NAME);
}

function getStakingRewardAddress() internal view returns (address) {
return getContractAddress(STAKING_REWARD_NAME);
}

function getMaintenanceAddress() internal view returns (address) {
return getContractAddress(MAINTENANCE_NAME);
}
IRegistry public reg;

bytes32 public constant GOV_NAME = "GovernanceContract";
bytes32 public constant STAKING_NAME = "Staking";
bytes32 public constant BALLOT_STORAGE_NAME = "BallotStorage";
bytes32 public constant ENV_STORAGE_NAME = "EnvStorage";
bytes32 public constant REWARD_POOL_NAME = "RewardPool";
bytes32 public constant MAINTENANCE_NAME = "Maintenance";
bytes32 public constant ECOSYSTEM_NAME = "Ecosystem";
bytes32 public constant STAKING_REWARD_NAME = "StakingReward";

/*
* @dev Function to set registry address. Contract that wants to use registry should setRegistry first.
* @param _addr address of registry
* @return A boolean that indicates if the operation was successful.
*/
event SetRegistry(address indexed addr);

function setRegistry(address _addr) public onlyOwner {
require(_addr != address(0), "Address should be non-zero");
reg = IRegistry(_addr);
emit SetRegistry(_addr);
}

modifier onlyGov() {
require(getGovAddress() == msg.sender, "No Permission");
_;
}

modifier onlyGovMem() {
require(IGov(getGovAddress()).isMember(msg.sender), "No Permission");
_;
}

modifier onlyGovStaker() {
require(IGov(getGovAddress()).isStaker(msg.sender), "No Permission");
_;
}

modifier anyGov() {
require(getGovAddress() == msg.sender || IGov(getGovAddress()).isMember(msg.sender), "No Permission");
_;
}

function getContractAddress(bytes32 name) internal view returns (address) {
return reg.getContractAddress(name);
}

function getGovAddress() internal view returns (address) {
return getContractAddress(GOV_NAME);
}

function getStakingAddress() internal view returns (address) {
return getContractAddress(STAKING_NAME);
}

function getBallotStorageAddress() internal view returns (address) {
return getContractAddress(BALLOT_STORAGE_NAME);
}

function getEnvStorageAddress() internal view returns (address) {
return getContractAddress(ENV_STORAGE_NAME);
}

function getRewardPoolAddress() internal view returns (address) {
return getContractAddress(REWARD_POOL_NAME);
}

function getEcosystemAddress() internal view returns (address) {
return getContractAddress(ECOSYSTEM_NAME);
}

function getStakingRewardAddress() internal view returns (address) {
return getContractAddress(STAKING_REWARD_NAME);
}

function getMaintenanceAddress() internal view returns (address) {
return getContractAddress(MAINTENANCE_NAME);
}
}
Loading
Loading