@@ -25,7 +25,7 @@ contract XanV1 is IXanV1, Initializable, ERC20Upgradeable, ERC20BurnableUpgradea
25
25
/// @param voterBodyData The upgrades proposed by the voter body from a current implementation.
26
26
struct XanV1Storage {
27
27
address governanceCouncil;
28
- Council.ProposedUpgrade governanceCouncilData;
28
+ mapping ( address current = > Council.ProposedUpgrade) governanceCouncilData;
29
29
mapping (address current = > Ranking.ProposedUpgrades) voterBodyData;
30
30
}
31
31
@@ -343,7 +343,7 @@ contract XanV1 is IXanV1, Initializable, ERC20Upgradeable, ERC20BurnableUpgradea
343
343
/// @notice Authorizes an upgrade.
344
344
/// @param newImpl The new implementation to authorize the upgrade to.
345
345
function _authorizeUpgrade (address newImpl ) internal view virtual override {
346
- address councilProposedImpl = _getXanV1Storage ().governanceCouncilData .proposedImpl;
346
+ address councilProposedImpl = _getGovernanceCouncilData () .proposedImpl;
347
347
348
348
// TODO!
349
349
if (newImpl == councilProposedImpl) {
@@ -421,21 +421,21 @@ contract XanV1 is IXanV1, Initializable, ERC20Upgradeable, ERC20BurnableUpgradea
421
421
revert ("NOT IMPLEMENTED " );
422
422
}
423
423
424
- /// @notice Returns the proposed upgrades from the from current implementation from the contract storage location.
425
- /// @return voterBodyData The data associated with proposed upgrades from current implementation.
424
+ /// @notice Returns the proposed upgrades from the current implementation from the contract storage location.
425
+ /// @return voterBodyData The data associated with proposed upgrades from the current implementation.
426
426
function _getVoterBodyData () internal view virtual returns (Ranking.ProposedUpgrades storage voterBodyData ) {
427
427
voterBodyData = _getXanV1Storage ().voterBodyData[implementation ()];
428
428
}
429
429
430
- /// @notice Returns the data of the upgrade proposed by the council from the contract storage location.
431
- /// @return proposedUpgrade The data associated with upgrade proposed by the council.
430
+ /// @notice Returns the data of the upgrade proposed by the council from the current implementation from the contract storage location.
431
+ /// @return proposedUpgrade The data associated with upgrade proposed by the council from the current implementation .
432
432
function _getGovernanceCouncilData ()
433
433
internal
434
434
view
435
435
virtual
436
436
returns (Council.ProposedUpgrade storage proposedUpgrade )
437
437
{
438
- proposedUpgrade = _getXanV1Storage ().governanceCouncilData;
438
+ proposedUpgrade = _getXanV1Storage ().governanceCouncilData[ implementation ()] ;
439
439
}
440
440
441
441
/// @notice Returns the storage from the Xan V1 storage location.
0 commit comments