Skip to content

use zoltars fork time right away for security pools, move variables a… #19

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

Open
wants to merge 1 commit into
base: sharetokens-and-new-factory-deployment-process
Choose a base branch
from
Open

use zoltars fork time right away for security pools, move variables a… #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions solidity/contracts/peripherals/SecurityPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ contract SecurityPool is ISecurityPool {
uint192 public immutable universeId;

Zoltar public immutable zoltar;
ISecurityPool immutable public parent;
IShareToken public immutable shareToken;
Auction public immutable truthAuction;
ISecurityPoolFactory public immutable securityPoolFactory;
ReputationToken public immutable repToken;
PriceOracleManagerAndOperatorQueuer public immutable priceOracleManagerAndOperatorQueuer;
OpenOracle public immutable openOracle;

uint256 public securityBondAllowance;
uint256 public completeSetCollateralAmount; // amount of eth that is backing complete sets, `address(this).balance - completeSetCollateralAmount` are the fees belonging to REP pool holders
uint256 public poolOwnershipDenominator;
Expand All @@ -27,26 +35,14 @@ contract SecurityPool is ISecurityPool {
uint256 public lastUpdatedFeeAccumulator;
uint256 public currentRetentionRate;

uint256 public securityPoolForkTriggeredTimestamp;

mapping(address => SecurityVault) public securityVaults;
mapping(address => bool) public claimedAuctionProceeds;

ISecurityPool[3] public children;
ISecurityPool immutable public parent;

uint256 public truthAuctionStarted;
SystemState public systemState;

IShareToken public immutable shareToken;
Auction public immutable truthAuction;

ReputationToken public repToken;
ISecurityPoolFactory public immutable securityPoolFactory;

PriceOracleManagerAndOperatorQueuer public priceOracleManagerAndOperatorQueuer;
OpenOracle public openOracle;

event SecurityBondAllowanceChange(address vault, uint256 from, uint256 to);
event PerformWithdrawRep(address vault, uint256 amount);
event PoolRetentionRateChanged(uint256 retentionRate);
Expand Down Expand Up @@ -81,14 +77,14 @@ contract SecurityPool is ISecurityPool {
systemState = SystemState.ForkMigration;
}
shareToken = _shareToken;
(repToken, , ) = zoltar.universes(universeId);
}

function setStartingParams(uint256 _currentRetentionRate, uint256 _repEthPrice, uint256 _completeSetCollateralAmount) public {
require(msg.sender == address(securityPoolFactory), 'only callable by securityPoolFactory');
lastUpdatedFeeAccumulator = block.timestamp;
currentRetentionRate = _currentRetentionRate;
completeSetCollateralAmount = _completeSetCollateralAmount;
(repToken,,) = zoltar.universes(universeId);
priceOracleManagerAndOperatorQueuer.setRepEthPrice(_repEthPrice);
}

Expand Down Expand Up @@ -271,7 +267,6 @@ contract SecurityPool is ISecurityPool {
require(systemState == SystemState.Operational, 'System needs to be operational to trigger fork');
require(!zoltar.isFinalized(universeId, questionId), 'question has been finalized already');
systemState = SystemState.PoolForked;
securityPoolForkTriggeredTimestamp = block.timestamp;
repAtFork = repToken.balanceOf(address(this));
// TODO, handle case where parent repAtFork == 0
emit ForkSecurityPool(repAtFork);
Expand All @@ -282,8 +277,9 @@ contract SecurityPool is ISecurityPool {

// migrates vault into outcome universe after fork
function migrateVault(QuestionOutcome outcome) public { // called on parent
(,, uint256 forkTime) = zoltar.universes(universeId);
require(systemState == SystemState.PoolForked, 'Pool needs to have forked');
require(block.timestamp <= securityPoolForkTriggeredTimestamp + SecurityPoolUtils.MIGRATION_TIME , 'migration time passed');
require(block.timestamp <= forkTime + SecurityPoolUtils.MIGRATION_TIME , 'migration time passed');
require(securityVaults[msg.sender].poolOwnership > 0, 'Vault has no rep to migrate');
updateVaultFees(msg.sender);
emit MigrateVault(msg.sender, outcome, securityVaults[msg.sender].poolOwnership, securityVaults[msg.sender].securityBondAllowance);
Expand Down Expand Up @@ -325,8 +321,9 @@ contract SecurityPool is ISecurityPool {
}

function startTruthAuction() public {
(,, uint256 forkTime) = zoltar.universes(universeId);
require(systemState == SystemState.ForkMigration, 'System needs to be in migration');
require(block.timestamp > securityPoolForkTriggeredTimestamp + SecurityPoolUtils.MIGRATION_TIME, 'migration time needs to pass first');
require(block.timestamp > forkTime + SecurityPoolUtils.MIGRATION_TIME, 'migration time needs to pass first');
systemState = SystemState.ForkTruthAuction;
truthAuctionStarted = block.timestamp;
parent.updateCollateralAmount();
Expand Down
1 change: 0 additions & 1 deletion solidity/contracts/peripherals/interfaces/ISecurityPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ interface ISecurityPool {
function feesAccrued() external view returns (uint256);
function lastUpdatedFeeAccumulator() external view returns (uint256);
function currentRetentionRate() external view returns (uint256);
function securityPoolForkTriggeredTimestamp() external view returns (uint256);
function securityVaults(address vault) external view returns (uint256 poolOwnership, uint256 securityBondAllowance, uint256 unpaidEthFees, uint256 feeAccumulator);
function claimedAuctionProceeds(address vault) external view returns (bool);
function children(uint256 index) external view returns (ISecurityPool);
Expand Down