fix some of the gda invariance issues

superfluid-finance · Aug 17, 2023 · e49b358 · e49b358
1 parent f4dc04f
commit e49b358
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/packages/ethereum-contracts/contracts/agreements/GeneralDistributionAgreementV1.sol b/packages/ethereum-contracts/contracts/agreements/GeneralDistributionAgreementV1.sol
@@ -169,7 +169,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi
         returns (int256 rtb, uint256 buf, uint256 owedBuffer)
     {
         (int256 available, int256 fromPools, int256 buffer) = realtimeBalanceVectorAt(token, account, time);
-        rtb = available + fromPools - buffer;
+        rtb = available + fromPools;
 
         buf = uint256(buffer); // upcasting to uint256 is safe
         owedBuffer = 0;
@@ -687,8 +687,6 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi
 
         Value bufferDelta = newBufferAmount - Value.wrap(uint256(flowDistributionData.buffer).toInt256());
 
-        eff = _doShift(eff, from, address(this), bufferDelta);
-
         {
             bytes32[] memory data = _encodeFlowDistributionData(
                 FlowDistributionData({

diff --git a/packages/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol b/packages/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol
@@ -185,6 +185,8 @@ contract FoundrySuperfluidTester is Test {
         require(nTesters <= TEST_ACCOUNTS.length, "too many testers");
         N_TESTERS = nTesters;
 
+        _addAccount(address(sf.gda));
+
         // Set the token type being tested
         string memory tokenType = vm.envOr(TOKEN_TYPE_ENV_KEY, DEFAULT_TEST_TOKEN_TYPE);
         bytes32 hashedTokenType = keccak256(abi.encode(tokenType));

diff --git a/packages/ethereum-contracts/test/foundry/agreements/GeneralDistributionAgreement.t.sol b/packages/ethereum-contracts/test/foundry/agreements/GeneralDistributionAgreement.t.sol
@@ -714,7 +714,7 @@ contract GeneralDistributionAgreementV1IntegrationTest is FoundrySuperfluidTeste
         );
     }
 
-    function testDistributeFlowToDisconnectedMembers(UpdateMemberData memory member, int32 flowRate, uint16 warpTime) public {
+    function testDistributeFlowToDisconnectedMember(UpdateMemberData memory member, int32 flowRate) public {
         vm.assume(flowRate > 0);
 
         _helperUpdateMemberUnits(currentPool, alice, member.member, 1);

diff --git a/packages/hot-fuzz/contracts/HotFuzzBase.sol b/packages/hot-fuzz/contracts/HotFuzzBase.sol
@@ -58,6 +58,8 @@ contract HotFuzzBase {
         );
         nTesters = nTesters_;
         otherAccounts = new address[](0);
+
+        _addAccount(address(sf.gda));
     }
 
     function _initTesters() virtual internal {