[ETHEREUM-CONTRACTS] [GDA] Fixes for GDA #1729
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,10 +90,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| uint256 private constant _POOL_SUBS_BITMAP_STATE_SLOT_ID = 1; | ||
| /// @dev Pool member state slot id starting point for pool connections | ||
| uint256 private constant _POOL_CONNECTIONS_DATA_STATE_SLOT_ID_START = 1 << 128; | ||
| /// @dev SuperToken minimum deposit key | ||
| bytes32 private constant SUPERTOKEN_MINIMUM_DEPOSIT_KEY = | ||
| keccak256("org.superfluid-finance.superfluid.superTokenMinimumDeposit"); | ||
|
|
||
|
|
@@ -105,19 +102,21 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| superfluidPoolBeacon = superfluidPoolBeacon_; | ||
| } | ||
|
|
||
| function realtimeBalanceOf(ISuperfluidToken token, address account, uint256 time) | ||
| public | ||
| view | ||
| override | ||
| returns (int256 rtb, uint256 buf, uint256 owedBuffer) | ||
| { | ||
| UniversalIndexData memory universalIndexData = _getUIndexData(abi.encode(token), account); | ||
|
|
||
| if (_isPool(token, account)) { | ||
| rtb = ISuperfluidPool(account).getDisconnectedBalance(uint32(time)); | ||
| } else { | ||
| rtb = Value.unwrap(_getBasicParticleFromUIndex(universalIndexData).rtb(Time.wrap(uint32(time)))); | ||
| } | ||
|
|
||
| int256 fromPools; | ||
| { | ||
| (uint32[] memory slotIds, bytes32[] memory pidList) = _listPoolConnectionIds(token, account); | ||
| for (uint256 i = 0; i < slotIds.length; ++i) { | ||
|
|
@@ -126,24 +125,12 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| _getPoolMemberData(token, account, ISuperfluidPool(pool)); | ||
| assert(exist); | ||
| assert(poolMemberData.pool == pool); | ||
| fromPools += ISuperfluidPool(pool).getClaimable(account, uint32(time)); | ||
| } | ||
| } | ||
| rtb += fromPools; | ||
|
|
||
| buf = uint256(universalIndexData.totalBuffer.toInt256()); // upcasting to uint256 is safe | ||
| } | ||
|
|
||
| /// @dev ISuperAgreement.realtimeBalanceOf implementation | ||
|
|
@@ -322,10 +309,15 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| ISuperfluid.Context memory currentContext = AgreementLibrary.authorizeTokenAccess(token, ctx); | ||
| address msgSender = currentContext.msgSender; | ||
| newCtx = ctx; | ||
| bool isConnected = _isMemberConnected(token, address(pool), msgSender); | ||
| if (doConnect != isConnected) { | ||
| assert( | ||
| SuperfluidPool(address(pool)).operatorConnectMember( | ||
| msgSender, doConnect, uint32(currentContext.timestamp) | ||
| ) | ||
| ); | ||
|
|
||
| if (doConnect) { | ||
| uint32 poolSlotID = | ||
| _findAndFillPoolConnectionsBitmap(token, msgSender, bytes32(uint256(uint160(address(pool))))); | ||
|
|
||
|
|
@@ -336,33 +328,24 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| _getPoolMemberHash(msgSender, pool), | ||
| _encodePoolMemberData(PoolMemberData({ poolID: poolSlotID, pool: address(pool) })) | ||
| ); | ||
| } else { | ||
| (, PoolMemberData memory poolMemberData) = _getPoolMemberData(token, msgSender, pool); | ||
| token.terminateAgreement(_getPoolMemberHash(msgSender, pool), 1); | ||
|
|
||
| _clearPoolConnectionsBitmap(token, msgSender, poolMemberData.poolID); | ||
| } | ||
|
|
||
| emit PoolConnectionUpdated(token, pool, msgSender, doConnect, currentContext.userData); | ||
| } | ||
| } | ||
|
|
||
| function _isMemberConnected(ISuperfluidToken token, address pool, address member) internal view returns (bool) { | ||
| (bool exist,) = _getPoolMemberData(token, member, ISuperfluidPool(pool)); | ||
| return exist; | ||
| } | ||
|
|
||
| function isMemberConnected(ISuperfluidPool pool, address member) external view override returns (bool) { | ||
| return _isMemberConnected(pool.superToken(), address(pool), member); | ||
| } | ||
|
|
||
| function appendIndexUpdateByPool(ISuperfluidToken token, BasicParticle memory p, Time t) external returns (bool) { | ||
|
|
@@ -404,12 +387,15 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| revert GDA_ONLY_SUPER_TOKEN_POOL(); | ||
| } | ||
|
|
||
| // you cannot distribute if admin is not equal to the ctx.msgSender | ||
| if (!pool.distributionFromAnyAddress()) { | ||
| if (pool.admin() != currentContext.msgSender) { | ||
| revert GDA_DISTRIBUTE_FROM_ANY_ADDRESS_NOT_ALLOWED(); | ||
| } | ||
| } | ||
|
|
||
| // the from address must be the same as the ctx.msgSender | ||
| // there is no ACL support | ||
| if (from != currentContext.msgSender) { | ||
| revert GDA_DISTRIBUTE_FOR_OTHERS_NOT_ALLOWED(); | ||
| } | ||
|
|
@@ -467,7 +453,10 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
|
|
||
| newCtx = ctx; | ||
|
|
||
| // we must check if the requestedFlowRate is greater than 0 here | ||
| // otherwise we will block liquidators from closing streams in pools | ||
| // where the pool config has distributionFromAnyAddress set to false | ||
| if (requestedFlowRate > 0 && !pool.distributionFromAnyAddress()) { | ||
| if (pool.admin() != flowVars.currentContext.msgSender) { | ||
| revert GDA_DISTRIBUTE_FROM_ANY_ADDRESS_NOT_ALLOWED(); | ||
| } | ||
|
|
@@ -479,7 +468,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| address(pool), | ||
| flowVars.distributionFlowHash, | ||
| FlowRate.wrap(requestedFlowRate), | ||
| Time.wrap(uint32(flowVars.currentContext.timestamp)) | ||
| ); | ||
|
|
||
| // handle distribute flow on behalf of someone else | ||
|
|
@@ -515,14 +504,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| } | ||
|
|
||
| { | ||
| _adjustBuffer(token, address(pool), from, flowVars.distributionFlowHash, actualFlowRate); | ||
| } | ||
|
|
||
| // ensure sender has enough balance to execute transaction | ||
|
|
@@ -636,7 +618,6 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| _getFlowDistributionData(ISuperfluidToken(data.token), data.distributionFlowHash); | ||
| int256 signedSingleDeposit = flowDistributionData.buffer.toInt256(); | ||
|
|
||
| bool isCurrentlyPatricianPeriod; | ||
|
|
||
| { | ||
|
|
@@ -652,10 +633,9 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| // critical case | ||
| if (totalRewardLeft >= 0) { | ||
| int256 rewardAmount = (signedSingleDeposit * totalRewardLeft) / data.signedTotalGDADeposit; | ||
| data.token.makeLiquidationPayoutsV2( | ||
| data.distributionFlowHash, | ||
| abi.encode(2, isCurrentlyPatricianPeriod ? 0 : 1), | ||
| data.liquidator, | ||
| isCurrentlyPatricianPeriod, | ||
| data.sender, | ||
|
|
@@ -677,15 +657,9 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| } | ||
| } | ||
|
|
||
| function _adjustBuffer(ISuperfluidToken token, address pool, address from, bytes32 flowHash, FlowRate newFlowRate) | ||
| internal | ||
| { | ||
| // not using oldFlowRate in this model | ||
| // surprising effect: reducing flow rate may require more buffer when liquidation_period adjusted upward | ||
| ISuperfluidGovernance gov = ISuperfluidGovernance(ISuperfluid(_host).getGovernance()); | ||
|
|
@@ -718,7 +692,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| ISuperfluidToken(token).updateAgreementData(flowHash, data); | ||
| } | ||
|
|
||
| UniversalIndexData memory universalIndexData = _getUIndexData(abi.encode(token), from); | ||
| universalIndexData.totalBuffer = | ||
| // new buffer | ||
| (universalIndexData.totalBuffer.toInt256() + Value.unwrap(bufferDelta)).toUint256(); | ||
|
|
@@ -736,8 +710,6 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| universalIndexData.totalBuffer | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // Solvency Related Getters | ||
|
|
@@ -810,7 +782,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| data = new bytes32[](2); | ||
| data[0] = bytes32( | ||
| (uint256(int256(FlowRate.unwrap(p.flow_rate()))) << 160) | (uint256(Time.unwrap(p.settled_at())) << 128) | ||
| | (uint256(buffer.toUint96()) << 32) | (isPool_ ? 1 : 0) | ||
| ); | ||
| data[1] = bytes32(uint256(Value.unwrap(p._settled_value))); | ||
| } | ||
|
|
@@ -823,7 +795,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi | |
| data = new bytes32[](2); | ||
| data[0] = bytes32( | ||
| (uint256(int256(uIndexData.flowRate)) << 160) | (uint256(uIndexData.settledAt) << 128) | ||
| | (uint256(uIndexData.totalBuffer.toUint96()) << 32) | (uIndexData.isPool ? 1 : 0) | ||
|
There was a problem hiding this comment. cc @hellwolf please take a closer look |
||
| ); | ||
| data[1] = bytes32(uint256(uIndexData.settledValue)); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's improve our echidna fuzzing with better assertions on expected liquidations.