Skip to content

Commit 62a7c7e

Browse files
authored
Merge pull request #223 from filecoin-project/dev
update contract codes
2 parents ad7fb9b + e8e122d commit 62a7c7e

File tree

7 files changed

+15
-64
lines changed

7 files changed

+15
-64
lines changed

contracts/contracts/FipEditor.sol

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ contract PowerVotingFipEditor is
4747
mapping(uint256 => FipEditorProposal) idToFipEditorProposal;
4848
// Set to store IDs of proposals id
4949
EnumerableSet.UintSet proposalIdSet;
50-
50+
/// @custom:oz-upgrades-unsafe-allow constructor
51+
constructor() {
52+
_disableInitializers();
53+
}
5154
/**
5255
* @notice Initializes the contract by setting up UUPS upgrade ability and ownership.
5356
*/

contracts/contracts/Oracle.sol

+6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/U
2121
import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
2222

2323
contract Oracle is IOracle, Ownable2StepUpgradeable, UUPSUpgradeable {
24+
25+
/// @custom:oz-upgrades-unsafe-allow constructor
26+
constructor() {
27+
_disableInitializers();
28+
}
29+
2430
/**
2531
* @notice Authorizes an upgrade to a new implementation contract.
2632
* @param newImplementation The address of the new implementation contract.

contracts/contracts/PowerVoting.sol

+5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ contract PowerVoting is IPowerVoting, Ownable2StepUpgradeable, UUPSUpgradeable {
5252

5353
uint16 public snapshotMaxRandomOffsetDays;
5454

55+
/// @custom:oz-upgrades-unsafe-allow constructor
56+
constructor() {
57+
_disableInitializers();
58+
}
59+
5560
/**
5661
* @dev Modifier that ensures the provided address is non-zero.
5762
* @param addr The address to check.

contracts/contracts/PowersLib.sol

-47
This file was deleted.

contracts/scripts/constant.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export const POWER_VOTING_VOTE = "POWER_VOTING_VOTE";
22
export const POWER_VOTING_FIP = "POWER_VOTING_FIP";
33
export const POWER_VOTING_ORACLE = "POWER_VOTING_ORACLE";
4-
export const POWER_VOTING_POWER = "POWER_VOTING_POWER";

contracts/scripts/deploy_powers.ts

-14
This file was deleted.

contracts/scripts/filecoin_testnet_config.json.example

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"POWER_VOTING_POWER": "",
32
"POWER_VOTING_ORACLE": "",
43
"POWER_VOTING_FIP": "",
54
"POWER_VOTING_VOTE": ""

0 commit comments

Comments
 (0)