@superfluid-finance/ethereum-contracts 1.2.1-dev.90ccb01.0 → 1.2.2-dev.2bc50bf.0

package/build/contracts/UUPSUtils.json

@@ -15,15 +15,15 @@
     "absolutePath": "project:/contracts/upgradability/UUPSUtils.sol",
     "exportedSymbols": {
       "UUPSUtils": [
-        36368
+        36349
       ]
     },
-    "id": 36369,
+    "id": 36350,
     "license": "AGPLv3",
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 36346,
+        "id": 36327,
         "literals": [
           "solidity",
           "0.8",
@@ -39,15 +39,15 @@
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 36347,
+          "id": 36328,
           "nodeType": "StructuredDocumentation",
           "src": "60:76:100",
           "text": " @title UUPS (Universal Upgradeable Proxy Standard) Shared Library"
         },
         "fullyImplemented": true,
-        "id": 36368,
+        "id": 36349,
         "linearizedBaseContracts": [
-          36368
+          36349
         ],
         "name": "UUPSUtils",
         "nameLocation": "145:9:100",
@@ -56,17 +56,17 @@
           {
             "constant": true,
             "documentation": {
-              "id": 36348,
+              "id": 36329,
               "nodeType": "StructuredDocumentation",
               "src": "162:288:100",
               "text": " @dev Implementation slot constant.\n Using https://eips.ethereum.org/EIPS/eip-1967 standard\n Storage slot 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\n (obtained as bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1))."
             },
-            "id": 36351,
+            "id": 36332,
             "mutability": "constant",
             "name": "_IMPLEMENTATION_SLOT",
             "nameLocation": "481:20:100",
             "nodeType": "VariableDeclaration",
-            "scope": 36368,
+            "scope": 36349,
             "src": "455:115:100",
             "stateVariable": true,
             "storageLocation": "default",
@@ -75,7 +75,7 @@
               "typeString": "bytes32"
             },
             "typeName": {
-              "id": 36349,
+              "id": 36330,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
               "src": "455:7:100",
@@ -86,7 +86,7 @@
             },
             "value": {
               "hexValue": "307833363038393461313362613161333231303636376338323834393264623938646361336532303736636333373335613932306133636135303564333832626263",
-              "id": 36350,
+              "id": 36331,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -104,7 +104,7 @@
           },
           {
             "body": {
-              "id": 36358,
+              "id": 36339,
               "nodeType": "Block",
               "src": "681:107:100",
               "statements": [
@@ -145,33 +145,33 @@
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 36351,
+                      "declaration": 36332,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "751:20:100",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 36355,
+                      "declaration": 36336,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "737:4:100",
                       "valueSize": 1
                     }
                   ],
-                  "id": 36357,
+                  "id": 36338,
                   "nodeType": "InlineAssembly",
                   "src": "691:91:100"
                 }
               ]
             },
             "documentation": {
-              "id": 36352,
+              "id": 36333,
               "nodeType": "StructuredDocumentation",
               "src": "577:36:100",
               "text": "@dev Get implementation address."
             },
-            "id": 36359,
+            "id": 36340,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -179,23 +179,23 @@
             "nameLocation": "627:14:100",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 36353,
+              "id": 36334,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "641:2:100"
             },
             "returnParameters": {
-              "id": 36356,
+              "id": 36337,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 36355,
+                  "id": 36336,
                   "mutability": "mutable",
                   "name": "impl",
                   "nameLocation": "675:4:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 36359,
+                  "scope": 36340,
                   "src": "667:12:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -204,7 +204,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 36354,
+                    "id": 36335,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "667:7:100",
@@ -219,7 +219,7 @@
               ],
               "src": "666:14:100"
             },
-            "scope": 36368,
+            "scope": 36349,
             "src": "618:170:100",
             "stateMutability": "view",
             "virtual": false,
@@ -227,7 +227,7 @@
           },
           {
             "body": {
-              "id": 36366,
+              "id": 36347,
               "nodeType": "Block",
               "src": "896:171:100",
               "statements": [
@@ -266,33 +266,33 @@
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 36351,
+                      "declaration": 36332,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "988:20:100",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 36362,
+                      "declaration": 36343,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "1026:11:100",
                       "valueSize": 1
                     }
                   ],
-                  "id": 36365,
+                  "id": 36346,
                   "nodeType": "InlineAssembly",
                   "src": "906:155:100"
                 }
               ]
             },
             "documentation": {
-              "id": 36360,
+              "id": 36341,
               "nodeType": "StructuredDocumentation",
               "src": "794:40:100",
               "text": "@dev Set new implementation address."
             },
-            "id": 36367,
+            "id": 36348,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -300,17 +300,17 @@
             "nameLocation": "848:17:100",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 36363,
+              "id": 36344,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 36362,
+                  "id": 36343,
                   "mutability": "mutable",
                   "name": "codeAddress",
                   "nameLocation": "874:11:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 36367,
+                  "scope": 36348,
                   "src": "866:19:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -319,7 +319,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 36361,
+                    "id": 36342,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "866:7:100",
@@ -335,19 +335,19 @@
               "src": "865:21:100"
             },
             "returnParameters": {
-              "id": 36364,
+              "id": 36345,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "896:0:100"
             },
-            "scope": 36368,
+            "scope": 36349,
             "src": "839:228:100",
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           }
         ],
-        "scope": 36369,
+        "scope": 36350,
         "src": "137:933:100",
         "usedErrors": []
       }
@@ -360,7 +360,7 @@
   },
   "networks": {},
   "schemaVersion": "3.4.7",
-  "updatedAt": "2022-04-29T12:22:59.103Z",
+  "updatedAt": "2022-04-30T08:07:02.564Z",
   "devdoc": {
     "kind": "dev",
     "methods": {},

package/build/contracts-sizes.txt

@@ -7,6 +7,6 @@ InstantDistributionAgreementV1.sol : 21970 (2606)
 SlotsBitmapLibrary.sol : 2724 (21852)
 AgreementLibrary.sol : 143 (24433)
 AgreementBase.sol : 2 (24574)
-ConstantFlowAgreementV1.sol : 21713 (2863)
+ConstantFlowAgreementV1.sol : 21634 (2942)
 SuperfluidGovernanceBase.sol : 2 (24574)
 SuperfluidGovernanceII.sol : 6919 (17657)

package/contracts/agreements/ConstantFlowAgreementV1.sol

@@ -40,7 +40,6 @@ contract ConstantFlowAgreementV1 is
      * E_NO_OPERATOR_CREATE_FLOW - operator does not have permissions to create flow
      * E_NO_OPERATOR_UPDATE_FLOW - operator does not have permissions to update flow
      * E_NO_OPERATOR_DELETE_FLOW - operator does not have permissions to delete flow
-     * E_NO_PERMISSIONS_UPDATE - unauthorized flow operator permissions update (not from sender)
      * E_NO_SENDER_FLOW_OPERATOR - sender cannot set themselves as the flow operator
      * E_NO_NEGATIVE_ALLOWANCE - sender cannot set a negative allowance
      */
@@ -675,7 +674,6 @@ contract ConstantFlowAgreementV1 is
     /// @dev IConstantFlowAgreementV1.updateFlowOperatorPermissions implementation
     function updateFlowOperatorPermissions(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         uint8 permissions,
         int96 flowRateAllowance, // flowRateBudget
@@ -684,22 +682,22 @@ contract ConstantFlowAgreementV1 is
         newCtx = ctx;
         require(FlowOperatorDefinitions.isPermissionsClean(permissions), "CFA: Unclean permissions");
         ISuperfluid.Context memory currentContext = AgreementLibrary.authorizeTokenAccess(token, ctx);
-        require(sender == currentContext.msgSender, "CFA: E_NO_PERMISSIONS_UPDATE");
-        require(sender != flowOperator, "CFA: E_NO_SENDER_FLOW_OPERATOR");
+        // [SECURITY] NOTE: we are holding the assumption here that ctx is correct and we validate it with 
+        // authorizeTokenAccess:
+        require(currentContext.msgSender != flowOperator, "CFA: E_NO_SENDER_FLOW_OPERATOR");
         require(flowRateAllowance >= 0, "CFA: E_NO_NEGATIVE_ALLOWANCE");
         FlowOperatorData memory flowOperatorData;
         flowOperatorData.permissions = permissions;
         flowOperatorData.flowRateAllowance = flowRateAllowance;
-        bytes32 flowOperatorId = _generateFlowOperatorId(sender, flowOperator);
+        bytes32 flowOperatorId = _generateFlowOperatorId(currentContext.msgSender, flowOperator);
         token.updateAgreementData(flowOperatorId, _encodeFlowOperatorData(flowOperatorData));
 
-        emit FlowOperatorUpdated(token, sender, flowOperator, permissions, flowRateAllowance);
+        emit FlowOperatorUpdated(token, currentContext.msgSender, flowOperator, permissions, flowRateAllowance);
     }
 
     /// @dev IConstantFlowAgreementV1.authorizeFlowOperatorWithFullControl implementation
     function authorizeFlowOperatorWithFullControl(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         bytes calldata ctx
     )
@@ -708,7 +706,6 @@ contract ConstantFlowAgreementV1 is
     {
         newCtx = updateFlowOperatorPermissions(
             token,
-            sender,
             flowOperator,
             FlowOperatorDefinitions.AUTHORIZE_FULL_CONTROL,
             type(int96).max,
@@ -719,15 +716,14 @@ contract ConstantFlowAgreementV1 is
     /// @dev IConstantFlowAgreementV1.revokeFlowOperatorWithFullControl implementation
     function revokeFlowOperatorWithFullControl(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         bytes calldata ctx
     )
         external override
         returns(bytes memory newCtx)
     {
-        // REVOKE_FULL_CONTROL = 0
-        newCtx = updateFlowOperatorPermissions(token, sender, flowOperator, 0, 0, ctx);
+        // NOTE: REVOKE_FULL_CONTROL = 0
+        newCtx = updateFlowOperatorPermissions(token, flowOperator, 0, 0, ctx);
     }
 
     /// @dev IConstantFlowAgreementV1.getFlowOperatorData implementation

package/contracts/interfaces/agreements/IConstantFlowAgreementV1.sol

@@ -71,9 +71,8 @@ abstract contract IConstantFlowAgreementV1 is ISuperAgreement {
         returns (bool);
 
     /**
-     * @dev `sender` updates permissions for the `flowOperator` with `flowRateAllowance`
+     * @dev msgSender from `ctx` updates permissions for the `flowOperator` with `flowRateAllowance`
      * @param token Super token address
-     * @param sender The permission granter address
      * @param flowOperator The permission grantee address
      * @param permissions A bitmask representation of the granted permissions
      * @param flowRateAllowance The flow rate allowance the `flowOperator` is granted (only goes down)
@@ -81,7 +80,6 @@ abstract contract IConstantFlowAgreementV1 is ISuperAgreement {
      */
     function updateFlowOperatorPermissions(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         uint8 permissions,
         int96 flowRateAllowance,
@@ -91,15 +89,13 @@ abstract contract IConstantFlowAgreementV1 is ISuperAgreement {
         returns(bytes memory newCtx);
 
     /**
-     * @dev `sender` grants `flowOperator` create/update/delete permissions with flowRateAllowance as type(int96).max
+     * @dev msgSender from `ctx` grants `flowOperator` all permissions with flowRateAllowance as type(int96).max
      * @param token Super token address
-     * @param sender The permission granter address
      * @param flowOperator The permission grantee address
      * @param ctx Context bytes (see ISuperfluid.sol for Context struct)
      */
     function authorizeFlowOperatorWithFullControl(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         bytes calldata ctx
     )
@@ -107,16 +103,14 @@ abstract contract IConstantFlowAgreementV1 is ISuperAgreement {
         returns(bytes memory newCtx);
 
      /**
-     * @notice `sender` revokes `flowOperator` create/update/delete permissions
+     * @notice msgSender from `ctx` revokes `flowOperator` create/update/delete permissions
      * @dev `permissions` and `flowRateAllowance` will both be set to 0
      * @param token Super token address
-     * @param sender The permission granter address
      * @param flowOperator The permission grantee address
      * @param ctx Context bytes (see ISuperfluid.sol for Context struct)
      */
     function revokeFlowOperatorWithFullControl(
         ISuperfluidToken token,
-        address sender,
         address flowOperator,
         bytes calldata ctx
     )

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@superfluid-finance/ethereum-contracts",
-    "version": "1.2.1-dev.90ccb01.0",
+    "version": "1.2.2-dev.2bc50bf.0",
     "description": " Ethereum contracts implementation for the Superfluid Protocol",
     "homepage": "https://github.com/superfluid-finance/protocol-monorepo/tree/dev/packages/ethereum-contracts#readme",
     "repository": {
@@ -35,8 +35,8 @@
         "testenv:deploy": "yarn run-truffle exec scripts/deploy-test-environment.js : TEST",
         "pretest": "{ yarn testenv:start > /dev/null& } && sleep 5",
         "test": "run-s test:*:*",
-        "test:contracts:js": "yarn run-hardhat test testsuites/all-contracts.js --parallel",
-        "test:contracts:sol": "yarn run-forge test",
+        "test:contracts:hardhat": "yarn run-hardhat test testsuites/all-contracts.js --parallel",
+        "test:contracts:foundry": "yarn run-forge test",
         "test:contracts:solc-0.8.0-compatibility": "test/test-solc-0.8.0-compatibility.sh",
         "test:deployment:scripts-js-hardhat": "yarn run-hardhat test test/scripts/deployment.test.js",
         "test:deployment:scripts-js-truffle": "yarn run-truffle test test/scripts/deployment.test.js",