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

package/contracts/apps/IDAv1Library.sol

@@ -186,11 +186,13 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.createIndex.selector,
-                token,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.createIndex,
+                (
+                    token,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -225,11 +227,13 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.createIndex.selector,
-                token,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.createIndex,
+                (
+                    token,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -268,12 +272,14 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.updateIndex.selector,
-                token,
-                indexId,
-                indexValue,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.updateIndex,
+                (
+                    token,
+                    indexId,
+                    indexValue,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -321,12 +327,14 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.updateIndex.selector,
-                token,
-                indexId,
-                indexValue,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.updateIndex,
+                (
+                    token,
+                    indexId,
+                    indexValue,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -365,12 +373,14 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.distribute.selector,
-                token,
-                indexId,
-                amount,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.distribute,
+                (
+                    token,
+                    indexId,
+                    amount,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -411,13 +421,15 @@ library IDAv1Library {
         bytes memory userData
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
-            idaLibrary.ida, 
-            abi.encodeWithSelector(
-                idaLibrary.ida.distribute.selector,
-                token,
-                indexId,
-                amount,
-                new bytes(0) // ctx placeholder
+            idaLibrary.ida,
+            abi.encodeCall(
+                idaLibrary.ida.distribute,
+                (
+                    token,
+                    indexId,
+                    amount,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -462,12 +474,14 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.approveSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.approveSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -517,12 +531,14 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.approveSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.approveSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -558,12 +574,14 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.revokeSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.revokeSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -610,12 +628,14 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.revokeSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.revokeSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -657,13 +677,15 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.updateSubscription.selector,
-                token,
-                indexId,
-                subscriber,
-                units,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.updateSubscription,
+                (
+                    token,
+                    indexId,
+                    subscriber,
+                    units,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -716,13 +738,15 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.updateSubscription.selector,
-                token,
-                indexId,
-                subscriber,
-                units,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.updateSubscription,
+                (
+                    token,
+                    indexId,
+                    subscriber,
+                    units,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -763,13 +787,15 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.deleteSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                subscriber,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.deleteSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    subscriber,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -821,13 +847,15 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.deleteSubscription.selector,
-                token,
-                publisher,
-                indexId,
-                subscriber,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.deleteSubscription,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    subscriber,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx
@@ -868,13 +896,15 @@ library IDAv1Library {
     ) internal {
         idaLibrary.host.callAgreement(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.claim.selector,
-                token,
-                publisher,
-                indexId,
-                subscriber,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.claim,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    subscriber,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData
         );
@@ -925,13 +955,15 @@ library IDAv1Library {
     ) internal returns (bytes memory newCtx) {
         (newCtx, ) = idaLibrary.host.callAgreementWithContext(
             idaLibrary.ida,
-            abi.encodeWithSelector(
-                idaLibrary.ida.claim.selector,
-                token,
-                publisher,
-                indexId,
-                subscriber,
-                new bytes(0) // ctx placeholder
+            abi.encodeCall(
+                idaLibrary.ida.claim,
+                (
+                    token,
+                    publisher,
+                    indexId,
+                    subscriber,
+                    new bytes(0) // ctx placeholder
+                )
             ),
             userData,
             ctx

package/contracts/interfaces/superfluid/ISuperfluidToken.sol

@@ -280,9 +280,9 @@ 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
      *
      * - If a bailout is required (bailoutAmount > 0)
      *   - the actual reward (single deposit) goes to the executor,
@@ -312,7 +312,7 @@ 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)
@@ -320,14 +320,14 @@ interface ISuperfluidToken {
      * 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 +335,7 @@ interface ISuperfluidToken {
         bytes32 id,
         address indexed liquidatorAccount,
         address indexed targetAccount,
-        address rewardAccount,
+        address rewardAmountReceiver,
         uint256 rewardAmount,
         int256 targetAccountBalanceDelta,
         bytes liquidationTypeData

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

package/contracts/mocks/CustomSuperTokenMock.sol

@@ -60,9 +60,16 @@ contract CustomSuperTokenProxyMock is CustomSuperTokenBaseMock {
     ) external {
         address logic = _implementation();
         // solhint-disable-next-line avoid-low-level-calls
-        (bool success, ) = logic.delegatecall(abi.encodeWithSelector(
-            ISuperToken.selfMint.selector,
-            to, amount, userData));
+        (bool success, ) = logic.delegatecall(
+            abi.encodeCall(
+                ISuperToken(address(this)).selfMint,
+                (
+                    to,
+                    amount,
+                    userData
+                )
+            )
+        );
         assert(success);
     }
 
@@ -75,7 +82,7 @@ contract CustomSuperTokenProxyMock is CustomSuperTokenBaseMock {
         // this makes msg.sender to self
         ISuperToken(address(this)).selfBurn(to, amount, userData);
     }
-    
+
     // this function self calls transferFrom
     function callSelfTransferFrom(
         address holder,

package/contracts/mocks/IDASuperAppTester.sol

@@ -33,11 +33,13 @@ contract IDASuperAppTester is ISuperApp {
 
         _host.callAgreement(
             _ida,
-            abi.encodeWithSelector(
-                _ida.createIndex.selector,
-                _token,
-                _indexId,
-                new bytes(0) // placeholder ctx
+            abi.encodeCall(
+                _ida.createIndex,
+                (
+                    _token,
+                    _indexId,
+                    new bytes(0) // placeholder ctx
+                )
             ),
             new bytes(0) // user data
         );
@@ -51,13 +53,15 @@ contract IDASuperAppTester is ISuperApp {
     {
         _host.callAgreement(
             _ida,
-            abi.encodeWithSelector(
-                _ida.updateSubscription.selector,
-                _token,
-                _indexId,
-                subscriber,
-                units,
-                new bytes(0) // placeholder ctx
+            abi.encodeCall(
+                _ida.updateSubscription,
+                (
+                    _token,
+                    _indexId,
+                    subscriber,
+                    units,
+                    new bytes(0) // placeholder ctx
+                )
             ),
             new bytes(0) // user data
         );
@@ -70,12 +74,14 @@ contract IDASuperAppTester is ISuperApp {
     {
         _host.callAgreement(
             _ida,
-            abi.encodeWithSelector(
-                _ida.distribute.selector,
-                _token,
-                _indexId,
-                amount,
-                new bytes(0) // placeholder ctx
+            abi.encodeCall(
+                _ida.distribute,
+                (
+                    _token,
+                    _indexId,
+                    amount,
+                    new bytes(0) // placeholder ctx
+                )
             ),
             new bytes(0) // user data
         );