@superfluid-finance/ethereum-contracts 1.2.1 → 1.2.2-dev.a4c583c.0

package/build/contracts/AgreementLibrary.json

@@ -1,45 +1,45 @@
 {
   "contractName": "AgreementLibrary",
   "abi": [],
-  "metadata": "{\"compiler\":{\"version\":\"0.8.13+commit.abaa5c0e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"author\":\"Superfluid\",\"details\":\"Helper library for building super agreement\",\"kind\":\"dev\",\"methods\":{},\"title\":\"Agreement Library\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"project:/contracts/agreements/AgreementLibrary.sol\":\"AgreementLibrary\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"@openzeppelin/contracts/token/ERC20/IERC20.sol\":{\"keccak256\":\"0xbbc8ac883ac3c0078ce5ad3e288fbb3ffcc8a30c3a98c0fda0114d64fc44fca2\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://87a7a5d2f6f63f84598af02b8c50ca2df2631cb8ba2453e8d95fcb17e4be9824\",\"dweb:/ipfs/QmR76hqtAcRqoFj33tmNjcWTLrgNsAaakYwnKZ8zoJtKei\"]},\"@openzeppelin/contracts/token/ERC777/IERC777.sol\":{\"keccak256\":\"0xe4e0b7e3f0265ffaa565d26acd2d45f2633f19127ed625e5a05a9f201a87a667\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://1762b5bc15a009b5f092ccf547b81e0827c8705884f18e0623e497658514a7ed\",\"dweb:/ipfs/QmTtmVQYuynan3j2uVjdjjRJS1mr7LPRgxSZNnfqC7oxkz\"]},\"@openzeppelin/contracts/utils/math/SafeCast.sol\":{\"keccak256\":\"0x5c6caab697d302ad7eb59c234a4d2dbc965c1bae87709bd2850060b7695b28c7\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://fb62abcee612c175f1b9bc70e5dfe5bd23473c99987ade6e80e291f68dc60ff1\",\"dweb:/ipfs/QmZCMajhG7FtRYNDwBchXN89mXR6HLPVzr9732qfUdNf9E\"]},\"project:/contracts/agreements/AgreementLibrary.sol\":{\"keccak256\":\"0x5e13526a65b40d5132b9fc1e07c04692c66027f5b07d9fe8b3013a8ecd7c7cc3\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://9fe8225dda0cadcb94bab2b1e5a60edcd87fdf0ae631a0475f9616aad66e12c2\",\"dweb:/ipfs/QmQWXwpHfdi8B6ByWzAGmF7xghRadFoRf4hMP7CV3EDZLj\"]},\"project:/contracts/interfaces/superfluid/Definitions.sol\":{\"keccak256\":\"0x199095781e4221b6015d859558da09977f79199f38d342ab4899c2cecdf8cec1\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://9fd3a5a8b16d8517e2af10e20390a9af5adbfa4e783e3a7dd89eb4588db98385\",\"dweb:/ipfs/QmPDtGR43DeMMVsHjUh7FYzMGsFKPpGriRkaahFpN5T5d3\"]},\"project:/contracts/interfaces/superfluid/ISuperAgreement.sol\":{\"keccak256\":\"0xc3a6a907245116bcecc70fe4b207454012e8ce4fa190228fb8bbe39e0b1bc5cf\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://83c116bdae48685d20e5a27c942111e685ec1ef6334e7ff6f6d9af66edbd8025\",\"dweb:/ipfs/QmTnVuNTaRFiDmkAmDk7NFYdfQTW1kqgBZiY2exC6k8jDx\"]},\"project:/contracts/interfaces/superfluid/ISuperApp.sol\":{\"keccak256\":\"0x57f4203168992c940eb6b8c7cc75f854cb36a1f9323b3f39ddc5e4fbe819c043\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://888941dfa3e5004f678f215b98a85d1bf54e412317928a78e0a1cff090773d4c\",\"dweb:/ipfs/QmVe838upcAyqpy1d3oQNHJrbRyWCKHL51zWrMKruvLxFG\"]},\"project:/contracts/interfaces/superfluid/ISuperToken.sol\":{\"keccak256\":\"0x3cb0b7216007b942f7611d7b3d983c0df9408fdd4fd6b799c33fc9033e0abf8b\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://17901a1fd3635f441671e14ece8ecc6806af20c5eb80cca3b7c6e53a51fef7b6\",\"dweb:/ipfs/QmUXXMfU6nmsyEnufyGEwyZ5M7pzpXNTr6vw32e3JjjoZp\"]},\"project:/contracts/interfaces/superfluid/ISuperTokenFactory.sol\":{\"keccak256\":\"0x68a466c978557e47bd7385b1d7d78f1c8fb07462a870efc5a791008e33a4f535\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://d109879bdb7f022560a792af2ff481df729bf1b4b8e1831b8022f4d12892d41d\",\"dweb:/ipfs/QmRSWqHq8CP5XWgyV4mJpPxMg33s312s2K5ndHRHVqqZ8n\"]},\"project:/contracts/interfaces/superfluid/ISuperfluid.sol\":{\"keccak256\":\"0xc1007d1082050b532947d27973bf996da2b0df9bdf6ed4d4fcaaa3ff2354262c\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://2d22da1d2140b1ed3964ddc62d3a38e9a24a8814c18ffe496f0fbce5afef5ea0\",\"dweb:/ipfs/QmYxVnaU87HSaQktkqCZZBFj3MgphgFsZMrMLXLeZLzrvR\"]},\"project:/contracts/interfaces/superfluid/ISuperfluidGovernance.sol\":{\"keccak256\":\"0x2166f766b7f61f9bb1376b0948efa0d0c0046b93dc301e51ce495203b145189b\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://929630e6a15f523b142b2897783b2f7a54532ac5ae578bd17a0b7f25a6ca2bd8\",\"dweb:/ipfs/QmTu9ffH9qbQncJGEc24bmnoCGjifQ7BG47AYR8AzMLfXR\"]},\"project:/contracts/interfaces/superfluid/ISuperfluidToken.sol\":{\"keccak256\":\"0x9189eaba9e856cc4932ea29eeaf4e89a09448dde13860591691ec122856fdc75\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://7d5991b906bba706373f5bfe3c2c8789a7a45360a41eee50574272b393c4ab70\",\"dweb:/ipfs/QmVCXVnYA13vMNxa7rGzNB129sUXiGE1asuHdnEMEPVZsp\"]},\"project:/contracts/interfaces/tokens/ERC20WithTokenInfo.sol\":{\"keccak256\":\"0x66708dae3fcd06e6fc0a46f2959fc2d1e6b9361f28598337339d26af8eb8c0f9\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://77b80718cec21b81ef190c19fb9fbe73913a95c71f7e6715f671bbe8a224dafc\",\"dweb:/ipfs/QmUdsc6DF2Bgih5VZm7sfaECjhGmwE7tAx8pMkzGQgVKQw\"]},\"project:/contracts/interfaces/tokens/TokenInfo.sol\":{\"keccak256\":\"0x70e573644a0ff271c0ccef526809e9d9ab4950ec58755ca84e833cde3b8f3df0\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://aea3709687cc37ba625f4cc882fbdb149a7bf5be5afe2b030203c8719641a77b\",\"dweb:/ipfs/QmVpvfR6ZheE5wNUK9CobaVBgVvEnEPkvjWF9cfwyZr7eQ\"]}},\"version\":1}",
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220be0b6316800f5b93cee875111ef933e4a4ef58ea3dec551364ae5a52704e0c4064736f6c634300080d0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220be0b6316800f5b93cee875111ef933e4a4ef58ea3dec551364ae5a52704e0c4064736f6c634300080d0033",
+  "metadata": "{\"compiler\":{\"version\":\"0.8.13+commit.abaa5c0e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"author\":\"Superfluid\",\"details\":\"Helper library for building super agreement\",\"kind\":\"dev\",\"methods\":{},\"title\":\"Agreement Library\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"project:/contracts/agreements/AgreementLibrary.sol\":\"AgreementLibrary\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"@openzeppelin/contracts/token/ERC20/IERC20.sol\":{\"keccak256\":\"0xbbc8ac883ac3c0078ce5ad3e288fbb3ffcc8a30c3a98c0fda0114d64fc44fca2\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://87a7a5d2f6f63f84598af02b8c50ca2df2631cb8ba2453e8d95fcb17e4be9824\",\"dweb:/ipfs/QmR76hqtAcRqoFj33tmNjcWTLrgNsAaakYwnKZ8zoJtKei\"]},\"@openzeppelin/contracts/token/ERC777/IERC777.sol\":{\"keccak256\":\"0xe4e0b7e3f0265ffaa565d26acd2d45f2633f19127ed625e5a05a9f201a87a667\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://1762b5bc15a009b5f092ccf547b81e0827c8705884f18e0623e497658514a7ed\",\"dweb:/ipfs/QmTtmVQYuynan3j2uVjdjjRJS1mr7LPRgxSZNnfqC7oxkz\"]},\"@openzeppelin/contracts/utils/math/SafeCast.sol\":{\"keccak256\":\"0x5c6caab697d302ad7eb59c234a4d2dbc965c1bae87709bd2850060b7695b28c7\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://fb62abcee612c175f1b9bc70e5dfe5bd23473c99987ade6e80e291f68dc60ff1\",\"dweb:/ipfs/QmZCMajhG7FtRYNDwBchXN89mXR6HLPVzr9732qfUdNf9E\"]},\"project:/contracts/agreements/AgreementLibrary.sol\":{\"keccak256\":\"0x107ee59e59b54e9ee85997d135a9bfc97979eda1143c7b1b61b63959777bff91\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://1a235f5a0fc7a04143662a69279d513d2434eeb7d60afdcc57911dcfeef712e5\",\"dweb:/ipfs/QmbUDhcf9mizwLxyCttibMxEM9NUun4guT3Sc9vdEaSxAv\"]},\"project:/contracts/interfaces/superfluid/Definitions.sol\":{\"keccak256\":\"0x199095781e4221b6015d859558da09977f79199f38d342ab4899c2cecdf8cec1\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://9fd3a5a8b16d8517e2af10e20390a9af5adbfa4e783e3a7dd89eb4588db98385\",\"dweb:/ipfs/QmPDtGR43DeMMVsHjUh7FYzMGsFKPpGriRkaahFpN5T5d3\"]},\"project:/contracts/interfaces/superfluid/ISuperAgreement.sol\":{\"keccak256\":\"0xc3a6a907245116bcecc70fe4b207454012e8ce4fa190228fb8bbe39e0b1bc5cf\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://83c116bdae48685d20e5a27c942111e685ec1ef6334e7ff6f6d9af66edbd8025\",\"dweb:/ipfs/QmTnVuNTaRFiDmkAmDk7NFYdfQTW1kqgBZiY2exC6k8jDx\"]},\"project:/contracts/interfaces/superfluid/ISuperApp.sol\":{\"keccak256\":\"0x57f4203168992c940eb6b8c7cc75f854cb36a1f9323b3f39ddc5e4fbe819c043\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://888941dfa3e5004f678f215b98a85d1bf54e412317928a78e0a1cff090773d4c\",\"dweb:/ipfs/QmVe838upcAyqpy1d3oQNHJrbRyWCKHL51zWrMKruvLxFG\"]},\"project:/contracts/interfaces/superfluid/ISuperToken.sol\":{\"keccak256\":\"0x3cb0b7216007b942f7611d7b3d983c0df9408fdd4fd6b799c33fc9033e0abf8b\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://17901a1fd3635f441671e14ece8ecc6806af20c5eb80cca3b7c6e53a51fef7b6\",\"dweb:/ipfs/QmUXXMfU6nmsyEnufyGEwyZ5M7pzpXNTr6vw32e3JjjoZp\"]},\"project:/contracts/interfaces/superfluid/ISuperTokenFactory.sol\":{\"keccak256\":\"0x68a466c978557e47bd7385b1d7d78f1c8fb07462a870efc5a791008e33a4f535\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://d109879bdb7f022560a792af2ff481df729bf1b4b8e1831b8022f4d12892d41d\",\"dweb:/ipfs/QmRSWqHq8CP5XWgyV4mJpPxMg33s312s2K5ndHRHVqqZ8n\"]},\"project:/contracts/interfaces/superfluid/ISuperfluid.sol\":{\"keccak256\":\"0xc1007d1082050b532947d27973bf996da2b0df9bdf6ed4d4fcaaa3ff2354262c\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://2d22da1d2140b1ed3964ddc62d3a38e9a24a8814c18ffe496f0fbce5afef5ea0\",\"dweb:/ipfs/QmYxVnaU87HSaQktkqCZZBFj3MgphgFsZMrMLXLeZLzrvR\"]},\"project:/contracts/interfaces/superfluid/ISuperfluidGovernance.sol\":{\"keccak256\":\"0x2166f766b7f61f9bb1376b0948efa0d0c0046b93dc301e51ce495203b145189b\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://929630e6a15f523b142b2897783b2f7a54532ac5ae578bd17a0b7f25a6ca2bd8\",\"dweb:/ipfs/QmTu9ffH9qbQncJGEc24bmnoCGjifQ7BG47AYR8AzMLfXR\"]},\"project:/contracts/interfaces/superfluid/ISuperfluidToken.sol\":{\"keccak256\":\"0x9189eaba9e856cc4932ea29eeaf4e89a09448dde13860591691ec122856fdc75\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://7d5991b906bba706373f5bfe3c2c8789a7a45360a41eee50574272b393c4ab70\",\"dweb:/ipfs/QmVCXVnYA13vMNxa7rGzNB129sUXiGE1asuHdnEMEPVZsp\"]},\"project:/contracts/interfaces/tokens/ERC20WithTokenInfo.sol\":{\"keccak256\":\"0x66708dae3fcd06e6fc0a46f2959fc2d1e6b9361f28598337339d26af8eb8c0f9\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://77b80718cec21b81ef190c19fb9fbe73913a95c71f7e6715f671bbe8a224dafc\",\"dweb:/ipfs/QmUdsc6DF2Bgih5VZm7sfaECjhGmwE7tAx8pMkzGQgVKQw\"]},\"project:/contracts/interfaces/tokens/TokenInfo.sol\":{\"keccak256\":\"0x70e573644a0ff271c0ccef526809e9d9ab4950ec58755ca84e833cde3b8f3df0\",\"license\":\"AGPLv3\",\"urls\":[\"bzz-raw://aea3709687cc37ba625f4cc882fbdb149a7bf5be5afe2b030203c8719641a77b\",\"dweb:/ipfs/QmVpvfR6ZheE5wNUK9CobaVBgVvEnEPkvjWF9cfwyZr7eQ\"]}},\"version\":1}",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220934a34f0152a4edbe8cff89a1158e919729309c785e0668d6d2c9ca301e7b46a64736f6c634300080d0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220934a34f0152a4edbe8cff89a1158e919729309c785e0668d6d2c9ca301e7b46a64736f6c634300080d0033",
   "immutableReferences": {},
   "generatedSources": [],
   "deployedGeneratedSources": [],
-  "sourceMap": "520:7023:35:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;520:7023:35;;;;;;;;;;;;;;;;;",
-  "deployedSourceMap": "520:7023:35:-:0;;;;;;;;",
-  "source": "// SPDX-License-Identifier: AGPLv3\npragma solidity 0.8.13;\n\nimport {\n    ISuperfluidGovernance,\n    ISuperfluid,\n    ISuperfluidToken,\n    ISuperApp,\n    SuperAppDefinitions,\n    ContextDefinitions\n} from \"../interfaces/superfluid/ISuperfluid.sol\";\nimport { ISuperfluidToken } from \"../interfaces/superfluid/ISuperfluidToken.sol\";\n\nimport { SafeCast } from \"@openzeppelin/contracts/utils/math/SafeCast.sol\";\n\n\n/**\n * @title Agreement Library\n * @author Superfluid\n * @dev Helper library for building super agreement\n */\nlibrary AgreementLibrary {\n\n    using SafeCast for uint256;\n    using SafeCast for int256;\n\n    /**************************************************************************\n     * Context helpers\n     *************************************************************************/\n\n    /**\n     * @dev Authorize the msg.sender to access token agreement storage\n     *\n     * NOTE:\n     * - msg.sender must be the expected host contract.\n     * - it should revert on unauthorized access.\n     */\n    function authorizeTokenAccess(ISuperfluidToken token, bytes memory ctx)\n        internal view\n        returns (ISuperfluid.Context memory)\n    {\n        require(token.getHost() == msg.sender, \"unauthorized host\");\n        require(ISuperfluid(msg.sender).isCtxValid(ctx), \"invalid ctx\");\n        return ISuperfluid(msg.sender).decodeCtx(ctx);\n    }\n\n    /**************************************************************************\n     * Agreement callback helpers\n     *************************************************************************/\n\n    struct CallbackInputs {\n        ISuperfluidToken token;\n        address account;\n        bytes32 agreementId;\n        bytes agreementData;\n        uint256 appAllowanceGranted;\n        int256 appAllowanceUsed;\n        uint256 noopBit;\n    }\n\n    function createCallbackInputs(\n        ISuperfluidToken token,\n        address account,\n        bytes32 agreementId,\n        bytes memory agreementData\n    )\n       internal pure\n       returns (CallbackInputs memory inputs)\n    {\n        inputs.token = token;\n        inputs.account = account;\n        inputs.agreementId = agreementId;\n        inputs.agreementData = agreementData;\n    }\n\n    function callAppBeforeCallback(\n        CallbackInputs memory inputs,\n        bytes memory ctx\n    )\n        internal\n        returns(bytes memory cbdata)\n    {\n        bool isSuperApp;\n        bool isJailed;\n        uint256 noopMask;\n        (isSuperApp, isJailed, noopMask) = ISuperfluid(msg.sender).getAppManifest(ISuperApp(inputs.account));\n        if (isSuperApp && !isJailed) {\n            bytes memory appCtx = _pushCallbackStack(ctx, inputs);\n            if ((noopMask & inputs.noopBit) == 0) {\n                bytes memory callData = abi.encodeWithSelector(\n                    _selectorFromNoopBit(inputs.noopBit),\n                    inputs.token,\n                    address(this) /* agreementClass */,\n                    inputs.agreementId,\n                    inputs.agreementData,\n                    new bytes(0) // placeholder ctx\n                );\n                cbdata = ISuperfluid(msg.sender).callAppBeforeCallback(\n                    ISuperApp(inputs.account),\n                    callData,\n                    inputs.noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP,\n                    appCtx);\n            }\n            // [SECURITY] NOTE: ctx should be const, do not modify it ever to ensure callback stack correctness\n            _popCallbackStack(ctx, 0);\n        }\n    }\n\n    function callAppAfterCallback(\n        CallbackInputs memory inputs,\n        bytes memory cbdata,\n        bytes /* const */ memory ctx\n    )\n        internal\n        returns (ISuperfluid.Context memory appContext, bytes memory newCtx)\n    {\n        bool isSuperApp;\n        bool isJailed;\n        uint256 noopMask;\n        (isSuperApp, isJailed, noopMask) = ISuperfluid(msg.sender).getAppManifest(ISuperApp(inputs.account));\n\n        newCtx = ctx;\n        if (isSuperApp && !isJailed) {\n            newCtx = _pushCallbackStack(newCtx, inputs);\n            if ((noopMask & inputs.noopBit) == 0) {\n                bytes memory callData = abi.encodeWithSelector(\n                    _selectorFromNoopBit(inputs.noopBit),\n                    inputs.token,\n                    address(this) /* agreementClass */,\n                    inputs.agreementId,\n                    inputs.agreementData,\n                    cbdata,\n                    new bytes(0) // placeholder ctx\n                );\n                newCtx = ISuperfluid(msg.sender).callAppAfterCallback(\n                    ISuperApp(inputs.account),\n                    callData,\n                    inputs.noopBit == SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP,\n                    newCtx);\n\n                appContext = ISuperfluid(msg.sender).decodeCtx(newCtx);\n\n                // adjust allowance used to the range [appAllowanceWanted..appAllowanceGranted]\n                appContext.appAllowanceUsed = max(0, min(\n                    inputs.appAllowanceGranted.toInt256(),\n                    max(appContext.appAllowanceWanted.toInt256(), appContext.appAllowanceUsed)));\n\n            }\n            // [SECURITY] NOTE: ctx should be const, do not modify it ever to ensure callback stack correctness\n            newCtx = _popCallbackStack(ctx, appContext.appAllowanceUsed);\n        }\n    }\n\n    function _selectorFromNoopBit(uint256 noopBit)\n        private pure\n        returns (bytes4 selector)\n    {\n        if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_CREATED_NOOP) {\n            return ISuperApp.beforeAgreementCreated.selector;\n        } else if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_UPDATED_NOOP) {\n            return ISuperApp.beforeAgreementUpdated.selector;\n        } else if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP) {\n            return ISuperApp.beforeAgreementTerminated.selector;\n        } else if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_CREATED_NOOP) {\n            return ISuperApp.afterAgreementCreated.selector;\n        } else if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_UPDATED_NOOP) {\n            return ISuperApp.afterAgreementUpdated.selector;\n        } else /* if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP) */ {\n            return ISuperApp.afterAgreementTerminated.selector;\n        }\n    }\n\n    function _pushCallbackStack(\n        bytes memory ctx,\n        CallbackInputs memory inputs\n    )\n        private\n        returns (bytes memory appCtx)\n    {\n        // app allowance params stack PUSH\n        // pass app allowance and current allowance used to the app,\n        appCtx = ISuperfluid(msg.sender).appCallbackPush(\n            ctx,\n            ISuperApp(inputs.account),\n            inputs.appAllowanceGranted,\n            inputs.appAllowanceUsed,\n            inputs.token);\n    }\n\n    function _popCallbackStack(\n        bytes memory ctx,\n        int256 appAllowanceUsedDelta\n    )\n        private\n        returns (bytes memory newCtx)\n    {\n        // app allowance params stack POP\n        return ISuperfluid(msg.sender).appCallbackPop(ctx, appAllowanceUsedDelta);\n    }\n\n    /**************************************************************************\n     * Misc\n     *************************************************************************/\n\n    function max(int256 a, int256 b) internal pure returns (int256) { return a > b ? a : b; }\n\n    function min(int256 a, int256 b) internal pure returns (int256) { return a > b ? b : a; }\n}\n",
+  "sourceMap": "520:7120:35:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;520:7120:35;;;;;;;;;;;;;;;;;",
+  "deployedSourceMap": "520:7120:35:-:0;;;;;;;;",
+  "source": "// SPDX-License-Identifier: AGPLv3\npragma solidity 0.8.13;\n\nimport {\n    ISuperfluidGovernance,\n    ISuperfluid,\n    ISuperfluidToken,\n    ISuperApp,\n    SuperAppDefinitions,\n    ContextDefinitions\n} from \"../interfaces/superfluid/ISuperfluid.sol\";\nimport { ISuperfluidToken } from \"../interfaces/superfluid/ISuperfluidToken.sol\";\n\nimport { SafeCast } from \"@openzeppelin/contracts/utils/math/SafeCast.sol\";\n\n\n/**\n * @title Agreement Library\n * @author Superfluid\n * @dev Helper library for building super agreement\n */\nlibrary AgreementLibrary {\n\n    using SafeCast for uint256;\n    using SafeCast for int256;\n\n    /**************************************************************************\n     * Context helpers\n     *************************************************************************/\n\n    /**\n     * @dev Authorize the msg.sender to access token agreement storage\n     *\n     * NOTE:\n     * - msg.sender must be the expected host contract.\n     * - it should revert on unauthorized access.\n     */\n    function authorizeTokenAccess(ISuperfluidToken token, bytes memory ctx)\n        internal view\n        returns (ISuperfluid.Context memory)\n    {\n        require(token.getHost() == msg.sender, \"unauthorized host\");\n        require(ISuperfluid(msg.sender).isCtxValid(ctx), \"invalid ctx\");\n        return ISuperfluid(msg.sender).decodeCtx(ctx);\n    }\n\n    /**************************************************************************\n     * Agreement callback helpers\n     *************************************************************************/\n\n    struct CallbackInputs {\n        ISuperfluidToken token;\n        address account;\n        bytes32 agreementId;\n        bytes agreementData;\n        uint256 appAllowanceGranted;\n        int256 appAllowanceUsed;\n        uint256 noopBit;\n    }\n\n    function createCallbackInputs(\n        ISuperfluidToken token,\n        address account,\n        bytes32 agreementId,\n        bytes memory agreementData\n    )\n       internal pure\n       returns (CallbackInputs memory inputs)\n    {\n        inputs.token = token;\n        inputs.account = account;\n        inputs.agreementId = agreementId;\n        inputs.agreementData = agreementData;\n    }\n\n    function callAppBeforeCallback(\n        CallbackInputs memory inputs,\n        bytes memory ctx\n    )\n        internal\n        returns(bytes memory cbdata)\n    {\n        bool isSuperApp;\n        bool isJailed;\n        uint256 noopMask;\n        (isSuperApp, isJailed, noopMask) = ISuperfluid(msg.sender).getAppManifest(ISuperApp(inputs.account));\n        if (isSuperApp && !isJailed) {\n            bytes memory appCtx = _pushCallbackStack(ctx, inputs);\n            if ((noopMask & inputs.noopBit) == 0) {\n                bytes memory callData = abi.encodeWithSelector(\n                    _selectorFromNoopBit(inputs.noopBit),\n                    inputs.token,\n                    address(this) /* agreementClass */,\n                    inputs.agreementId,\n                    inputs.agreementData,\n                    new bytes(0) // placeholder ctx\n                );\n                cbdata = ISuperfluid(msg.sender).callAppBeforeCallback(\n                    ISuperApp(inputs.account),\n                    callData,\n                    inputs.noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP,\n                    appCtx);\n            }\n            // [SECURITY] NOTE: ctx should be const, do not modify it ever to ensure callback stack correctness\n            _popCallbackStack(ctx, 0);\n        }\n    }\n\n    function callAppAfterCallback(\n        CallbackInputs memory inputs,\n        bytes memory cbdata,\n        bytes /* const */ memory ctx\n    )\n        internal\n        returns (ISuperfluid.Context memory appContext, bytes memory newCtx)\n    {\n        bool isSuperApp;\n        bool isJailed;\n        uint256 noopMask;\n        (isSuperApp, isJailed, noopMask) = ISuperfluid(msg.sender).getAppManifest(ISuperApp(inputs.account));\n\n        newCtx = ctx;\n        if (isSuperApp && !isJailed) {\n            newCtx = _pushCallbackStack(newCtx, inputs);\n            if ((noopMask & inputs.noopBit) == 0) {\n                bytes memory callData = abi.encodeWithSelector(\n                    _selectorFromNoopBit(inputs.noopBit),\n                    inputs.token,\n                    address(this) /* agreementClass */,\n                    inputs.agreementId,\n                    inputs.agreementData,\n                    cbdata,\n                    new bytes(0) // placeholder ctx\n                );\n                newCtx = ISuperfluid(msg.sender).callAppAfterCallback(\n                    ISuperApp(inputs.account),\n                    callData,\n                    inputs.noopBit == SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP,\n                    newCtx);\n\n                appContext = ISuperfluid(msg.sender).decodeCtx(newCtx);\n\n                // adjust allowance used to the range [appAllowanceWanted..appAllowanceGranted]\n                appContext.appAllowanceUsed = max(0, min(\n                    inputs.appAllowanceGranted.toInt256(),\n                    max(appContext.appAllowanceWanted.toInt256(), appContext.appAllowanceUsed)));\n\n            }\n            // [SECURITY] NOTE: ctx should be const, do not modify it ever to ensure callback stack correctness\n            newCtx = _popCallbackStack(ctx, appContext.appAllowanceUsed);\n        }\n    }\n\n    function _selectorFromNoopBit(uint256 noopBit)\n        private pure\n        returns (bytes4 selector)\n    {\n        if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_CREATED_NOOP) {\n            return ISuperApp.beforeAgreementCreated.selector;\n        } else if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_UPDATED_NOOP) {\n            return ISuperApp.beforeAgreementUpdated.selector;\n        } else if (noopBit == SuperAppDefinitions.BEFORE_AGREEMENT_TERMINATED_NOOP) {\n            return ISuperApp.beforeAgreementTerminated.selector;\n        } else if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_CREATED_NOOP) {\n            return ISuperApp.afterAgreementCreated.selector;\n        } else if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_UPDATED_NOOP) {\n            return ISuperApp.afterAgreementUpdated.selector;\n        } else /* if (noopBit == SuperAppDefinitions.AFTER_AGREEMENT_TERMINATED_NOOP) */ {\n            return ISuperApp.afterAgreementTerminated.selector;\n        }\n    }\n\n    function _pushCallbackStack(\n        bytes memory ctx,\n        CallbackInputs memory inputs\n    )\n        private\n        returns (bytes memory appCtx)\n    {\n        // app allowance params stack PUSH\n        // pass app allowance and current allowance used to the app,\n        appCtx = ISuperfluid(msg.sender).appCallbackPush(\n            ctx,\n            ISuperApp(inputs.account),\n            inputs.appAllowanceGranted,\n            inputs.appAllowanceUsed,\n            inputs.token);\n    }\n\n    function _popCallbackStack(\n        bytes memory ctx,\n        int256 appAllowanceUsedDelta\n    )\n        private\n        returns (bytes memory newCtx)\n    {\n        // app allowance params stack POP\n        return ISuperfluid(msg.sender).appCallbackPop(ctx, appAllowanceUsedDelta);\n    }\n\n    /**************************************************************************\n     * Misc\n     *************************************************************************/\n\n    function max(int256 a, int256 b) internal pure returns (int256) { return a > b ? a : b; }\n    function max(uint256 a, uint256 b) internal pure returns (uint256) { return a > b ? a : b; }\n\n    function min(int256 a, int256 b) internal pure returns (int256) { return a > b ? b : a; }\n}\n",
   "sourcePath": "/home/runner/work/protocol-monorepo/protocol-monorepo/packages/ethereum-contracts/contracts/agreements/AgreementLibrary.sol",
   "ast": {
     "absolutePath": "project:/contracts/agreements/AgreementLibrary.sol",
     "exportedSymbols": {
       "AgreementLibrary": [
-        5927
+        5944
       ],
       "ContextDefinitions": [
-        17942
+        17720
       ],
       "ISuperApp": [
-        18307
+        18085
       ],
       "ISuperfluid": [
-        19246
+        19024
       ],
       "ISuperfluidGovernance": [
-        19369
+        19147
       ],
       "ISuperfluidToken": [
-        19643
+        19421
       ],
       "SafeCast": [
         4435
       ],
       "SuperAppDefinitions": [
-        17866
+        17644
       ]
     },
-    "id": 5928,
+    "id": 5945,
     "license": "AGPLv3",
     "nodeType": "SourceUnit",
     "nodes": [
@@ -59,8 +59,8 @@
         "id": 5411,
         "nameLocation": "-1:-1:-1",
         "nodeType": "ImportDirective",
-        "scope": 5928,
-        "sourceUnit": 19247,
+        "scope": 5945,
+        "sourceUnit": 19025,
         "src": "60:188:35",
         "symbolAliases": [
           {
@@ -69,7 +69,7 @@
               "name": "ISuperfluidGovernance",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 19369,
+              "referencedDeclaration": 19147,
               "src": "73:21:35",
               "typeDescriptions": {}
             },
@@ -81,7 +81,7 @@
               "name": "ISuperfluid",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 19246,
+              "referencedDeclaration": 19024,
               "src": "100:11:35",
               "typeDescriptions": {}
             },
@@ -93,7 +93,7 @@
               "name": "ISuperfluidToken",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 19643,
+              "referencedDeclaration": 19421,
               "src": "117:16:35",
               "typeDescriptions": {}
             },
@@ -105,7 +105,7 @@
               "name": "ISuperApp",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 18307,
+              "referencedDeclaration": 18085,
               "src": "139:9:35",
               "typeDescriptions": {}
             },
@@ -117,7 +117,7 @@
               "name": "SuperAppDefinitions",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 17866,
+              "referencedDeclaration": 17644,
               "src": "154:19:35",
               "typeDescriptions": {}
             },
@@ -129,7 +129,7 @@
               "name": "ContextDefinitions",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 17942,
+              "referencedDeclaration": 17720,
               "src": "179:18:35",
               "typeDescriptions": {}
             },
@@ -144,8 +144,8 @@
         "id": 5413,
         "nameLocation": "-1:-1:-1",
         "nodeType": "ImportDirective",
-        "scope": 5928,
-        "sourceUnit": 19644,
+        "scope": 5945,
+        "sourceUnit": 19422,
         "src": "249:81:35",
         "symbolAliases": [
           {
@@ -154,7 +154,7 @@
               "name": "ISuperfluidToken",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 19643,
+              "referencedDeclaration": 19421,
               "src": "258:16:35",
               "typeDescriptions": {}
             },
@@ -169,7 +169,7 @@
         "id": 5415,
         "nameLocation": "-1:-1:-1",
         "nodeType": "ImportDirective",
-        "scope": 5928,
+        "scope": 5945,
         "sourceUnit": 4436,
         "src": "332:75:35",
         "symbolAliases": [
@@ -201,9 +201,9 @@
           "text": " @title Agreement Library\n @author Superfluid\n @dev Helper library for building super agreement"
         },
         "fullyImplemented": true,
-        "id": 5927,
+        "id": 5944,
         "linearizedBaseContracts": [
-          5927
+          5944
         ],
         "name": "AgreementLibrary",
         "nameLocation": "528:16:35",
@@ -286,7 +286,7 @@
                               "referencedDeclaration": 5426,
                               "src": "1174:5:35",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
@@ -297,7 +297,7 @@
                             "lValueRequested": false,
                             "memberName": "getHost",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 19380,
+                            "referencedDeclaration": 19158,
                             "src": "1174:13:35",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$__$returns$_t_address_$",
@@ -479,10 +479,10 @@
                               "name": "ISuperfluid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 19246,
+                              "referencedDeclaration": 19024,
                               "src": "1243:11:35",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                                "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                                 "typeString": "type(contract ISuperfluid)"
                               }
                             },
@@ -497,7 +497,7 @@
                             "src": "1243:23:35",
                             "tryCall": false,
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                              "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                               "typeString": "contract ISuperfluid"
                             }
                           },
@@ -508,7 +508,7 @@
                           "lValueRequested": false,
                           "memberName": "isCtxValid",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 19222,
+                          "referencedDeclaration": 19000,
                           "src": "1243:34:35",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_bool_$",
@@ -654,10 +654,10 @@
                           "name": "ISuperfluid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 19246,
+                          "referencedDeclaration": 19024,
                           "src": "1315:11:35",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                            "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                             "typeString": "type(contract ISuperfluid)"
                           }
                         },
@@ -672,7 +672,7 @@
                         "src": "1315:23:35",
                         "tryCall": false,
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                          "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                           "typeString": "contract ISuperfluid"
                         }
                       },
@@ -683,10 +683,10 @@
                       "lValueRequested": false,
                       "memberName": "decodeCtx",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 19215,
+                      "referencedDeclaration": 18993,
                       "src": "1315:33:35",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_external_pure$_t_bytes_memory_ptr_$returns$_t_struct$_Context_$19179_memory_ptr_$",
+                        "typeIdentifier": "t_function_external_pure$_t_bytes_memory_ptr_$returns$_t_struct$_Context_$18957_memory_ptr_$",
                         "typeString": "function (bytes memory) pure external returns (struct ISuperfluid.Context memory)"
                       }
                     },
@@ -701,7 +701,7 @@
                     "src": "1315:38:35",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                      "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                       "typeString": "struct ISuperfluid.Context memory"
                     }
                   },
@@ -741,7 +741,7 @@
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
@@ -751,13 +751,13 @@
                       "id": 5424,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19643,
+                      "referencedDeclaration": 19421,
                       "src": "1043:16:35"
                     },
-                    "referencedDeclaration": 19643,
+                    "referencedDeclaration": 19421,
                     "src": "1043:16:35",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -809,7 +809,7 @@
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                    "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                     "typeString": "struct ISuperfluid.Context"
                   },
                   "typeName": {
@@ -819,13 +819,13 @@
                       "id": 5430,
                       "name": "ISuperfluid.Context",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19179,
+                      "referencedDeclaration": 18957,
                       "src": "1124:19:35"
                     },
-                    "referencedDeclaration": 19179,
+                    "referencedDeclaration": 18957,
                     "src": "1124:19:35",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Context_$19179_storage_ptr",
+                      "typeIdentifier": "t_struct$_Context_$18957_storage_ptr",
                       "typeString": "struct ISuperfluid.Context"
                     }
                   },
@@ -834,7 +834,7 @@
               ],
               "src": "1123:28:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "1013:347:35",
             "stateMutability": "view",
             "virtual": false,
@@ -856,7 +856,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                  "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                   "typeString": "contract ISuperfluidToken"
                 },
                 "typeName": {
@@ -866,13 +866,13 @@
                     "id": 5465,
                     "name": "ISuperfluidToken",
                     "nodeType": "IdentifierPath",
-                    "referencedDeclaration": 19643,
+                    "referencedDeclaration": 19421,
                     "src": "1593:16:35"
                   },
-                  "referencedDeclaration": 19643,
+                  "referencedDeclaration": 19421,
                   "src": "1593:16:35",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                     "typeString": "contract ISuperfluidToken"
                   }
                 },
@@ -1045,7 +1045,7 @@
             "name": "CallbackInputs",
             "nameLocation": "1568:14:35",
             "nodeType": "StructDefinition",
-            "scope": 5927,
+            "scope": 5944,
             "src": "1561:239:35",
             "visibility": "public"
           },
@@ -1085,7 +1085,7 @@
                       "referencedDeclaration": 5467,
                       "src": "2045:12:35",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                        "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                         "typeString": "contract ISuperfluidToken"
                       }
                     },
@@ -1099,13 +1099,13 @@
                       "referencedDeclaration": 5483,
                       "src": "2060:5:35",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                        "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                         "typeString": "contract ISuperfluidToken"
                       }
                     },
                     "src": "2045:20:35",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -1312,7 +1312,7 @@
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
@@ -1322,13 +1322,13 @@
                       "id": 5481,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19643,
+                      "referencedDeclaration": 19421,
                       "src": "1845:16:35"
                     },
-                    "referencedDeclaration": 19643,
+                    "referencedDeclaration": 19421,
                     "src": "1845:16:35",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -1460,7 +1460,7 @@
               ],
               "src": "2000:30:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "1806:388:35",
             "stateMutability": "pure",
             "virtual": false,
@@ -1687,10 +1687,10 @@
                             "name": "ISuperApp",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 18307,
+                            "referencedDeclaration": 18085,
                             "src": "2517:9:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                               "typeString": "type(contract ISuperApp)"
                             }
                           },
@@ -1705,7 +1705,7 @@
                           "src": "2517:25:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           }
                         }
@@ -1713,7 +1713,7 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           }
                         ],
@@ -1757,10 +1757,10 @@
                             "name": "ISuperfluid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 19246,
+                            "referencedDeclaration": 19024,
                             "src": "2478:11:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                               "typeString": "type(contract ISuperfluid)"
                             }
                           },
@@ -1775,7 +1775,7 @@
                           "src": "2478:23:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                            "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                             "typeString": "contract ISuperfluid"
                           }
                         },
@@ -1786,10 +1786,10 @@
                         "lValueRequested": false,
                         "memberName": "getAppManifest",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 19012,
+                        "referencedDeclaration": 18790,
                         "src": "2478:38:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_function_external_view$_t_contract$_ISuperApp_$18307_$returns$_t_bool_$_t_bool_$_t_uint256_$",
+                          "typeIdentifier": "t_function_external_view$_t_contract$_ISuperApp_$18085_$returns$_t_bool_$_t_bool_$_t_uint256_$",
                           "typeString": "function (contract ISuperApp) view external returns (bool,bool,uint256)"
                         }
                       },
@@ -2223,7 +2223,7 @@
                                     "referencedDeclaration": 5467,
                                     "src": "2845:12:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
@@ -2237,7 +2237,7 @@
                                         "referencedDeclaration": 4294967268,
                                         "src": "2887:4:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5927",
+                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5944",
                                           "typeString": "library AgreementLibrary"
                                         }
                                       }
@@ -2245,7 +2245,7 @@
                                     "expression": {
                                       "argumentTypes": [
                                         {
-                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5927",
+                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5944",
                                           "typeString": "library AgreementLibrary"
                                         }
                                       ],
@@ -2408,7 +2408,7 @@
                                       "typeString": "bytes4"
                                     },
                                     {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                                       "typeString": "contract ISuperfluidToken"
                                     },
                                     {
@@ -2535,10 +2535,10 @@
                                         "name": "ISuperApp",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 18307,
+                                        "referencedDeclaration": 18085,
                                         "src": "3160:9:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                          "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                           "typeString": "type(contract ISuperApp)"
                                         }
                                       },
@@ -2553,7 +2553,7 @@
                                       "src": "3160:25:35",
                                       "tryCall": false,
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                                        "typeIdentifier": "t_contract$_ISuperApp_$18085",
                                         "typeString": "contract ISuperApp"
                                       }
                                     },
@@ -2614,10 +2614,10 @@
                                           "name": "SuperAppDefinitions",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 17866,
+                                          "referencedDeclaration": 17644,
                                           "src": "3255:19:35",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                                             "typeString": "type(library SuperAppDefinitions)"
                                           }
                                         },
@@ -2628,7 +2628,7 @@
                                         "lValueRequested": false,
                                         "memberName": "BEFORE_AGREEMENT_TERMINATED_NOOP",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 17800,
+                                        "referencedDeclaration": 17578,
                                         "src": "3255:52:35",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -2657,7 +2657,7 @@
                                   "expression": {
                                     "argumentTypes": [
                                       {
-                                        "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                                        "typeIdentifier": "t_contract$_ISuperApp_$18085",
                                         "typeString": "contract ISuperApp"
                                       },
                                       {
@@ -2713,10 +2713,10 @@
                                         "name": "ISuperfluid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 19246,
+                                        "referencedDeclaration": 19024,
                                         "src": "3093:11:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                                           "typeString": "type(contract ISuperfluid)"
                                         }
                                       },
@@ -2731,7 +2731,7 @@
                                       "src": "3093:23:35",
                                       "tryCall": false,
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                                        "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                                         "typeString": "contract ISuperfluid"
                                       }
                                     },
@@ -2742,10 +2742,10 @@
                                     "lValueRequested": false,
                                     "memberName": "callAppBeforeCallback",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 19055,
+                                    "referencedDeclaration": 18833,
                                     "src": "3093:45:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_function_external_nonpayable$_t_contract$_ISuperApp_$18307_$_t_bytes_memory_ptr_$_t_bool_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$",
+                                      "typeIdentifier": "t_function_external_nonpayable$_t_contract$_ISuperApp_$18085_$_t_bytes_memory_ptr_$_t_bool_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$",
                                       "typeString": "function (contract ISuperApp,bytes memory,bool,bytes memory) external returns (bytes memory)"
                                     }
                                   },
@@ -2964,7 +2964,7 @@
               ],
               "src": "2333:21:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "2200:1318:35",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -3191,10 +3191,10 @@
                             "name": "ISuperApp",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 18307,
+                            "referencedDeclaration": 18085,
                             "src": "3921:9:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                               "typeString": "type(contract ISuperApp)"
                             }
                           },
@@ -3209,7 +3209,7 @@
                           "src": "3921:25:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           }
                         }
@@ -3217,7 +3217,7 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           }
                         ],
@@ -3261,10 +3261,10 @@
                             "name": "ISuperfluid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 19246,
+                            "referencedDeclaration": 19024,
                             "src": "3882:11:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                               "typeString": "type(contract ISuperfluid)"
                             }
                           },
@@ -3279,7 +3279,7 @@
                           "src": "3882:23:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                            "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                             "typeString": "contract ISuperfluid"
                           }
                         },
@@ -3290,10 +3290,10 @@
                         "lValueRequested": false,
                         "memberName": "getAppManifest",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 19012,
+                        "referencedDeclaration": 18790,
                         "src": "3882:38:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_function_external_view$_t_contract$_ISuperApp_$18307_$returns$_t_bool_$_t_bool_$_t_uint256_$",
+                          "typeIdentifier": "t_function_external_view$_t_contract$_ISuperApp_$18085_$returns$_t_bool_$_t_bool_$_t_uint256_$",
                           "typeString": "function (contract ISuperApp) view external returns (bool,bool,uint256)"
                         }
                       },
@@ -3764,7 +3764,7 @@
                                     "referencedDeclaration": 5467,
                                     "src": "4262:12:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
@@ -3778,7 +3778,7 @@
                                         "referencedDeclaration": 4294967268,
                                         "src": "4304:4:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5927",
+                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5944",
                                           "typeString": "library AgreementLibrary"
                                         }
                                       }
@@ -3786,7 +3786,7 @@
                                     "expression": {
                                       "argumentTypes": [
                                         {
-                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5927",
+                                          "typeIdentifier": "t_contract$_AgreementLibrary_$5944",
                                           "typeString": "library AgreementLibrary"
                                         }
                                       ],
@@ -3961,7 +3961,7 @@
                                       "typeString": "bytes4"
                                     },
                                     {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                                       "typeString": "contract ISuperfluidToken"
                                     },
                                     {
@@ -4092,10 +4092,10 @@
                                         "name": "ISuperApp",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 18307,
+                                        "referencedDeclaration": 18085,
                                         "src": "4604:9:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                          "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                           "typeString": "type(contract ISuperApp)"
                                         }
                                       },
@@ -4110,7 +4110,7 @@
                                       "src": "4604:25:35",
                                       "tryCall": false,
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                                        "typeIdentifier": "t_contract$_ISuperApp_$18085",
                                         "typeString": "contract ISuperApp"
                                       }
                                     },
@@ -4171,10 +4171,10 @@
                                           "name": "SuperAppDefinitions",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 17866,
+                                          "referencedDeclaration": 17644,
                                           "src": "4699:19:35",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                                             "typeString": "type(library SuperAppDefinitions)"
                                           }
                                         },
@@ -4185,7 +4185,7 @@
                                         "lValueRequested": false,
                                         "memberName": "AFTER_AGREEMENT_TERMINATED_NOOP",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 17808,
+                                        "referencedDeclaration": 17586,
                                         "src": "4699:51:35",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -4214,7 +4214,7 @@
                                   "expression": {
                                     "argumentTypes": [
                                       {
-                                        "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                                        "typeIdentifier": "t_contract$_ISuperApp_$18085",
                                         "typeString": "contract ISuperApp"
                                       },
                                       {
@@ -4270,10 +4270,10 @@
                                         "name": "ISuperfluid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 19246,
+                                        "referencedDeclaration": 19024,
                                         "src": "4538:11:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                                           "typeString": "type(contract ISuperfluid)"
                                         }
                                       },
@@ -4288,7 +4288,7 @@
                                       "src": "4538:23:35",
                                       "tryCall": false,
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                                        "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                                         "typeString": "contract ISuperfluid"
                                       }
                                     },
@@ -4299,10 +4299,10 @@
                                     "lValueRequested": false,
                                     "memberName": "callAppAfterCallback",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 19070,
+                                    "referencedDeclaration": 18848,
                                     "src": "4538:44:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_function_external_nonpayable$_t_contract$_ISuperApp_$18307_$_t_bytes_memory_ptr_$_t_bool_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$",
+                                      "typeIdentifier": "t_function_external_nonpayable$_t_contract$_ISuperApp_$18085_$_t_bytes_memory_ptr_$_t_bool_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$",
                                       "typeString": "function (contract ISuperApp,bytes memory,bool,bytes memory) external returns (bytes memory)"
                                     }
                                   },
@@ -4346,7 +4346,7 @@
                                   "referencedDeclaration": 5638,
                                   "src": "4798:10:35",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                     "typeString": "struct ISuperfluid.Context memory"
                                   }
                                 },
@@ -4414,10 +4414,10 @@
                                         "name": "ISuperfluid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 19246,
+                                        "referencedDeclaration": 19024,
                                         "src": "4811:11:35",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                                          "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                                           "typeString": "type(contract ISuperfluid)"
                                         }
                                       },
@@ -4432,7 +4432,7 @@
                                       "src": "4811:23:35",
                                       "tryCall": false,
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                                        "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                                         "typeString": "contract ISuperfluid"
                                       }
                                     },
@@ -4443,10 +4443,10 @@
                                     "lValueRequested": false,
                                     "memberName": "decodeCtx",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 19215,
+                                    "referencedDeclaration": 18993,
                                     "src": "4811:33:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_function_external_pure$_t_bytes_memory_ptr_$returns$_t_struct$_Context_$19179_memory_ptr_$",
+                                      "typeIdentifier": "t_function_external_pure$_t_bytes_memory_ptr_$returns$_t_struct$_Context_$18957_memory_ptr_$",
                                       "typeString": "function (bytes memory) pure external returns (struct ISuperfluid.Context memory)"
                                     }
                                   },
@@ -4461,13 +4461,13 @@
                                   "src": "4811:41:35",
                                   "tryCall": false,
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                     "typeString": "struct ISuperfluid.Context memory"
                                   }
                                 },
                                 "src": "4798:54:35",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                   "typeString": "struct ISuperfluid.Context memory"
                                 }
                               },
@@ -4491,7 +4491,7 @@
                                     "referencedDeclaration": 5638,
                                     "src": "4967:10:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                       "typeString": "struct ISuperfluid.Context memory"
                                     }
                                   },
@@ -4502,7 +4502,7 @@
                                   "lValueRequested": true,
                                   "memberName": "appAllowanceUsed",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 19173,
+                                  "referencedDeclaration": 18951,
                                   "src": "4967:27:35",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_int256",
@@ -4606,7 +4606,7 @@
                                                     "referencedDeclaration": 5638,
                                                     "src": "5092:10:35",
                                                     "typeDescriptions": {
-                                                      "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                                      "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                                       "typeString": "struct ISuperfluid.Context memory"
                                                     }
                                                   },
@@ -4617,7 +4617,7 @@
                                                   "lValueRequested": false,
                                                   "memberName": "appAllowanceWanted",
                                                   "nodeType": "MemberAccess",
-                                                  "referencedDeclaration": 19171,
+                                                  "referencedDeclaration": 18949,
                                                   "src": "5092:29:35",
                                                   "typeDescriptions": {
                                                     "typeIdentifier": "t_uint256",
@@ -4662,7 +4662,7 @@
                                                 "referencedDeclaration": 5638,
                                                 "src": "5134:10:35",
                                                 "typeDescriptions": {
-                                                  "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                                  "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                                   "typeString": "struct ISuperfluid.Context memory"
                                                 }
                                               },
@@ -4673,7 +4673,7 @@
                                               "lValueRequested": false,
                                               "memberName": "appAllowanceUsed",
                                               "nodeType": "MemberAccess",
-                                              "referencedDeclaration": 19173,
+                                              "referencedDeclaration": 18951,
                                               "src": "5134:27:35",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_int256",
@@ -4695,7 +4695,10 @@
                                             "id": 5754,
                                             "name": "max",
                                             "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
+                                            "overloadedDeclarations": [
+                                              5909,
+                                              5926
+                                            ],
                                             "referencedDeclaration": 5909,
                                             "src": "5088:3:35",
                                             "typeDescriptions": {
@@ -4734,7 +4737,7 @@
                                         "name": "min",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 5926,
+                                        "referencedDeclaration": 5943,
                                         "src": "5004:3:35",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_internal_pure$_t_int256_$_t_int256_$returns$_t_int256_$",
@@ -4771,7 +4774,10 @@
                                     "id": 5747,
                                     "name": "max",
                                     "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
+                                    "overloadedDeclarations": [
+                                      5909,
+                                      5926
+                                    ],
                                     "referencedDeclaration": 5909,
                                     "src": "4997:3:35",
                                     "typeDescriptions": {
@@ -4851,7 +4857,7 @@
                                   "referencedDeclaration": 5638,
                                   "src": "5337:10:35",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                                     "typeString": "struct ISuperfluid.Context memory"
                                   }
                                 },
@@ -4862,7 +4868,7 @@
                                 "lValueRequested": false,
                                 "memberName": "appAllowanceUsed",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 19173,
+                                "referencedDeclaration": 18951,
                                 "src": "5337:27:35",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int256",
@@ -5040,7 +5046,7 @@
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_struct$_Context_$19179_memory_ptr",
+                    "typeIdentifier": "t_struct$_Context_$18957_memory_ptr",
                     "typeString": "struct ISuperfluid.Context"
                   },
                   "typeName": {
@@ -5050,13 +5056,13 @@
                       "id": 5636,
                       "name": "ISuperfluid.Context",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19179,
+                      "referencedDeclaration": 18957,
                       "src": "3699:19:35"
                     },
-                    "referencedDeclaration": 19179,
+                    "referencedDeclaration": 18957,
                     "src": "3699:19:35",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Context_$19179_storage_ptr",
+                      "typeIdentifier": "t_struct$_Context_$18957_storage_ptr",
                       "typeString": "struct ISuperfluid.Context"
                     }
                   },
@@ -5092,7 +5098,7 @@
               ],
               "src": "3698:60:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "3524:1858:35",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -5135,10 +5141,10 @@
                         "name": "SuperAppDefinitions",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 17866,
+                        "referencedDeclaration": 17644,
                         "src": "5519:19:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                          "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                           "typeString": "type(library SuperAppDefinitions)"
                         }
                       },
@@ -5149,7 +5155,7 @@
                       "lValueRequested": false,
                       "memberName": "BEFORE_AGREEMENT_CREATED_NOOP",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 17768,
+                      "referencedDeclaration": 17546,
                       "src": "5519:49:35",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -5193,10 +5199,10 @@
                           "name": "SuperAppDefinitions",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 17866,
+                          "referencedDeclaration": 17644,
                           "src": "5664:19:35",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                            "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                             "typeString": "type(library SuperAppDefinitions)"
                           }
                         },
@@ -5207,7 +5213,7 @@
                         "lValueRequested": false,
                         "memberName": "BEFORE_AGREEMENT_UPDATED_NOOP",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 17784,
+                        "referencedDeclaration": 17562,
                         "src": "5664:49:35",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -5251,10 +5257,10 @@
                             "name": "SuperAppDefinitions",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 17866,
+                            "referencedDeclaration": 17644,
                             "src": "5809:19:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                              "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                               "typeString": "type(library SuperAppDefinitions)"
                             }
                           },
@@ -5265,7 +5271,7 @@
                           "lValueRequested": false,
                           "memberName": "BEFORE_AGREEMENT_TERMINATED_NOOP",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 17800,
+                          "referencedDeclaration": 17578,
                           "src": "5809:52:35",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -5309,10 +5315,10 @@
                               "name": "SuperAppDefinitions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 17866,
+                              "referencedDeclaration": 17644,
                               "src": "5960:19:35",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                                "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                                 "typeString": "type(library SuperAppDefinitions)"
                               }
                             },
@@ -5323,7 +5329,7 @@
                             "lValueRequested": false,
                             "memberName": "AFTER_AGREEMENT_CREATED_NOOP",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 17776,
+                            "referencedDeclaration": 17554,
                             "src": "5960:48:35",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -5367,10 +5373,10 @@
                                 "name": "SuperAppDefinitions",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 17866,
+                                "referencedDeclaration": 17644,
                                 "src": "6103:19:35",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17866_$",
+                                  "typeIdentifier": "t_type$_t_contract$_SuperAppDefinitions_$17644_$",
                                   "typeString": "type(library SuperAppDefinitions)"
                                 }
                               },
@@ -5381,7 +5387,7 @@
                               "lValueRequested": false,
                               "memberName": "AFTER_AGREEMENT_UPDATED_NOOP",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 17792,
+                              "referencedDeclaration": 17570,
                               "src": "6103:48:35",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -5407,10 +5413,10 @@
                                       "name": "ISuperApp",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 18307,
+                                      "referencedDeclaration": 18085,
                                       "src": "6326:9:35",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                        "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                         "typeString": "type(contract ISuperApp)"
                                       }
                                     },
@@ -5421,10 +5427,10 @@
                                     "lValueRequested": false,
                                     "memberName": "afterAgreementTerminated",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 18306,
+                                    "referencedDeclaration": 18084,
                                     "src": "6326:34:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                                      "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                                       "typeString": "function ISuperApp.afterAgreementTerminated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata,bytes calldata) returns (bytes memory)"
                                     }
                                   },
@@ -5464,10 +5470,10 @@
                                       "name": "ISuperApp",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 18307,
+                                      "referencedDeclaration": 18085,
                                       "src": "6174:9:35",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                        "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                         "typeString": "type(contract ISuperApp)"
                                       }
                                     },
@@ -5478,10 +5484,10 @@
                                     "lValueRequested": false,
                                     "memberName": "afterAgreementUpdated",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 18270,
+                                    "referencedDeclaration": 18048,
                                     "src": "6174:31:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                                      "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                                       "typeString": "function ISuperApp.afterAgreementUpdated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata,bytes calldata) returns (bytes memory)"
                                     }
                                   },
@@ -5522,10 +5528,10 @@
                                     "name": "ISuperApp",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 18307,
+                                    "referencedDeclaration": 18085,
                                     "src": "6031:9:35",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                      "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                       "typeString": "type(contract ISuperApp)"
                                     }
                                   },
@@ -5536,10 +5542,10 @@
                                   "lValueRequested": false,
                                   "memberName": "afterAgreementCreated",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 18234,
+                                  "referencedDeclaration": 18012,
                                   "src": "6031:31:35",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                                    "typeIdentifier": "t_function_declaration_nonpayable$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                                     "typeString": "function ISuperApp.afterAgreementCreated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata,bytes calldata) returns (bytes memory)"
                                   }
                                 },
@@ -5580,10 +5586,10 @@
                                   "name": "ISuperApp",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 18307,
+                                  "referencedDeclaration": 18085,
                                   "src": "5884:9:35",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                    "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                     "typeString": "type(contract ISuperApp)"
                                   }
                                 },
@@ -5594,10 +5600,10 @@
                                 "lValueRequested": false,
                                 "memberName": "beforeAgreementTerminated",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 18287,
+                                "referencedDeclaration": 18065,
                                 "src": "5884:35:35",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                                  "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                                   "typeString": "function ISuperApp.beforeAgreementTerminated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata) view returns (bytes memory)"
                                 }
                               },
@@ -5638,10 +5644,10 @@
                                 "name": "ISuperApp",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 18307,
+                                "referencedDeclaration": 18085,
                                 "src": "5736:9:35",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                  "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                   "typeString": "type(contract ISuperApp)"
                                 }
                               },
@@ -5652,10 +5658,10 @@
                               "lValueRequested": false,
                               "memberName": "beforeAgreementUpdated",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 18251,
+                              "referencedDeclaration": 18029,
                               "src": "5736:32:35",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                                "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                                 "typeString": "function ISuperApp.beforeAgreementUpdated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata) view returns (bytes memory)"
                               }
                             },
@@ -5696,10 +5702,10 @@
                               "name": "ISuperApp",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 18307,
+                              "referencedDeclaration": 18085,
                               "src": "5591:9:35",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                                "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                                 "typeString": "type(contract ISuperApp)"
                               }
                             },
@@ -5710,10 +5716,10 @@
                             "lValueRequested": false,
                             "memberName": "beforeAgreementCreated",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 18215,
+                            "referencedDeclaration": 17993,
                             "src": "5591:32:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18683_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
+                              "typeIdentifier": "t_function_declaration_view$_t_contract$_ISuperToken_$18461_$_t_address_$_t_bytes32_$_t_bytes_calldata_ptr_$_t_bytes_calldata_ptr_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function ISuperApp.beforeAgreementCreated(contract ISuperToken,address,bytes32,bytes calldata,bytes calldata) view returns (bytes memory)"
                             }
                           },
@@ -5815,7 +5821,7 @@
               ],
               "src": "5472:17:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "5388:998:35",
             "stateMutability": "pure",
             "virtual": false,
@@ -5903,10 +5909,10 @@
                             "name": "ISuperApp",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 18307,
+                            "referencedDeclaration": 18085,
                             "src": "6749:9:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18307_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperApp_$18085_$",
                               "typeString": "type(contract ISuperApp)"
                             }
                           },
@@ -5921,7 +5927,7 @@
                           "src": "6749:25:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           }
                         },
@@ -6002,7 +6008,7 @@
                           "referencedDeclaration": 5467,
                           "src": "6865:12:35",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                            "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                             "typeString": "contract ISuperfluidToken"
                           }
                         }
@@ -6014,7 +6020,7 @@
                             "typeString": "bytes memory"
                           },
                           {
-                            "typeIdentifier": "t_contract$_ISuperApp_$18307",
+                            "typeIdentifier": "t_contract$_ISuperApp_$18085",
                             "typeString": "contract ISuperApp"
                           },
                           {
@@ -6026,7 +6032,7 @@
                             "typeString": "int256"
                           },
                           {
-                            "typeIdentifier": "t_contract$_ISuperfluidToken_$19643",
+                            "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
                             "typeString": "contract ISuperfluidToken"
                           }
                         ],
@@ -6070,10 +6076,10 @@
                             "name": "ISuperfluid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 19246,
+                            "referencedDeclaration": 19024,
                             "src": "6679:11:35",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                              "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                               "typeString": "type(contract ISuperfluid)"
                             }
                           },
@@ -6088,7 +6094,7 @@
                           "src": "6679:23:35",
                           "tryCall": false,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                            "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                             "typeString": "contract ISuperfluid"
                           }
                         },
@@ -6099,10 +6105,10 @@
                         "lValueRequested": false,
                         "memberName": "appCallbackPush",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 19088,
+                        "referencedDeclaration": 18866,
                         "src": "6679:39:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_contract$_ISuperApp_$18307_$_t_uint256_$_t_int256_$_t_contract$_ISuperfluidToken_$19643_$returns$_t_bytes_memory_ptr_$",
+                          "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_contract$_ISuperApp_$18085_$_t_uint256_$_t_int256_$_t_contract$_ISuperfluidToken_$19421_$returns$_t_bytes_memory_ptr_$",
                           "typeString": "function (bytes memory,contract ISuperApp,uint256,int256,contract ISuperfluidToken) external returns (bytes memory)"
                         }
                       },
@@ -6242,7 +6248,7 @@
               ],
               "src": "6522:21:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "6392:493:35",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -6333,10 +6339,10 @@
                           "name": "ISuperfluid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 19246,
+                          "referencedDeclaration": 19024,
                           "src": "7105:11:35",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19246_$",
+                            "typeIdentifier": "t_type$_t_contract$_ISuperfluid_$19024_$",
                             "typeString": "type(contract ISuperfluid)"
                           }
                         },
@@ -6351,7 +6357,7 @@
                         "src": "7105:23:35",
                         "tryCall": false,
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_ISuperfluid_$19246",
+                          "typeIdentifier": "t_contract$_ISuperfluid_$19024",
                           "typeString": "contract ISuperfluid"
                         }
                       },
@@ -6362,7 +6368,7 @@
                       "lValueRequested": false,
                       "memberName": "appCallbackPop",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 19098,
+                      "referencedDeclaration": 18876,
                       "src": "7105:38:35",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_int256_$returns$_t_bytes_memory_ptr_$",
@@ -6493,7 +6499,7 @@
               ],
               "src": "7020:21:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "6891:287:35",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -6694,7 +6700,7 @@
               ],
               "src": "7412:8:35"
             },
-            "scope": 5927,
+            "scope": 5944,
             "src": "7357:89:35",
             "stateMutability": "pure",
             "virtual": false,
@@ -6704,14 +6710,14 @@
             "body": {
               "id": 5925,
               "nodeType": "Block",
-              "src": "7516:25:35",
+              "src": "7518:25:35",
               "statements": [
                 {
                   "expression": {
                     "condition": {
                       "commonType": {
-                        "typeIdentifier": "t_int256",
-                        "typeString": "int256"
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       },
                       "id": 5920,
                       "isConstant": false,
@@ -6724,10 +6730,10 @@
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 5911,
-                        "src": "7525:1:35",
+                        "src": "7527:1:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_int256",
-                          "typeString": "int256"
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
                         }
                       },
                       "nodeType": "BinaryOperation",
@@ -6738,13 +6744,13 @@
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 5913,
-                        "src": "7529:1:35",
+                        "src": "7531:1:35",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_int256",
-                          "typeString": "int256"
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
                         }
                       },
-                      "src": "7525:5:35",
+                      "src": "7527:5:35",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -6752,30 +6758,231 @@
                     },
                     "falseExpression": {
                       "id": 5922,
+                      "name": "b",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 5913,
+                      "src": "7539:1:35",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "id": 5923,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "Conditional",
+                    "src": "7527:13:35",
+                    "trueExpression": {
+                      "id": 5921,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 5911,
-                      "src": "7537:1:35",
+                      "src": "7535:1:35",
                       "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "functionReturnParameters": 5917,
+                  "id": 5924,
+                  "nodeType": "Return",
+                  "src": "7520:20:35"
+                }
+              ]
+            },
+            "id": 5926,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "max",
+            "nameLocation": "7460:3:35",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 5914,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 5911,
+                  "mutability": "mutable",
+                  "name": "a",
+                  "nameLocation": "7472:1:35",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 5926,
+                  "src": "7464:9:35",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  },
+                  "typeName": {
+                    "id": 5910,
+                    "name": "uint256",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7464:7:35",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 5913,
+                  "mutability": "mutable",
+                  "name": "b",
+                  "nameLocation": "7483:1:35",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 5926,
+                  "src": "7475:9:35",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  },
+                  "typeName": {
+                    "id": 5912,
+                    "name": "uint256",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7475:7:35",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7463:22:35"
+            },
+            "returnParameters": {
+              "id": 5917,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 5916,
+                  "mutability": "mutable",
+                  "name": "",
+                  "nameLocation": "-1:-1:-1",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 5926,
+                  "src": "7509:7:35",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  },
+                  "typeName": {
+                    "id": 5915,
+                    "name": "uint256",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7509:7:35",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7508:9:35"
+            },
+            "scope": 5944,
+            "src": "7451:92:35",
+            "stateMutability": "pure",
+            "virtual": false,
+            "visibility": "internal"
+          },
+          {
+            "body": {
+              "id": 5942,
+              "nodeType": "Block",
+              "src": "7613:25:35",
+              "statements": [
+                {
+                  "expression": {
+                    "condition": {
+                      "commonType": {
                         "typeIdentifier": "t_int256",
                         "typeString": "int256"
+                      },
+                      "id": 5937,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "id": 5935,
+                        "name": "a",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 5928,
+                        "src": "7622:1:35",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_int256",
+                          "typeString": "int256"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": ">",
+                      "rightExpression": {
+                        "id": 5936,
+                        "name": "b",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 5930,
+                        "src": "7626:1:35",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_int256",
+                          "typeString": "int256"
+                        }
+                      },
+                      "src": "7622:5:35",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
                       }
                     },
-                    "id": 5923,
+                    "falseExpression": {
+                      "id": 5939,
+                      "name": "a",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 5928,
+                      "src": "7634:1:35",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_int256",
+                        "typeString": "int256"
+                      }
+                    },
+                    "id": 5940,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "Conditional",
-                    "src": "7525:13:35",
+                    "src": "7622:13:35",
                     "trueExpression": {
-                      "id": 5921,
+                      "id": 5938,
                       "name": "b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5913,
-                      "src": "7533:1:35",
+                      "referencedDeclaration": 5930,
+                      "src": "7630:1:35",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int256",
                         "typeString": "int256"
@@ -6786,33 +6993,33 @@
                       "typeString": "int256"
                     }
                   },
-                  "functionReturnParameters": 5917,
-                  "id": 5924,
+                  "functionReturnParameters": 5934,
+                  "id": 5941,
                   "nodeType": "Return",
-                  "src": "7518:20:35"
+                  "src": "7615:20:35"
                 }
               ]
             },
-            "id": 5926,
+            "id": 5943,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "min",
-            "nameLocation": "7461:3:35",
+            "nameLocation": "7558:3:35",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5914,
+              "id": 5931,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5911,
+                  "id": 5928,
                   "mutability": "mutable",
                   "name": "a",
-                  "nameLocation": "7472:1:35",
+                  "nameLocation": "7569:1:35",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5926,
-                  "src": "7465:8:35",
+                  "scope": 5943,
+                  "src": "7562:8:35",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6820,10 +7027,10 @@
                     "typeString": "int256"
                   },
                   "typeName": {
-                    "id": 5910,
+                    "id": 5927,
                     "name": "int256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7465:6:35",
+                    "src": "7562:6:35",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int256",
                       "typeString": "int256"
@@ -6833,13 +7040,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 5913,
+                  "id": 5930,
                   "mutability": "mutable",
                   "name": "b",
-                  "nameLocation": "7482:1:35",
+                  "nameLocation": "7579:1:35",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5926,
-                  "src": "7475:8:35",
+                  "scope": 5943,
+                  "src": "7572:8:35",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6847,10 +7054,10 @@
                     "typeString": "int256"
                   },
                   "typeName": {
-                    "id": 5912,
+                    "id": 5929,
                     "name": "int256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7475:6:35",
+                    "src": "7572:6:35",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int256",
                       "typeString": "int256"
@@ -6859,21 +7066,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7464:20:35"
+              "src": "7561:20:35"
             },
             "returnParameters": {
-              "id": 5917,
+              "id": 5934,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5916,
+                  "id": 5933,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5926,
-                  "src": "7508:6:35",
+                  "scope": 5943,
+                  "src": "7605:6:35",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6881,10 +7088,10 @@
                     "typeString": "int256"
                   },
                   "typeName": {
-                    "id": 5915,
+                    "id": 5932,
                     "name": "int256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7508:6:35",
+                    "src": "7605:6:35",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int256",
                       "typeString": "int256"
@@ -6893,21 +7100,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7507:8:35"
+              "src": "7604:8:35"
             },
-            "scope": 5927,
-            "src": "7452:89:35",
+            "scope": 5944,
+            "src": "7549:89:35",
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           }
         ],
-        "scope": 5928,
-        "src": "520:7023:35",
+        "scope": 5945,
+        "src": "520:7120:35",
         "usedErrors": []
       }
     ],
-    "src": "35:7509:35"
+    "src": "35:7606:35"
   },
   "compiler": {
     "name": "solc",
@@ -6915,7 +7122,7 @@
   },
   "networks": {},
   "schemaVersion": "3.4.7",
-  "updatedAt": "2022-04-29T13:00:13.058Z",
+  "updatedAt": "2022-05-05T13:57:31.159Z",
   "devdoc": {
     "author": "Superfluid",
     "details": "Helper library for building super agreement",