add .prettierrc [solidity formatter] (#115)

* feat : add prettierrc * fix : remove unuseful comment * [add proposal type] governance general purpose (#116) * feat : add execute * fix : upgrade issue * test : execute * feat : append gap * fix : gap size * fix : [execute fail] return value * fix : typo * fix : typo * feat : test code * feat : gov abigen
wemixarchive · Aug 19, 2024 · 992c93c · 992c93c
1 parent ff492c7
commit 992c93c
Show file tree

Hide file tree

Showing 34 changed files with 3,807 additions and 3,416 deletions.
diff --git a/wemix/bind/gen_ballotStorage_abi.go b/wemix/bind/gen_ballotStorage_abi.go
diff --git a/wemix/bind/gen_envStorage_abi.go b/wemix/bind/gen_envStorage_abi.go
diff --git a/wemix/bind/gen_gov_abi.go b/wemix/bind/gen_gov_abi.go
diff --git a/wemix/bind/gen_ncpExit_abi.go b/wemix/bind/gen_ncpExit_abi.go
diff --git a/wemix/bind/gen_registry_abi.go b/wemix/bind/gen_registry_abi.go
diff --git a/wemix/bind/gen_staking_abi.go b/wemix/bind/gen_staking_abi.go
diff --git a/wemix/governance-contract/.prettierrc b/wemix/governance-contract/.prettierrc
@@ -0,0 +1,14 @@
+{
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "printWidth": 150,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": true
+      }
+    }
+  ]
+}
diff --git a/wemix/governance-contract/contracts/GovChecker.sol b/wemix/governance-contract/contracts/GovChecker.sol
@@ -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);
+    }
 }