@superfluid-finance/ethereum-contracts 1.2.3-dev.7365205.0 → 1.2.3-dev.7dc62cd.0

package/contracts/interfaces/superfluid/ISuperToken.sol

@@ -47,9 +47,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * Ether and Wei. This is the value {ERC20} uses, unless {_setupDecimals} is
      * called.
      *
-     * NOTE: SuperToken always uses 18 decimals.
+     * @custom:note SuperToken always uses 18 decimals.
      *
-     * Note: This information is only used for _display_ purposes: it in
+     * This information is only used for _display_ purposes: it in
      * no way affects any of the arithmetic of the contract, including
      * {IERC20-balanceOf} and {IERC20-transfer}.
      */
@@ -78,7 +78,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *
      * @return Returns Success a boolean value indicating whether the operation succeeded.
      *
-     * Emits a {Transfer} event.
+     * @custom:emits a {Transfer} event.
      */
     function transfer(address recipient, uint256 amount) external override(IERC20) returns (bool);
 
@@ -87,7 +87,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *         allowed to spend on behalf of `owner` through {transferFrom}. This is
      *         zero by default.
      *
-     * This value changes when {approve} or {transferFrom} are called.
+     * @notice This value changes when {approve} or {transferFrom} are called.
      */
     function allowance(address owner, address spender) external override(IERC20) view returns (uint256);
 
@@ -96,14 +96,14 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *
      * @return Returns Success a boolean value indicating whether the operation succeeded.
      *
-     * IMPORTANT: Beware that changing an allowance with this method brings the risk
+     * @custom:note Beware that changing an allowance with this method brings the risk
      * that someone may use both the old and the new allowance by unfortunate
      * transaction ordering. One possible solution to mitigate this race
      * condition is to first reduce the spender's allowance to 0 and set the
      * desired value afterwards:
      * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729
      *
-     * Emits an {Approval} event.
+     * @custom:emits an {Approval} event.
      */
     function approve(address spender, uint256 amount) external override(IERC20) returns (bool);
 
@@ -114,7 +114,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *
      * @return Returns Success a boolean value indicating whether the operation succeeded.
      *
-     * Emits a {Transfer} event.
+     * @custom:emits a {Transfer} event.
      */
     function transferFrom(address sender, address recipient, uint256 amount) external override(IERC20) returns (bool);
 
@@ -124,10 +124,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * This is an alternative to {approve} that can be used as a mitigation for
      * problems described in {IERC20-approve}.
      *
-     * Emits an {Approval} event indicating the updated allowance.
-     *
-     * Requirements:
+     * @custom:emits an {Approval} event indicating the updated allowance.
      *
+     * @custom:requirements 
      * - `spender` cannot be the zero address.
      */
     function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
@@ -138,10 +137,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * This is an alternative to {approve} that can be used as a mitigation for
      * problems described in {IERC20-approve}.
      *
-     * Emits an {Approval} event indicating the updated allowance.
-     *
-     * Requirements:
+     * @custom:emits an {Approval} event indicating the updated allowance.
      *
+     * @custom:requirements 
      * - `spender` cannot be the zero address.
      * - `spender` must have allowance for the caller of at least
      * `subtractedValue`.
@@ -157,7 +155,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *         means all token operations (creation, movement and destruction) must have
      *         amounts that are a multiple of this number.
      *
-     * For super token contracts, this value is 1 always
+     * @custom:note For super token contracts, this value is always 1
      */
     function granularity() external view override(IERC777) returns (uint256);
 
@@ -168,10 +166,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *      the corresponding functions will be called with `data` and empty
      *      `operatorData`. See {IERC777Sender} and {IERC777Recipient}.
      *
-     * Emits a {Sent} event.
-     *
-     * Requirements
+     * @custom:emits a {Sent} event.
      *
+     * @custom:requirements 
      * - the caller must have at least `amount` tokens.
      * - `recipient` cannot be the zero address.
      * - if `recipient` is a contract, it must implement the {IERC777Recipient}
@@ -186,10 +183,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * If a send hook is registered for the caller, the corresponding function
      * will be called with `data` and empty `operatorData`. See {IERC777Sender}.
      *
-     * Emits a {Burned} event.
-     *
-     * Requirements
+     * @custom:emits a {Burned} event.
      *
+     * @custom:requirements 
      * - the caller must have at least `amount` tokens.
      */
     function burn(uint256 amount, bytes calldata data) external override(IERC777);
@@ -208,10 +204,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *
      * See {isOperatorFor}.
      *
-     * Emits an {AuthorizedOperator} event.
-     *
-     * Requirements
+     * @custom:emits an {AuthorizedOperator} event.
      *
+     * @custom:requirements 
      * - `operator` cannot be calling address.
      */
     function authorizeOperator(address operator) external override(IERC777);
@@ -221,10 +216,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      *
      * See {isOperatorFor} and {defaultOperators}.
      *
-     * Emits a {RevokedOperator} event.
-     *
-     * Requirements
+     * @custom:emits a {RevokedOperator} event.
      *
+     * @custom:requirements 
      * - `operator` cannot be calling address.
      */
     function revokeOperator(address operator) external override(IERC777);
@@ -247,10 +241,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * the corresponding functions will be called with `data` and
      * `operatorData`. See {IERC777Sender} and {IERC777Recipient}.
      *
-     * Emits a {Sent} event.
-     *
-     * Requirements
+     * @custom:emits a {Sent} event.
      *
+     * @custom:requirements 
      * - `sender` cannot be the zero address.
      * - `sender` must have at least `amount` tokens.
      * - the caller must be an operator for `sender`.
@@ -273,10 +266,9 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * If a send hook is registered for `account`, the corresponding function
      * will be called with `data` and `operatorData`. See {IERC777Sender}.
      *
-     * Emits a {Burned} event.
-     *
-     * Requirements
+     * @custom:emits a {Burned} event.
      *
+     * @custom:requirements 
      * - `account` cannot be the zero address.
      * - `account` must have at least `amount` tokens.
      * - the caller must be an operator for `account`.
@@ -295,7 +287,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     /**
      * @dev Mint new tokens for the account
      *
-     * Modifiers:
+     * @custom:modifiers 
      *  - onlySelf
      */
     function selfMint(
@@ -307,7 +299,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
    /**
     * @dev Burn existing tokens for the account
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlySelf
     */
    function selfBurn(
@@ -321,7 +313,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * If `spender` isn't the same as `sender`, checks if `spender` has allowance to
     * spend tokens of `sender`.
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlySelf
     */
    function selfTransferFrom(
@@ -335,7 +327,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * @dev Give `spender`, `amount` allowance to spend the tokens of
     * `account`.
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlySelf
     */
    function selfApproveFor(
@@ -367,8 +359,8 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * @dev Upgrade ERC20 to SuperToken.
      * @param amount Number of tokens to be upgraded (in 18 decimals)
      *
-     * NOTE: It will use ´transferFrom´ to get tokens. Before calling this
-     * function you should ´approve´ this contract
+     * @custom:note It will use `transferFrom` to get tokens. Before calling this
+     * function you should `approve` this contract
      */
     function upgrade(uint256 amount) external;
 
@@ -378,8 +370,8 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
      * @param amount Number of tokens to be upgraded (in 18 decimals)
      * @param data User data for the TokensRecipient callback
      *
-     * NOTE: It will use ´transferFrom´ to get tokens. Before calling this
-     * function you should ´approve´ this contract
+     * @custom:note It will use `transferFrom` to get tokens. Before calling this
+     * function you should `approve` this contract
      */
     function upgradeTo(address to, uint256 amount, bytes calldata data) external;
 
@@ -420,7 +412,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * @param spender The spender of account owner's funds.
     * @param amount Number of tokens to be approved.
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlyHost
     */
     function operationApprove(
@@ -436,7 +428,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * @param recipient The recipient of thefunds.
     * @param amount Number of tokens to be transferred.
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlyHost
     */
     function operationTransferFrom(
@@ -451,7 +443,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * @param account The account to be changed.
     * @param amount Number of tokens to be upgraded (in 18 decimals)
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlyHost
     */
     function operationUpgrade(address account, uint256 amount) external;
@@ -461,7 +453,7 @@ interface ISuperToken is ISuperfluidToken, TokenInfo, IERC20, IERC777 {
     * @param account The account to be changed.
     * @param amount Number of tokens to be downgraded (in 18 decimals)
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlyHost
     */
     function operationDowngrade(address account, uint256 amount) external;

package/contracts/interfaces/superfluid/ISuperfluid.sol

@@ -21,8 +21,7 @@ import { IERC777 } from "@openzeppelin/contracts/token/ERC777/IERC777.sol";
 /**
  * @title Host interface
  * @author Superfluid
- * NOTE:
- * This is the central contract of the system where super agreement, super app
+ * @notice This is the central contract of the system where super agreement, super app
  * and super token features are connected.
  *
  * The Superfluid host contract is also the entry point for the protocol users,
@@ -70,8 +69,8 @@ interface ISuperfluid {
      * @dev Register a new agreement class to the system
      * @param agreementClassLogic Initial agreement class code
      *
-     * Modifiers:
-     *  - onlyGovernance
+     * @custom:modifiers 
+     * - onlyGovernance
      */
     function registerAgreementClass(ISuperAgreement agreementClassLogic) external;
     /**
@@ -86,7 +85,7 @@ interface ISuperfluid {
     * @dev Update code of an agreement class
     * @param agreementClassLogic New code for the agreement class
     *
-    * Modifiers:
+    * @custom:modifiers 
     *  - onlyGovernance
     */
     function updateAgreementClass(ISuperAgreement agreementClassLogic) external;
@@ -199,21 +198,18 @@ interface ISuperfluid {
 
     /**
      * @dev Message sender declares itself as a super app.
-     * @param configWord The super app manifest configuration, flags are defined in
-     * `SuperAppDefinitions`
-     * @param registrationKey The registration key issued by the governance, needed to
-     * register on a mainnet.
-     * See https://github.com/superfluid-finance/protocol-monorepo/wiki/Super-App-White-listing-Guide
+     * @param configWord The super app manifest configuration, flags are defined in `SuperAppDefinitions`
+     * @param registrationKey The registration key issued by the governance, needed to register on a mainnet.
+     * @notice See https://github.com/superfluid-finance/protocol-monorepo/wiki/Super-App-White-listing-Guide
      * On testnets or in dev environment, a placeholder (e.g. empty string) can be used.
-     * @notice While the message sender must be the super app itself, the transaction sender (tx.origin)
+     * While the message sender must be the super app itself, the transaction sender (tx.origin)
      * must be the deployer account the registration key was issued for.
      */
     function registerAppWithKey(uint256 configWord, string calldata registrationKey) external;
 
     /**
      * @dev Message sender (must be a contract) declares app as a super app
-     * @param configWord The super app manifest configuration, flags are defined in
-     * `SuperAppDefinitions`
+     * @param configWord The super app manifest configuration, flags are defined in `SuperAppDefinitions`
      * @notice On mainnet deployments, only factory contracts pre-authorized by governance can use this.
      * See https://github.com/superfluid-finance/protocol-monorepo/wiki/Super-App-White-listing-Guide
      */
@@ -303,7 +299,7 @@ interface ISuperfluid {
      * @param  callData          The call data sending to the super app.
      * @param  isTermination     Is it a termination callback?
      * @param  ctx               Current ctx, it will be validated.
-     * @return newCtx
+     * @return newCtx            The current context of the transaction.
      */
     function callAppAfterCallback(
         ISuperApp app,
@@ -322,7 +318,7 @@ interface ISuperfluid {
      * @param  app                     The super app.
      * @param  appAllowanceGranted     App allowance granted so far.
      * @param  appAllowanceUsed        App allowance used so far.
-     * @return newCtx
+     * @return newCtx                  The current context of the transaction.
      */
     function appCallbackPush(
         bytes calldata ctx,
@@ -340,9 +336,9 @@ interface ISuperfluid {
      * @dev (For agreements) Pop from the current app callback stack
      * @param  ctx                     The ctx that was pushed before the callback stack.
      * @param  appAllowanceUsedDelta   App allowance used by the app.
-     * @return newCtx
+     * @return newCtx                  The current context of the transaction.
      *
-     * [SECURITY] NOTE:
+     * @custom:security 
      * - Here we cannot do assertValidCtx(ctx), since we do not really save the stack in memory.
      * - Hence there is still implicit trust that the agreement handles the callback push/pop pair correctly.
      */
@@ -359,7 +355,7 @@ interface ISuperfluid {
      * @param  ctx                      The current ctx, it will be validated.
      * @param  appAllowanceWantedMore   See app allowance for more details.
      * @param  appAllowanceUsedDelta    See app allowance for more details.
-     * @return newCtx
+     * @return newCtx                   The current context of the transaction.
      */
     function ctxUseAllowance(
         bytes calldata ctx,
@@ -375,7 +371,7 @@ interface ISuperfluid {
      * @dev (For agreements) Jail the app.
      * @param  app                     The super app.
      * @param  reason                  Jail reason code.
-     * @return newCtx
+     * @return newCtx                  The current context of the transaction.
      */
     function jailApp(
         bytes calldata ctx,
@@ -427,7 +423,7 @@ interface ISuperfluid {
      * @dev Main use case is calling app action in a batch call via the host
      * @param callData The contextual call data
      *
-     * NOTE: See "Contextless Call Proxies" above for more about contextual call data.
+     * @custom:note See "Contextless Call Proxies" above for more about contextual call data.
      */
     function callAppAction(
         ISuperApp app,
@@ -453,7 +449,7 @@ interface ISuperfluid {
     /**
      * @dev Context Struct
      *
-     * NOTE on backward compatibility:
+     * @custom:note on backward compatibility:
      * - Non-dynamic fields are padded to 32bytes and packed
      * - Dynamic fields are referenced through a 32bytes offset to their "parents" field (or root)
      * - The order of the fields hence should not be rearranged in order to be backward compatible:

package/contracts/interfaces/superfluid/ISuperfluidGovernance.sol

@@ -30,7 +30,7 @@ interface ISuperfluidGovernance {
     /**
      * @dev Update logics of the contracts
      *
-     * NOTE:
+     * @custom:note 
      * - Because they might have inter-dependencies, it is good to have one single function to update them all
      */
     function updateContracts(

package/contracts/interfaces/superfluid/ISuperfluidToken.sol

@@ -22,7 +22,7 @@ interface ISuperfluidToken {
     /**
      * @dev Encoded liquidation type data mainly used for handling stack to deep errors
      *
-     * Note:
+     * @custom:note 
      * - version: 1
      * - liquidationType key:
      *    - 0 = reward account receives reward (PIC period)
@@ -105,7 +105,7 @@ interface ISuperfluidToken {
      * @dev An account is insolvent when the sum of deposits for a token can't cover the negative availableBalance
      * @param account The account to check
      * @param timestamp The time we'd like to check if the account is solvent (should use future)
-     * @return isSolvent
+     * @return isSolvent True if the account is solvent, false otherwise
      */
     function isAccountSolvent(
         address account,
@@ -118,7 +118,7 @@ interface ISuperfluidToken {
      * @notice Check if account is solvent now
      * @dev An account is insolvent when the sum of deposits for a token can't cover the negative availableBalance
      * @param account The account to check
-     * @return isSolvent
+     * @return isSolvent True if the account is solvent, false otherwise
      */
     function isAccountSolventNow(
         address account
@@ -222,7 +222,7 @@ interface ISuperfluidToken {
      * @dev Update agreement state slot
      * @param account Account to be updated
      *
-     * NOTE
+     * @custom:note 
      * - To clear the storage out, provide zero-ed array of intended length
      */
     function updateAgreementStateSlot(
@@ -265,7 +265,7 @@ interface ISuperfluidToken {
      * @param account Account to query.
      * @param delta Amount of balance delta to be settled
      *
-     * Modifiers:
+     * @custom:modifiers 
      *  - onlyAgreement
      */
     function settleBalance(
@@ -280,10 +280,11 @@ interface ISuperfluidToken {
      * @param liquidationTypeData Data regarding the version of the liquidation schema and the type
      * @param liquidatorAccount Address of the executor of the liquidation
      * @param useDefaultRewardAccount Whether or not the default reward account receives the rewardAmount
-     * @param targetAccount Account of the stream sender
-     * @param rewardAmount The amount the reward recepient account will receive
-     * @param targetAccountBalanceDelta The amount the sender account balance should change by
+     * @param targetAccount Account to be liquidated
+     * @param rewardAmount The amount the rewarded account will receive
+     * @param targetAccountBalanceDelta The delta amount the target account balance should change by
      *
+     * @custom:note 
      * - If a bailout is required (bailoutAmount > 0)
      *   - the actual reward (single deposit) goes to the executor,
      *   - while the reward account becomes the bailout account
@@ -293,7 +294,7 @@ interface ISuperfluidToken {
      *   - the targetAccount will pay the rewardAmount
      *   - the liquidator (reward account in PIC period) will receive the rewardAmount
      *
-     * Modifiers:
+     * @custom:modifiers 
      *  - onlyAgreement
      */
     function makeLiquidationPayoutsV2
@@ -312,22 +313,22 @@ interface ISuperfluidToken {
      * @param id Agreement ID
      * @param liquidatorAccount Address of the executor of the liquidation
      * @param targetAccount Account of the stream sender
-     * @param rewardAccount Account that collects the reward or bails out insolvent accounts
+     * @param rewardAmountReceiver Account that collects the reward or bails out insolvent accounts
      * @param rewardAmount The amount the reward recipient account balance should change by
      * @param targetAccountBalanceDelta The amount the sender account balance should change by
      * @param liquidationTypeData The encoded liquidation type data including the version (how to decode)
      *
-     * NOTE:
+     * @custom:note 
      * Reward account rule:
      * - if the agreement is liquidated during the PIC period
-     *   - the rewardAccount will get the rewardAmount (remaining deposit), regardless of the liquidatorAccount
+     *   - the rewardAmountReceiver will get the rewardAmount (remaining deposit), regardless of the liquidatorAccount
      *   - the targetAccount will pay for the rewardAmount
      * - if the agreement is liquidated after the PIC period AND the targetAccount is solvent
-     *   - the liquidatorAccount will get the rewardAmount (remaining deposit)
+     *   - the rewardAmountReceiver will get the rewardAmount (remaining deposit)
      *   - the targetAccount will pay for the rewardAmount
      * - if the targetAccount is insolvent
      *   - the liquidatorAccount will get the rewardAmount (single deposit)
-     *   - the rewardAccount will pay for both the rewardAmount and bailoutAmount
+     *   - the default reward account (governance) will pay for both the rewardAmount and bailoutAmount
      *   - the targetAccount will receive the bailoutAmount
      */
     event AgreementLiquidatedV2(
@@ -335,7 +336,7 @@ interface ISuperfluidToken {
         bytes32 id,
         address indexed liquidatorAccount,
         address indexed targetAccount,
-        address rewardAccount,
+        address rewardAmountReceiver,
         uint256 rewardAmount,
         int256 targetAccountBalanceDelta,
         bytes liquidationTypeData
@@ -368,9 +369,7 @@ interface ISuperfluidToken {
      * @param rewardAccount Account that collect the reward
      * @param rewardAmount Amount of liquidation reward
      *
-     * NOTE:
-     *
-     * [DEPRECATED] Use AgreementLiquidatedV2 instead
+     * @custom:deprecated Use AgreementLiquidatedV2 instead
      */
     event AgreementLiquidated(
         address indexed agreementClass,
@@ -385,9 +384,7 @@ interface ISuperfluidToken {
      * @param bailoutAccount Account that bailout the penalty account
      * @param bailoutAmount Amount of account bailout
      *
-     * NOTE:
-     *
-     * [DEPRECATED] Use AgreementLiquidatedV2 instead
+     * @custom:deprecated Use AgreementLiquidatedV2 instead
      */
     event Bailout(
         address indexed bailoutAccount,
@@ -404,7 +401,9 @@ interface ISuperfluidToken {
      * @param rewardAmount Amount of liquidation reward
      * @param bailoutAmount Amount of liquidation bailouot
      *
-     * NOTE:
+     * @custom:deprecated Use AgreementLiquidatedV2 instead
+     *
+     * @custom:note 
      * Reward account rule:
      * - if bailout is equal to 0, then
      *   - the bondAccount will get the rewardAmount,

package/contracts/libs/EventsEmitter.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: AGPLv3
+pragma solidity 0.8.13;
+
+/**
+ * @title Events Emitter Library
+ * @author Superfluid
+ * @dev A library used for emitting missing and unaccessable events.
+ * 
+ */
+library EventsEmitter {
+    event Transfer(address indexed from, address indexed to, uint256 value);
+
+    function emitTransfer(address from, address to, uint256 value) internal {
+        emit Transfer(from, to, value);
+    }
+}

package/contracts/mocks/CFAAppMocks.sol

@@ -53,12 +53,14 @@ contract ExclusiveInflowTestApp is SuperAppBase {
         newCtx = ctx;
         ISuperfluid.Context memory context = _host.decodeCtx(ctx);
         if (_currentSender != address(0)) {
-            bytes memory callData = abi.encodeWithSelector(
-                _cfa.deleteFlow.selector,
-                superToken,
-                _currentSender,
-                address(this),
-                new bytes(0)
+            bytes memory callData = abi.encodeCall(
+                _cfa.deleteFlow,
+                (
+                    superToken,
+                    _currentSender,
+                    address(this),
+                    new bytes(0)
+                )
             );
             (newCtx, ) = _host.callAgreementWithContext(
                 _cfa,
@@ -133,12 +135,14 @@ contract NonClosableOutflowTestApp is SuperAppBase {
         _flowRate = flowRate;
         _host.callAgreement(
             _cfa,
-            abi.encodeWithSelector(
-                _cfa.createFlow.selector,
-                superToken,
-                receiver,
-                flowRate,
-                new bytes(0)
+            abi.encodeCall(
+                _cfa.createFlow,
+                (
+                    superToken,
+                    receiver,
+                    flowRate,
+                    new bytes(0)
+                )
             ),
             new bytes(0) // user data
         );
@@ -158,16 +162,22 @@ contract NonClosableOutflowTestApp is SuperAppBase {
         (address flowSender, address flowReceiver) = abi.decode(agreementData, (address, address));
         assert(flowSender == address(this));
         assert(flowReceiver == _receiver);
-        // recreate the flow
-        (newCtx, ) = _host.callAgreementWithContext(
-            _cfa,
-            abi.encodeWithSelector(
-                _cfa.createFlow.selector,
+
+        // moved out to avoid stack too deep error
+        bytes memory callData = abi.encodeCall(
+            _cfa.createFlow,
+            (
                 superToken,
                 flowReceiver,
                 _flowRate,
                 new bytes(0)
-            ),
+            )
+        );
+
+        // recreate the flow
+        (newCtx, ) = _host.callAgreementWithContext(
+            _cfa,
+            callData,
             "0x",
             ctx
         );
@@ -218,12 +228,14 @@ contract SelfDeletingFlowTestApp is SuperAppBase {
         ISuperfluid.Context memory context = _host.decodeCtx(ctx);
         (newCtx, ) = _host.callAgreementWithContext(
             _cfa,
-            abi.encodeWithSelector(
-                _cfa.deleteFlow.selector,
-                superToken,
-                context.msgSender,
-                address(this),
-                new bytes(0)
+            abi.encodeCall(
+                _cfa.deleteFlow,
+                (
+                    superToken,
+                    context.msgSender,
+                    address(this),
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             newCtx
@@ -273,12 +285,14 @@ contract ClosingOnUpdateFlowTestApp is SuperAppBase {
         ISuperfluid.Context memory context = _host.decodeCtx(ctx);
         (newCtx, ) = _host.callAgreementWithContext(
             _cfa,
-            abi.encodeWithSelector(
-                _cfa.deleteFlow.selector,
-                superToken,
-                context.msgSender,
-                address(this),
-                new bytes(0)
+            abi.encodeCall(
+                _cfa.deleteFlow,
+                (
+                    superToken,
+                    context.msgSender,
+                    address(this),
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             newCtx
@@ -331,12 +345,14 @@ contract FlowExchangeTestApp is SuperAppBase {
         (,int96 flowRate,,) = _cfa.getFlow(superToken, context.msgSender, address(this));
         (newCtx, ) = _host.callAgreementWithContext(
             _cfa,
-            abi.encodeWithSelector(
-                _cfa.createFlow.selector,
-                _targetToken,
-                context.msgSender,
-                flowRate,
-                new bytes(0)
+            abi.encodeCall(
+                _cfa.createFlow,
+                (
+                    _targetToken,
+                    context.msgSender,
+                    flowRate,
+                    new bytes(0)
+                )
             ),
             new bytes(0), // user data
             newCtx