@superfluid-finance/ethereum-contracts 1.2.3-dev.3df6de8.0 → 1.2.3-dev.4eebafa.0

package/contracts/mocks/MultiFlowTesterApp.sol

@@ -131,12 +131,15 @@ contract MultiFlowTesterApp is SuperAppBase {
         external
         returns (bytes memory newCtx)
     {
-        bytes memory callData = abi.encodeWithSelector(
-            _cfa.createFlow.selector,
-            superToken,
-            receiver,
-            flowRate,
-            new bytes(0));
+        bytes memory callData = abi.encodeCall(
+            _cfa.createFlow,
+            (
+                superToken,
+                receiver,
+                flowRate,
+                new bytes(0)
+            )
+        );
         (newCtx, ) = _host.callAgreementWithContext(
             _cfa,
             callData,
@@ -269,12 +272,14 @@ contract MultiFlowTesterApp is SuperAppBase {
         newCtx = ctx;
         if (vars.flowReceiver == address(this)) {
             for(uint256 i = 0; i < vars.configuration.receivers.length; i++) {
-                callData = abi.encodeWithSelector(
-                    _cfa.deleteFlow.selector,
-                    superToken,
-                    address(this),
-                    vars.configuration.receivers[i].to,
-                    new bytes(0) //placeholder ctx
+                callData = abi.encodeCall(
+                    _cfa.deleteFlow,
+                    (
+                        superToken,
+                        address(this),
+                        vars.configuration.receivers[i].to,
+                        new bytes(0) //placeholder ctx
+                    )
                 );
                 (newCtx, ) = _host.callAgreementWithContext(
                     _cfa,
@@ -288,12 +293,14 @@ contract MultiFlowTesterApp is SuperAppBase {
                 // skip current closed flow
                 if (vars.configuration.receivers[i].to == vars.flowReceiver) continue;
                 // close the rest of the mfa receiver flows
-                callData = abi.encodeWithSelector(
-                    _cfa.deleteFlow.selector,
-                    superToken,
-                    address(this),
-                    vars.configuration.receivers[i].to,
-                    new bytes(0) //placeholder ctx
+                callData = abi.encodeCall(
+                    _cfa.deleteFlow,
+                    (
+                        superToken,
+                        address(this),
+                        vars.configuration.receivers[i].to,
+                        new bytes(0) //placeholder ctx
+                    )
                 );
                 (newCtx, ) = _host.callAgreementWithContext(
                     _cfa,
@@ -303,12 +310,14 @@ contract MultiFlowTesterApp is SuperAppBase {
                 );
             }
             // close the mfa sender flow
-            callData = abi.encodeWithSelector(
-                _cfa.deleteFlow.selector,
-                superToken,
-                vars.mfaSender,
-                address(this),
-                new bytes(0) //placeholder ctx
+            callData = abi.encodeCall(
+                _cfa.deleteFlow,
+                (
+                    superToken,
+                    vars.mfaSender,
+                    address(this),
+                    new bytes(0) //placeholder ctx
+                )
             );
             (newCtx, ) = _host.callAgreementWithContext(
                 _cfa,

package/contracts/mocks/SuperAppMocks.sol

@@ -18,11 +18,13 @@ contract SuperAppMockAux {
     {
         host.callAgreementWithContext(
             agreement,
-            abi.encodeWithSelector(
-                AgreementMock.pingMe.selector,
-                address(this), // expectedMsgSender
-                ping,
-                new bytes(0)
+            abi.encodeCall(
+                agreement.pingMe,
+                (
+                    address(this), // expectedMsgSender
+                    ping,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             ctx);
@@ -33,9 +35,9 @@ contract SuperAppMockAux {
     {
         host.callAppActionWithContext(
             app,
-            abi.encodeWithSelector(
-                SuperAppMock.actionNoop.selector,
-                new bytes(0)
+            abi.encodeCall(
+                app.actionNoop,
+                (new bytes(0))
             ),
             ctx);
     }
@@ -157,11 +159,13 @@ contract SuperAppMock is ISuperApp {
     {
         (newCtx, ) = _host.callAgreementWithContext(
             agreement,
-            abi.encodeWithSelector(
-                AgreementMock.pingMe.selector,
-                address(this), // expectedMsgSender
-                ping,
-                new bytes(0)
+            abi.encodeCall(
+                agreement.pingMe,
+                (
+                    address(this), // expectedMsgSender
+                    ping,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             ctx);
@@ -174,10 +178,12 @@ contract SuperAppMock is ISuperApp {
     {
         (newCtx, ) = _host.callAgreementWithContext(
             agreement,
-            abi.encodeWithSelector(
-                AgreementMock.doRevert.selector,
-                reason,
-                new bytes(0)
+            abi.encodeCall(
+                agreement.doRevert,
+                (
+                    reason,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             ctx);
@@ -190,9 +196,9 @@ contract SuperAppMock is ISuperApp {
     {
         newCtx = _host.callAppActionWithContext(
             this,
-            abi.encodeWithSelector(
-                SuperAppMock.actionNoop.selector,
-                new bytes(0)
+            abi.encodeCall(
+                this.actionNoop,
+                (new bytes(0))
             ),
             ctx);
     }
@@ -204,10 +210,12 @@ contract SuperAppMock is ISuperApp {
     {
         newCtx = _host.callAppActionWithContext(
             this,
-            abi.encodeWithSelector(
-                SuperAppMock.actionRevertWithReason.selector,
-                reason,
-                new bytes(0)
+            abi.encodeCall(
+                this.actionRevertWithReason,
+                (
+                    reason,
+                    new bytes(0)
+                )
             ),
             ctx);
     }
@@ -219,11 +227,13 @@ contract SuperAppMock is ISuperApp {
     {
         (newCtx, ) = _host.callAgreementWithContext(
             agreement,
-            abi.encodeWithSelector(
-                AgreementMock.pingMe.selector,
-                address(this), // expectedMsgSender
-                42,
-                new bytes(0)
+            abi.encodeCall(
+                agreement.pingMe,
+                (
+                    address(this), // expectedMsgSender
+                    42,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             abi.encode(42));
@@ -236,10 +246,12 @@ contract SuperAppMock is ISuperApp {
     {
         newCtx = _host.callAppActionWithContext(
             this,
-            abi.encodeWithSelector(
-                SuperAppMock.actionRevertWithReason.selector,
-                reason,
-                new bytes(0)
+            abi.encodeCall(
+                this.actionRevertWithReason,
+                (
+                    reason,
+                    new bytes(0)
+                )
             ),
             abi.encode(42));
     }
@@ -250,9 +262,9 @@ contract SuperAppMock is ISuperApp {
     {
         _host.callAppActionWithContext(
             this,
-            abi.encodeWithSelector(
-                SuperAppMock.actionAlteringCtx.selector,
-                new bytes(0)
+            abi.encodeCall(
+                this.actionAlteringCtx,
+                (new bytes(0))
             ),
             ctx);
         assert(false);
@@ -573,10 +585,12 @@ contract SuperAppMock2ndLevel {
     {
         (newCtx, ) = _host.callAgreementWithContext(
             _agreement,
-            abi.encodeWithSelector(
-                AgreementMock.callAppAfterAgreementCreatedCallback.selector,
-                _app,
-                new bytes(0)
+            abi.encodeCall(
+                _agreement.callAppAfterAgreementCreatedCallback,
+                (
+                    _app,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             ctx);

package/contracts/superfluid/SuperfluidToken.sol

@@ -7,6 +7,7 @@ import { ISuperfluidGovernance } from "../interfaces/superfluid/ISuperfluidGover
 import { ISuperfluidToken } from "../interfaces/superfluid/ISuperfluidToken.sol";
 
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import { EventsEmitter } from "../libs/EventsEmitter.sol";
 import { FixedSizeData } from "../libs/FixedSizeData.sol";
 
 /**
@@ -213,6 +214,11 @@ abstract contract SuperfluidToken is ISuperfluidToken
         _balances[to] = _balances[to] + amount;
     }
 
+    function _getRewardAccount() internal view returns (address rewardAccount) {
+        ISuperfluidGovernance gov = _host.getGovernance();
+        rewardAccount = gov.getConfigAsAddress(_host, this, _REWARD_ADDRESS_CONFIG_KEY);
+    }
+
     /**************************************************************************
      * Super Agreement hosting functions
      *************************************************************************/
@@ -313,56 +319,52 @@ abstract contract SuperfluidToken is ISuperfluidToken
         bytes32 id,
         bytes memory liquidationTypeData,
         address liquidatorAccount, // the address executing the liquidation
-        bool useDefaultRewardAccount,
-        address targetAccount, // the flow sender
-        uint256 rewardAmount,
-        int256 targetAccountBalanceDelta
+        bool useDefaultRewardAccount, // Whether or not the default reward account receives the rewardAmount
+        address targetAccount, // Account to be liquidated
+        uint256 rewardAmount, // The amount the rewarded account will receive
+        int256 targetAccountBalanceDelta // The delta amount the target account balance should change by
     ) external override onlyAgreement {
-        address rewardAccount;
-        address defaultRewardAccount;
-
-        {
-            ISuperfluidGovernance gov = _host.getGovernance();
-            defaultRewardAccount = gov.getConfigAsAddress(_host, this, _REWARD_ADDRESS_CONFIG_KEY);
-            rewardAccount = defaultRewardAccount;
-        }
+        address rewardAccount = _getRewardAccount();
 
         // we set the rewardAccount to the user who executed the liquidation if
-        // no rewardAccount is set (ANARCHY MODE - should not occur in reality, for testing purposes)
-        if (defaultRewardAccount == address(0)) {
+        // no rewardAccount is set (aka. ANARCHY MODE - should not occur in reality, for testing purposes)
+        if (rewardAccount == address(0)) {
             rewardAccount = liquidatorAccount;
         }
 
-        if (useDefaultRewardAccount) {
-            _balances[rewardAccount] = _balances[rewardAccount]
-                + rewardAmount.toInt256();
+        address rewardAmountReceiver = useDefaultRewardAccount ? rewardAccount : liquidatorAccount;
+
+        if (targetAccountBalanceDelta <= 0) {
+            // LIKELY BRANCH: target account pays penalty to rewarded account
+            assert(rewardAmount.toInt256() == -targetAccountBalanceDelta);
+
+            _balances[rewardAmountReceiver] += rewardAmount.toInt256();
+            _balances[targetAccount] += targetAccountBalanceDelta;
+            EventsEmitter.emitTransfer(targetAccount, rewardAmountReceiver, rewardAmount);
         } else {
-            _balances[liquidatorAccount] = _balances[liquidatorAccount]
-                + rewardAmount.toInt256();
-
-            // this can occur in two cases:
-            // - pleb period: the two amounts cancel each other out
-            // - pirate/bailout period: reward account has to pay bailout amount
-            _balances[rewardAccount] = _balances[rewardAccount]
-                - rewardAmount.toInt256()
-                - targetAccountBalanceDelta;
+            // LESS LIKELY BRANCH: target account is bailed out
+            // NOTE: useDefaultRewardAccount being true is undefined behavior
+            // because the default reward account isn't receiving the rewardAmount by default
+            assert(!useDefaultRewardAccount);
+            _balances[rewardAccount] -= (rewardAmount.toInt256() + targetAccountBalanceDelta);
+            _balances[liquidatorAccount] += rewardAmount.toInt256();
+            _balances[targetAccount] += targetAccountBalanceDelta;
+            EventsEmitter.emitTransfer(rewardAccount, liquidatorAccount, rewardAmount);
+            EventsEmitter.emitTransfer(rewardAccount, targetAccount, uint256(targetAccountBalanceDelta));
         }
 
-        // if targetAccountBalanceDelta > 0, it is a bailout, else a solvent liquidation
-        _balances[targetAccount] = _balances[targetAccount]
-            + targetAccountBalanceDelta;
-
         emit AgreementLiquidatedV2(
             msg.sender,
             id,
             liquidatorAccount,
             targetAccount,
-            useDefaultRewardAccount ? rewardAccount : liquidatorAccount,
+            rewardAmountReceiver,
             rewardAmount,
             targetAccountBalanceDelta,
             liquidationTypeData
         );
     }
+
     /**************************************************************************
     * Modifiers
     *************************************************************************/

package/contracts/utils/BatchLiquidator.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPLv3
 pragma solidity 0.8.13;
 
-import { ISuperfluid, ISuperAgreement } from "../interfaces/superfluid/ISuperfluid.sol";
+import { ISuperfluid, ISuperAgreement, ISuperToken } from "../interfaces/superfluid/ISuperfluid.sol";
 import { IConstantFlowAgreementV1 } from "../interfaces/agreements/IConstantFlowAgreementV1.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
@@ -33,17 +33,21 @@ contract BatchLiquidator {
             // It could be due to flow had been liquidated by others.
             // solhint-disable-next-line avoid-low-level-calls
             (success, ) = address(host).call(
-                abi.encodeWithSelector(
-                    ISuperfluid.callAgreement.selector,
-                    cfa,
-                    abi.encodeWithSelector(
-                        IConstantFlowAgreementV1.deleteFlow.selector,
-                        superToken,
-                        senders[i],
-                        receivers[i],
+                abi.encodeCall(
+                    ISuperfluid(host).callAgreement,
+                    (
+                        ISuperAgreement(cfa),
+                        abi.encodeCall(
+                            IConstantFlowAgreementV1(cfa).deleteFlow,
+                            (
+                                ISuperToken(superToken),
+                                senders[i],
+                                receivers[i],
+                                new bytes(0)
+                            )
+                        ),
                         new bytes(0)
-                    ),
-                    new bytes(0)
+                    )
                 )
             );
         }

package/contracts/utils/TOGA.sol

@@ -197,12 +197,14 @@ contract TOGA is ITOGAv2, IERC777Recipient {
             // need to update existing flow
             _host.callAgreement(
                 _cfa,
-                abi.encodeWithSelector(
-                    _cfa.updateFlow.selector,
-                    token,
-                    currentPICAddr,
-                    newExitRate,
-                    new bytes(0)
+                abi.encodeCall(
+                    _cfa.updateFlow,
+                    (
+                        token,
+                        currentPICAddr,
+                        newExitRate,
+                        new bytes(0)
+                    )
                 ),
                 "0x"
             );
@@ -210,12 +212,14 @@ contract TOGA is ITOGAv2, IERC777Recipient {
             // no pre-existing flow, need to create
             _host.callAgreement(
                 _cfa,
-                abi.encodeWithSelector(
-                    _cfa.createFlow.selector,
-                    token,
-                    currentPICAddr,
-                    newExitRate,
-                    new bytes(0)
+                abi.encodeCall(
+                    _cfa.createFlow,
+                    (
+                        token,
+                        currentPICAddr,
+                        newExitRate,
+                        new bytes(0)
+                    )
                 ),
                 "0x"
             );
@@ -223,12 +227,14 @@ contract TOGA is ITOGAv2, IERC777Recipient {
             // need to close existing flow
             _host.callAgreement(
                 _cfa,
-                abi.encodeWithSelector(
-                    _cfa.deleteFlow.selector,
-                    token,
-                    address(this),
-                    currentPICAddr,
-                    new bytes(0)
+                abi.encodeCall(
+                    _cfa.deleteFlow,
+                    (
+                        token,
+                        address(this),
+                        currentPICAddr,
+                        new bytes(0)
+                    )
                 ),
                 "0x"
             );
@@ -267,12 +273,14 @@ contract TOGA is ITOGAv2, IERC777Recipient {
         if (curFlowRate > 0) {
             _host.callAgreement(
                 _cfa,
-                abi.encodeWithSelector(
-                    _cfa.deleteFlow.selector,
-                    token,
-                    address(this),
-                    currentPICAddr,
-                    new bytes(0)
+                abi.encodeCall(
+                    _cfa.deleteFlow,
+                    (
+                        token,
+                        address(this),
+                        currentPICAddr,
+                        new bytes(0)
+                    )
                 ),
                 "0x"
             );
@@ -300,12 +308,14 @@ contract TOGA is ITOGAv2, IERC777Recipient {
         if (exitRate > 0) {
             _host.callAgreement(
                 _cfa,
-                abi.encodeWithSelector(
-                    _cfa.createFlow.selector,
-                    token,
-                    newPIC,
-                    exitRate,
-                    new bytes(0)
+                abi.encodeCall(
+                    _cfa.createFlow,
+                    (
+                        token,
+                        newPIC,
+                        exitRate,
+                        new bytes(0)
+                    )
                 ),
                 "0x"
             );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@superfluid-finance/ethereum-contracts",
-    "version": "1.2.3-dev.3df6de8.0",
+    "version": "1.2.3-dev.4eebafa.0",
     "description": " Ethereum contracts implementation for the Superfluid Protocol",
     "homepage": "https://github.com/superfluid-finance/protocol-monorepo/tree/dev/packages/ethereum-contracts#readme",
     "repository": {
@@ -56,7 +56,7 @@
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
         "@openzeppelin/contracts": "4.5.0",
-        "@superfluid-finance/js-sdk": "^0.6.2-dev.3df6de8.0",
+        "@superfluid-finance/js-sdk": "^0.6.2-dev.4eebafa.0",
         "@truffle/contract": "4.5.5",
         "ethereumjs-tx": "2.1.2",
         "ethereumjs-util": "7.1.4",