[ETHEREUM-CONTRACTS] Dedicated allowlist contract for SuperApp registration (#2083)

d10r · web-flow · commit 879997348421 · 2025-07-03T08:06:32.000+02:00
diff --git a/packages/ethereum-contracts/CHANGELOG.md b/packages/ethereum-contracts/CHANGELOG.md
@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - `SuperToken` now implements [EIP-2612](https://eips.ethereum.org/EIPS/eip-2612) (permit extension for EIP-20 signed approvals).
 - `SuperfluidPool` now has additional methods `increaseMemberUnits` and `decreaseMemberUnits` which allow the pool admin to change member units parameterized with delta amounts.
 
+### Changed
+- Curation of the SuperApp registration allowlist can now be delegated by governance to a newly added `ACL` contract.
+
 ### Breaking
 - `SuperfluidPool` does no longer mint and burn EIP-721 tokens (NFTs) on member unit updates. The gas overhead of this operation caused friction for integrations with other protocols (e.g. Uniswap V4).
 
diff --git a/packages/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol b/packages/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol
@@ -47,7 +47,7 @@ import {
  * `expectRevert` expects a revert in the next call.
  * If a revert is triggered by library code itself (vs by a call), `expectRevert` will thus not _see_ that.
  * Possible mitigations:
- * - avoid higher-level library methods which can themselves trigger reverts in tests where this is is an issue
+ * - avoid higher-level library methods which can themselves trigger reverts in tests where this is an issue
  * - wrap the method invocation into an external helper method which you then invoke with `this.helperMethod()`,
  *   which makes it an external call
  * Also be aware of other limitations, see
diff --git a/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol b/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol
@@ -18,6 +18,7 @@ import {
 /// Note: CustomSuperTokenBase is not included for people building CustomSuperToken.
 import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IERC777 } from "@openzeppelin/contracts/token/ERC777/IERC777.sol";
+import { IAccessControl } from "@openzeppelin/contracts/access/IAccessControl.sol";
 import { ISuperfluidToken } from "./ISuperfluidToken.sol";
 import { ISuperToken } from "./ISuperToken.sol";
 import { ISuperTokenFactory } from "./ISuperTokenFactory.sol";
@@ -29,10 +30,10 @@ import { IPoolMemberNFT } from "../agreements/gdav1/IPoolMemberNFT.sol";
 import { ISuperAgreement } from "./ISuperAgreement.sol";
 import { IConstantFlowAgreementV1 } from "../agreements/IConstantFlowAgreementV1.sol";
 import { IInstantDistributionAgreementV1 } from "../agreements/IInstantDistributionAgreementV1.sol";
-import { 
-    IGeneralDistributionAgreementV1, 
-    PoolConfig, 
-    PoolERC20Metadata 
+import {
+    IGeneralDistributionAgreementV1,
+    PoolConfig,
+    PoolERC20Metadata
 } from "../agreements/gdav1/IGeneralDistributionAgreementV1.sol";
 import { ISuperfluidPool } from "../agreements/gdav1/ISuperfluidPool.sol";
 /// Superfluid App interfaces:
@@ -658,6 +659,19 @@ interface ISuperfluid {
     // solhint-disable func-name-mixedcase
     function getERC2771Forwarder() external view returns(address);
 
+    // solhint-disable max-line-length
+    /**
+     * @dev returns the SimpleACL contract (currently used for SuperApp registration permissioning).
+     * That contract implements the interface [IAccessControl](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl),
+     * which provides the following functions:
+     * - [hasRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-hasRole-bytes32-address-)
+     * - [getRoleAdmin(role)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-getRoleAdmin-bytes32-)
+     * - [grantRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-grantRole-bytes32-address-)
+     * - [revokeRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-revokeRole-bytes32-address-)
+     * - [renounceRole(role, account)](https://docs.openzeppelin.com/contracts/4.x/api/access#IAccessControl-renounceRole-bytes32-address-)
+     */
+    function getSimpleACL() external view returns(IAccessControl);
+
     /**************************************************************************
      * Function modifiers for access control and parameter validations
      *
diff --git a/packages/ethereum-contracts/contracts/mocks/CFAAppMocks.t.sol b/packages/ethereum-contracts/contracts/mocks/CFAAppMocks.t.sol
@@ -36,7 +36,7 @@ contract ExclusiveInflowTestApp is SuperAppBase {
             // | SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP
             ;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function afterAgreementCreated(
@@ -121,7 +121,7 @@ contract NonClosableOutflowTestApp is SuperAppBase {
             // | SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP
             ;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function setupOutflow(
@@ -210,7 +210,7 @@ contract SelfDeletingFlowTestApp is SuperAppBase {
             | SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP
             ;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function afterAgreementCreated(
@@ -267,7 +267,7 @@ contract ClosingOnUpdateFlowTestApp is SuperAppBase {
             | SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP
             ;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function afterAgreementUpdated(
@@ -326,7 +326,7 @@ contract FlowExchangeTestApp is SuperAppBase {
             | SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP
             ;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function afterAgreementCreated(
diff --git a/packages/ethereum-contracts/contracts/mocks/IDASuperAppTester.t.sol b/packages/ethereum-contracts/contracts/mocks/IDASuperAppTester.t.sol
@@ -26,7 +26,7 @@ contract IDASuperAppTester is ISuperApp {
         uint32 indexId)
     {
         _host = host;
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
         _ida = ida;
         _token = token;
         _indexId = indexId;
diff --git a/packages/ethereum-contracts/contracts/mocks/MultiFlowTesterApp.t.sol b/packages/ethereum-contracts/contracts/mocks/MultiFlowTesterApp.t.sol
@@ -41,7 +41,7 @@ contract MultiFlowTesterApp is SuperAppBase {
             SuperAppDefinitions.BEFORE_AGREEMENT_CREATED_NOOP |
             SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP;
 
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
     }
 
     function _parseUserData(
diff --git a/packages/ethereum-contracts/contracts/mocks/StreamRedirector.t.sol b/packages/ethereum-contracts/contracts/mocks/StreamRedirector.t.sol
@@ -33,7 +33,7 @@ contract StreamRedirector is SuperAppBase {
         token = _token;
         receiver = _receiver;
 
-        host.registerAppWithKey(configWord, "");
+        host.registerApp(configWord);
     }
 
     /**
diff --git a/packages/ethereum-contracts/contracts/mocks/SuperAppMocks.t.sol b/packages/ethereum-contracts/contracts/mocks/SuperAppMocks.t.sol
@@ -52,15 +52,14 @@ contract SuperAppMock is ISuperApp {
 
     constructor(ISuperfluid host, uint256 configWord, bool doubleRegistration) {
         _host = host;
-        _host.registerAppWithKey(configWord, "");
+        _host.registerApp(configWord);
         if (doubleRegistration) {
-            _host.registerAppWithKey(configWord, "");
+            _host.registerApp(configWord);
         }
         _aux = new SuperAppMockAux();
     }
 
     function tryRegisterApp(uint256 configWord) external {
-        // @note this is deprecated keeping this here for testing/coverage
         _host.registerApp(configWord);
     }
 
@@ -472,7 +471,7 @@ contract SuperAppMockReturningEmptyCtx {
 
     constructor(ISuperfluid host) {
         _host = host;
-        _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_FINAL, "");
+        _host.registerApp(SuperAppDefinitions.APP_LEVEL_FINAL);
     }
 
     function beforeAgreementCreated(
@@ -533,7 +532,7 @@ contract SuperAppMockReturningInvalidCtx {
 
     constructor(ISuperfluid host) {
         _host = host;
-        _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_FINAL, "");
+        _host.registerApp(SuperAppDefinitions.APP_LEVEL_FINAL);
     }
 
     function afterAgreementCreated(
@@ -574,7 +573,7 @@ contract SuperAppMock2ndLevel {
 
     constructor(ISuperfluid host, SuperAppMock app, AgreementMock agreement) {
         _host = host;
-        _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_SECOND, "");
+        _host.registerApp(SuperAppDefinitions.APP_LEVEL_SECOND);
         _app = app;
         _agreement = agreement;
     }
@@ -615,10 +614,9 @@ contract SuperAppMockWithRegistrationKey {
     }
 }
 
-// An Super App that uses registerAppWithKey
+// An Super App that self-registers
 contract SuperAppMockUsingRegisterApp {
     constructor(ISuperfluid host, uint256 configWord) {
-        // @note this is deprecated keeping this here for testing/coverage
         host.registerApp(configWord);
     }
 }
@@ -630,6 +628,7 @@ contract SuperAppMockNotSelfRegistering { }
 // Factory which allows anybody to deploy arbitrary contracts as app (do NOT allow this in a real factory!)
 contract SuperAppFactoryMock {
     function registerAppWithHost(ISuperfluid host, ISuperApp app, uint256 configWord) external {
+        // @note this way of registering is DEPREACTED!
         host.registerAppByFactory(app, configWord);
     }
 }
diff --git a/packages/ethereum-contracts/contracts/mocks/SuperTokenLibraryV1Mock.t.sol b/packages/ethereum-contracts/contracts/mocks/SuperTokenLibraryV1Mock.t.sol
@@ -384,7 +384,7 @@ contract SuperTokenLibraryCFASuperAppMock is SuperAppBase {
             SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP |
             SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP;
 
-        host.registerAppWithKey(configWord, "");
+        host.registerApp(configWord);
     }
 
     function createFlow(ISuperToken token) external {
diff --git a/packages/ethereum-contracts/contracts/mocks/SuperfluidMock.t.sol b/packages/ethereum-contracts/contracts/mocks/SuperfluidMock.t.sol
@@ -12,7 +12,7 @@ import { CallUtils } from "../libs/CallUtils.sol";
 contract SuperfluidUpgradabilityTester is Superfluid {
 
     // 3_000_000 is the min callback gas limit used in a prod deployment
-    constructor() Superfluid(false, false, 3_000_000, address(0), address(0))
+    constructor() Superfluid(false, false, 3_000_000, address(0), address(0), address(0))
     // solhint-disable-next-line no-empty-blocks
     {
     }
@@ -135,10 +135,12 @@ contract SuperfluidMock is Superfluid {
         bool appWhiteListingEnabled,
         uint64 callbackGasLimit,
         address simpleForwarderAddress,
-        address erc2771ForwarderAddress
+        address erc2771ForwarderAddress,
+        address simpleAclAddress
     )
         Superfluid(
-            nonUpgradable, appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress
+            nonUpgradable, appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress,
+            simpleAclAddress
         )
     // solhint-disable-next-line no-empty-blocks
     {
diff --git a/packages/ethereum-contracts/contracts/superfluid/Superfluid.sol b/packages/ethereum-contracts/contracts/superfluid/Superfluid.sol
@@ -16,7 +16,8 @@ import {
     SuperfluidGovernanceConfigs,
     ISuperfluidToken,
     ISuperToken,
-    ISuperTokenFactory
+    ISuperTokenFactory,
+    IAccessControl
 } from "../interfaces/superfluid/ISuperfluid.sol";
 import { GeneralDistributionAgreementV1 } from "../agreements/gdav1/GeneralDistributionAgreementV1.sol";
 import { SuperfluidUpgradeableBeacon } from "../upgradability/SuperfluidUpgradeableBeacon.sol";
@@ -25,6 +26,7 @@ import { CallbackUtils } from "../libs/CallbackUtils.sol";
 import { BaseRelayRecipient } from "../libs/BaseRelayRecipient.sol";
 import { SimpleForwarder } from "../utils/SimpleForwarder.sol";
 import { ERC2771Forwarder } from "../utils/ERC2771Forwarder.sol";
+import { SimpleACL } from "../utils/SimpleACL.sol";
 
 /**
  * @dev The Superfluid host implementation.
@@ -59,6 +61,9 @@ contract Superfluid is
     SimpleForwarder immutable public SIMPLE_FORWARDER;
     ERC2771Forwarder immutable internal _ERC2771_FORWARDER;
 
+    // ACL (for superapp registration)
+    SimpleACL immutable internal _SIMPLE_ACL;
+
     /**
      * @dev Maximum number of level of apps can be composed together
      *
@@ -71,6 +76,8 @@ contract Superfluid is
 
     uint32 constant public MAX_NUM_AGREEMENTS = 256;
 
+    bytes32 constant public ACL_SUPERAPP_REGISTRATION_ROLE = keccak256("ACL_SUPERAPP_REGISTRATION_ROLE");
+
     /* WARNING: NEVER RE-ORDER VARIABLES! Always double-check that new
        variables are added APPEND-ONLY. Re-ordering variables can
        permanently BREAK the deployed proxy contract. */
@@ -105,13 +112,15 @@ contract Superfluid is
         bool appWhiteListingEnabled,
         uint64 callbackGasLimit,
         address simpleForwarderAddress,
-        address erc2771ForwarderAddress
+        address erc2771ForwarderAddress,
+        address simpleAclAddress
     ) {
         NON_UPGRADABLE_DEPLOYMENT = nonUpgradable;
         APP_WHITE_LISTING_ENABLED = appWhiteListingEnabled;
         CALLBACK_GAS_LIMIT = callbackGasLimit;
         SIMPLE_FORWARDER = SimpleForwarder(simpleForwarderAddress);
         _ERC2771_FORWARDER = ERC2771Forwarder(erc2771ForwarderAddress);
+        _SIMPLE_ACL = SimpleACL(simpleAclAddress);
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -375,8 +384,16 @@ contract Superfluid is
         _registerApp(ISuperApp(msg.sender), configWord);
     }
 
-    // internally we keep using the gov config method with key
+    // Checks if the deployer account has permission to register SuperApps, reverts if not.
+    // New method: lookup in the SimpleACL contract.
+    // Legacy/fallback method: lookup in the governance contract.
     function _enforceAppRegistrationPermissioning(string memory registrationKey, address deployer) internal view {
+        // new method: check if the deployer is granted permission in the ACL
+        if (_SIMPLE_ACL.hasRole(ACL_SUPERAPP_REGISTRATION_ROLE, deployer)) {
+            return;
+        }
+
+        // legacy/fallback method: check if permission is given by gov
         bytes32 configKey = SuperfluidGovernanceConfigs.getAppRegistrationConfigKey(
             // solhint-disable-next-line avoid-tx-origin
             deployer,
@@ -958,6 +975,10 @@ contract Superfluid is
         return address(_ERC2771_FORWARDER);
     }
 
+    function getSimpleACL() external view override returns(IAccessControl) {
+        return _SIMPLE_ACL;
+    }
+
     /**************************************************************************
     * Internal
     **************************************************************************/
diff --git a/packages/ethereum-contracts/contracts/utils/SimpleACL.sol b/packages/ethereum-contracts/contracts/utils/SimpleACL.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
+
+contract SimpleACL is AccessControl {
+    constructor() {
+        _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+    }
+
+    /// Allows the default admin to set the admin role for a given role.
+    /// This gives the flexibility to set up sophisticated permissioning schemes in the future.
+    function setRoleAdmin(bytes32 role, bytes32 adminRole) external onlyRole(DEFAULT_ADMIN_ROLE) {
+        _setRoleAdmin(role, adminRole);
+    }
+}
diff --git a/packages/ethereum-contracts/contracts/utils/SuperfluidFrameworkDeploymentSteps.t.sol b/packages/ethereum-contracts/contracts/utils/SuperfluidFrameworkDeploymentSteps.t.sol
@@ -31,6 +31,7 @@ import { TOGA } from "./TOGA.sol";
 import { IResolver } from "../interfaces/utils/IResolver.sol";
 import { SimpleForwarder } from "../utils/SimpleForwarder.sol";
 import { ERC2771Forwarder } from "../utils/ERC2771Forwarder.sol";
+import { SimpleACL } from "../utils/SimpleACL.sol";
 import { MacroForwarder } from "../utils/MacroForwarder.sol";
 
 /// @title Superfluid Framework Deployment Steps
@@ -143,10 +144,11 @@ contract SuperfluidFrameworkDeploymentSteps {
         } else if (step == 1) { // CORE CONTRACT: Superfluid (Host)
             SimpleForwarder simpleForwarder = new SimpleForwarder();
             ERC2771Forwarder erc2771Forwarder = new ERC2771Forwarder();
+            SimpleACL simpleAcl = new SimpleACL();
             // Deploy Host and initialize the test governance.
             // 3_000_000 is the min callback gas limit used in a prod deployment
             host = SuperfluidHostDeployerLibrary.deploy(
-                true, false, 3_000_000, address(simpleForwarder), address(erc2771Forwarder)
+                true, false, 3_000_000, address(simpleForwarder), address(erc2771Forwarder), address(simpleAcl)
             );
             simpleForwarder.transferOwnership(address(host));
             erc2771Forwarder.transferOwnership(address(host));
@@ -319,12 +321,14 @@ library SuperfluidHostDeployerLibrary {
         bool _appWhiteListingEnabled,
         uint64 callbackGasLimit,
         address simpleForwarderAddress,
-        address erc2771ForwarderAddress
+        address erc2771ForwarderAddress,
+        address simpleAclAddress
     )
         external returns (Superfluid)
     {
         return new Superfluid(
-            _nonUpgradable, _appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress
+            _nonUpgradable, _appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress,
+            simpleAclAddress
         );
     }
 }
diff --git a/packages/ethereum-contracts/ops-scripts/deploy-framework.js b/packages/ethereum-contracts/ops-scripts/deploy-framework.js
diff --git a/packages/ethereum-contracts/tasks/bundled-abi-contracts-list.json b/packages/ethereum-contracts/tasks/bundled-abi-contracts-list.json
diff --git a/packages/ethereum-contracts/test/contracts/superfluid/Superfluid.test.ts b/packages/ethereum-contracts/test/contracts/superfluid/Superfluid.test.ts
diff --git a/packages/ethereum-contracts/test/foundry/superfluid/Superfluid.t.sol b/packages/ethereum-contracts/test/foundry/superfluid/Superfluid.t.sol
diff --git a/packages/ethereum-contracts/test/ops-scripts/deployment.test.js b/packages/ethereum-contracts/test/ops-scripts/deployment.test.js
diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ contract ExclusiveInflowTestApp is SuperAppBase {`
`36`	`36`	`// \| SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP`
`37`	`37`	`;`
`38`	`38`
`39`		`- _host.registerAppWithKey(configWord, "");`
	`39`	`+ _host.registerApp(configWord);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`function afterAgreementCreated(`
`@@ -121,7 +121,7 @@ contract NonClosableOutflowTestApp is SuperAppBase {`
`121`	`121`	`// \| SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP`
`122`	`122`	`;`
`123`	`123`
`124`		`- _host.registerAppWithKey(configWord, "");`
	`124`	`+ _host.registerApp(configWord);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`function setupOutflow(`
`@@ -210,7 +210,7 @@ contract SelfDeletingFlowTestApp is SuperAppBase {`
`210`	`210`	`\| SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP`
`211`	`211`	`;`
`212`	`212`
`213`		`- _host.registerAppWithKey(configWord, "");`
	`213`	`+ _host.registerApp(configWord);`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`function afterAgreementCreated(`
`@@ -267,7 +267,7 @@ contract ClosingOnUpdateFlowTestApp is SuperAppBase {`
`267`	`267`	`\| SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP`
`268`	`268`	`;`
`269`	`269`
`270`		`- _host.registerAppWithKey(configWord, "");`
	`270`	`+ _host.registerApp(configWord);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`function afterAgreementUpdated(`
`@@ -326,7 +326,7 @@ contract FlowExchangeTestApp is SuperAppBase {`
`326`	`326`	`\| SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP`
`327`	`327`	`;`
`328`	`328`
`329`		`- _host.registerAppWithKey(configWord, "");`
	`329`	`+ _host.registerApp(configWord);`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`function afterAgreementCreated(`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ contract IDASuperAppTester is ISuperApp {`
`26`	`26`	`uint32 indexId)`
`27`	`27`	`{`
`28`	`28`	`_host = host;`
`29`		`- _host.registerAppWithKey(configWord, "");`
	`29`	`+ _host.registerApp(configWord);`
`30`	`30`	`_ida = ida;`
`31`	`31`	`_token = token;`
`32`	`32`	`_indexId = indexId;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ contract MultiFlowTesterApp is SuperAppBase {`
`41`	`41`	`SuperAppDefinitions.BEFORE_AGREEMENT_CREATED_NOOP \|`
`42`	`42`	`SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP;`
`43`	`43`
`44`		`- _host.registerAppWithKey(configWord, "");`
	`44`	`+ _host.registerApp(configWord);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`function _parseUserData(`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ contract StreamRedirector is SuperAppBase {`
`33`	`33`	`token = _token;`
`34`	`34`	`receiver = _receiver;`
`35`	`35`
`36`		`- host.registerAppWithKey(configWord, "");`
	`36`	`+ host.registerApp(configWord);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,14 @@ contract SuperAppMock is ISuperApp {`
`52`	`52`
`53`	`53`	`constructor(ISuperfluid host, uint256 configWord, bool doubleRegistration) {`
`54`	`54`	`_host = host;`
`55`		`- _host.registerAppWithKey(configWord, "");`
	`55`	`+ _host.registerApp(configWord);`
`56`	`56`	`if (doubleRegistration) {`
`57`		`- _host.registerAppWithKey(configWord, "");`
	`57`	`+ _host.registerApp(configWord);`
`58`	`58`	`}`
`59`	`59`	`_aux = new SuperAppMockAux();`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`function tryRegisterApp(uint256 configWord) external {`
`63`		`- // @note this is deprecated keeping this here for testing/coverage`
`64`	`63`	`_host.registerApp(configWord);`
`65`	`64`	`}`
`66`	`65`
`@@ -472,7 +471,7 @@ contract SuperAppMockReturningEmptyCtx {`
`472`	`471`
`473`	`472`	`constructor(ISuperfluid host) {`
`474`	`473`	`_host = host;`
`475`		`- _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_FINAL, "");`
	`474`	`+ _host.registerApp(SuperAppDefinitions.APP_LEVEL_FINAL);`
`476`	`475`	`}`
`477`	`476`
`478`	`477`	`function beforeAgreementCreated(`
`@@ -533,7 +532,7 @@ contract SuperAppMockReturningInvalidCtx {`
`533`	`532`
`534`	`533`	`constructor(ISuperfluid host) {`
`535`	`534`	`_host = host;`
`536`		`- _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_FINAL, "");`
	`535`	`+ _host.registerApp(SuperAppDefinitions.APP_LEVEL_FINAL);`
`537`	`536`	`}`
`538`	`537`
`539`	`538`	`function afterAgreementCreated(`
`@@ -574,7 +573,7 @@ contract SuperAppMock2ndLevel {`
`574`	`573`
`575`	`574`	`constructor(ISuperfluid host, SuperAppMock app, AgreementMock agreement) {`
`576`	`575`	`_host = host;`
`577`		`- _host.registerAppWithKey(SuperAppDefinitions.APP_LEVEL_SECOND, "");`
	`576`	`+ _host.registerApp(SuperAppDefinitions.APP_LEVEL_SECOND);`
`578`	`577`	`_app = app;`
`579`	`578`	`_agreement = agreement;`
`580`	`579`	`}`
`@@ -615,10 +614,9 @@ contract SuperAppMockWithRegistrationKey {`
`615`	`614`	`}`
`616`	`615`	`}`
`617`	`616`
`618`		`-// An Super App that uses registerAppWithKey`
	`617`	`+// An Super App that self-registers`
`619`	`618`	`contract SuperAppMockUsingRegisterApp {`
`620`	`619`	`constructor(ISuperfluid host, uint256 configWord) {`
`621`		`- // @note this is deprecated keeping this here for testing/coverage`
`622`	`620`	`host.registerApp(configWord);`
`623`	`621`	`}`
`624`	`622`	`}`
`@@ -630,6 +628,7 @@ contract SuperAppMockNotSelfRegistering { }`
`630`	`628`	`// Factory which allows anybody to deploy arbitrary contracts as app (do NOT allow this in a real factory!)`
`631`	`629`	`contract SuperAppFactoryMock {`
`632`	`630`	`function registerAppWithHost(ISuperfluid host, ISuperApp app, uint256 configWord) external {`
	`631`	`+ // @note this way of registering is DEPREACTED!`
`633`	`632`	`host.registerAppByFactory(app, configWord);`
`634`	`633`	`}`
`635`	`634`	`}`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ contract SuperTokenLibraryCFASuperAppMock is SuperAppBase {`
`384`	`384`	`SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP \|`
`385`	`385`	`SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP;`
`386`	`386`
`387`		`- host.registerAppWithKey(configWord, "");`
	`387`	`+ host.registerApp(configWord);`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`function createFlow(ISuperToken token) external {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import { CallUtils } from "../libs/CallUtils.sol";`
`12`	`12`	`contract SuperfluidUpgradabilityTester is Superfluid {`
`13`	`13`
`14`	`14`	`// 3_000_000 is the min callback gas limit used in a prod deployment`
`15`		`- constructor() Superfluid(false, false, 3_000_000, address(0), address(0))`
	`15`	`+ constructor() Superfluid(false, false, 3_000_000, address(0), address(0), address(0))`
`16`	`16`	`// solhint-disable-next-line no-empty-blocks`
`17`	`17`	`{`
`18`	`18`	`}`
`@@ -135,10 +135,12 @@ contract SuperfluidMock is Superfluid {`
`135`	`135`	`bool appWhiteListingEnabled,`
`136`	`136`	`uint64 callbackGasLimit,`
`137`	`137`	`address simpleForwarderAddress,`
`138`		`- address erc2771ForwarderAddress`
	`138`	`+ address erc2771ForwarderAddress,`
	`139`	`+ address simpleAclAddress`
`139`	`140`	`)`
`140`	`141`	`Superfluid(`
`141`		`- nonUpgradable, appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress`
	`142`	`+ nonUpgradable, appWhiteListingEnabled, callbackGasLimit, simpleForwarderAddress, erc2771ForwarderAddress,`
	`143`	`+ simpleAclAddress`
`142`	`144`	`)`
`143`	`145`	`// solhint-disable-next-line no-empty-blocks`
`144`	`146`	`{`