@superfluid-finance/ethereum-contracts 1.3.2-dev.bf84335.0 → 1.3.2-dev.e55bf9f.0

package/build/contracts/SlotsBitmapLibrary.json

@@ -522,7 +522,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint256",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint256",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -1805,7 +1805,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint256t_bytes32",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint256t_bytes32",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -2392,7 +2392,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint32",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint32",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -5470,7 +5470,7 @@
           }
         ]
       },
-      "contents": "{\n    { }\n    function validator_revert_contract_ISuperfluidToken(value)\n    {\n        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint256(headStart, dataEnd) -> value0, value1, value2, value3\n    {\n        if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        value3 := calldataload(add(headStart, 96))\n    }\n    function abi_encode_tuple_t_array$_t_uint32_$dyn_memory_ptr_t_array$_t_bytes32_$dyn_memory_ptr__to_t_array$_t_uint32_$dyn_memory_ptr_t_array$_t_bytes32_$dyn_memory_ptr__fromStack_library_reversed(headStart, value1, value0) -> tail\n    {\n        let tail_1 := add(headStart, 64)\n        mstore(headStart, 64)\n        let pos := tail_1\n        let length := mload(value0)\n        mstore(tail_1, length)\n        pos := add(headStart, 96)\n        let _1 := 0x20\n        let srcPtr := add(value0, _1)\n        let i := 0\n        for { } lt(i, length) { i := add(i, 1) }\n        {\n            mstore(pos, and(mload(srcPtr), 0xffffffff))\n            pos := add(pos, _1)\n            srcPtr := add(srcPtr, _1)\n        }\n        mstore(add(headStart, _1), sub(pos, headStart))\n        let pos_1 := pos\n        let length_1 := mload(value1)\n        mstore(pos, length_1)\n        pos_1 := add(pos, _1)\n        let srcPtr_1 := add(value1, _1)\n        let i_1 := 0\n        for { } lt(i_1, length_1) { i_1 := add(i_1, 1) }\n        {\n            mstore(pos_1, mload(srcPtr_1))\n            pos_1 := add(pos_1, _1)\n            srcPtr_1 := add(srcPtr_1, _1)\n        }\n        tail := pos_1\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint256t_bytes32(headStart, dataEnd) -> value0, value1, value2, value3, value4\n    {\n        if slt(sub(dataEnd, headStart), 160) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        value3 := calldataload(add(headStart, 96))\n        value4 := calldataload(add(headStart, 128))\n    }\n    function abi_encode_tuple_t_uint32__to_t_uint32__fromStack_library_reversed(headStart, value0) -> tail\n    {\n        tail := add(headStart, 32)\n        mstore(headStart, and(value0, 0xffffffff))\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20442t_addresst_uint256t_uint32(headStart, dataEnd) -> value0, value1, value2, value3\n    {\n        if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        let value_2 := calldataload(add(headStart, 96))\n        if iszero(eq(value_2, and(value_2, 0xffffffff))) { revert(0, 0) }\n        value3 := value_2\n    }\n    function abi_encode_tuple_t_address_t_address_t_uint256_t_rational_1_by_1__to_t_address_t_address_t_uint256_t_uint256__fromStack_reversed(headStart, value3, value2, value1, value0) -> tail\n    {\n        tail := add(headStart, 128)\n        let _1 := sub(shl(160, 1), 1)\n        mstore(headStart, and(value0, _1))\n        mstore(add(headStart, 32), and(value1, _1))\n        mstore(add(headStart, 64), value2)\n        mstore(add(headStart, 96), value3)\n    }\n    function panic_error_0x41()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x41)\n        revert(0, 0x24)\n    }\n    function abi_decode_tuple_t_array$_t_bytes32_$dyn_memory_ptr_fromMemory(headStart, dataEnd) -> value0\n    {\n        let _1 := 32\n        if slt(sub(dataEnd, headStart), _1) { revert(0, 0) }\n        let offset := mload(headStart)\n        let _2 := 0xffffffffffffffff\n        if gt(offset, _2) { revert(0, 0) }\n        let _3 := add(headStart, offset)\n        if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }\n        let _4 := mload(_3)\n        if gt(_4, _2) { panic_error_0x41() }\n        let _5 := shl(5, _4)\n        let memPtr := mload(64)\n        let newFreePtr := add(memPtr, and(add(_5, 63), not(31)))\n        if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { panic_error_0x41() }\n        mstore(64, newFreePtr)\n        let dst := memPtr\n        mstore(memPtr, _4)\n        dst := add(memPtr, _1)\n        let srcEnd := add(add(_3, _5), _1)\n        if gt(srcEnd, dataEnd) { revert(0, 0) }\n        let src := add(_3, _1)\n        for { } lt(src, srcEnd) { src := add(src, _1) }\n        {\n            mstore(dst, mload(src))\n            dst := add(dst, _1)\n        }\n        value0 := memPtr\n    }\n    function panic_error_0x32()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x32)\n        revert(0, 0x24)\n    }\n    function panic_error_0x11()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x11)\n        revert(0, 0x24)\n    }\n    function checked_add_t_uint256(x, y) -> sum\n    {\n        if gt(x, not(y)) { panic_error_0x11() }\n        sum := add(x, y)\n    }\n    function increment_t_uint256(value) -> ret\n    {\n        if eq(value, not(0)) { panic_error_0x11() }\n        ret := add(value, 1)\n    }\n    function increment_t_uint32(value) -> ret\n    {\n        let _1 := 0xffffffff\n        let value_1 := and(value, _1)\n        if eq(value_1, _1) { panic_error_0x11() }\n        ret := add(value_1, 1)\n    }\n    function abi_encode_tuple_t_address_t_uint256_t_array$_t_bytes32_$dyn_memory_ptr__to_t_address_t_uint256_t_array$_t_bytes32_$dyn_memory_ptr__fromStack_reversed(headStart, value2, value1, value0) -> tail\n    {\n        let tail_1 := add(headStart, 96)\n        mstore(headStart, and(value0, sub(shl(160, 1), 1)))\n        let _1 := 32\n        mstore(add(headStart, _1), value1)\n        mstore(add(headStart, 64), 96)\n        let pos := tail_1\n        let length := mload(value2)\n        mstore(tail_1, length)\n        pos := add(headStart, 128)\n        let srcPtr := add(value2, _1)\n        let i := 0\n        for { } lt(i, length) { i := add(i, 1) }\n        {\n            mstore(pos, mload(srcPtr))\n            pos := add(pos, _1)\n            srcPtr := add(srcPtr, _1)\n        }\n        tail := pos\n    }\n    function abi_encode_tuple_t_stringliteral_9013b7fc8a2a5c2626f26d5c6b76898545e64f50dc1690d5262cde9a8f30c996__to_t_string_memory_ptr__fromStack_reversed(headStart) -> tail\n    {\n        mstore(headStart, 32)\n        mstore(add(headStart, 32), 23)\n        mstore(add(headStart, 64), \"SlotBitmap out of bound\")\n        tail := add(headStart, 96)\n    }\n    function panic_error_0x01()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x01)\n        revert(0, 0x24)\n    }\n}",
+      "contents": "{\n    { }\n    function validator_revert_contract_ISuperfluidToken(value)\n    {\n        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint256(headStart, dataEnd) -> value0, value1, value2, value3\n    {\n        if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        value3 := calldataload(add(headStart, 96))\n    }\n    function abi_encode_tuple_t_array$_t_uint32_$dyn_memory_ptr_t_array$_t_bytes32_$dyn_memory_ptr__to_t_array$_t_uint32_$dyn_memory_ptr_t_array$_t_bytes32_$dyn_memory_ptr__fromStack_library_reversed(headStart, value1, value0) -> tail\n    {\n        let tail_1 := add(headStart, 64)\n        mstore(headStart, 64)\n        let pos := tail_1\n        let length := mload(value0)\n        mstore(tail_1, length)\n        pos := add(headStart, 96)\n        let _1 := 0x20\n        let srcPtr := add(value0, _1)\n        let i := 0\n        for { } lt(i, length) { i := add(i, 1) }\n        {\n            mstore(pos, and(mload(srcPtr), 0xffffffff))\n            pos := add(pos, _1)\n            srcPtr := add(srcPtr, _1)\n        }\n        mstore(add(headStart, _1), sub(pos, headStart))\n        let pos_1 := pos\n        let length_1 := mload(value1)\n        mstore(pos, length_1)\n        pos_1 := add(pos, _1)\n        let srcPtr_1 := add(value1, _1)\n        let i_1 := 0\n        for { } lt(i_1, length_1) { i_1 := add(i_1, 1) }\n        {\n            mstore(pos_1, mload(srcPtr_1))\n            pos_1 := add(pos_1, _1)\n            srcPtr_1 := add(srcPtr_1, _1)\n        }\n        tail := pos_1\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint256t_bytes32(headStart, dataEnd) -> value0, value1, value2, value3, value4\n    {\n        if slt(sub(dataEnd, headStart), 160) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        value3 := calldataload(add(headStart, 96))\n        value4 := calldataload(add(headStart, 128))\n    }\n    function abi_encode_tuple_t_uint32__to_t_uint32__fromStack_library_reversed(headStart, value0) -> tail\n    {\n        tail := add(headStart, 32)\n        mstore(headStart, and(value0, 0xffffffff))\n    }\n    function abi_decode_tuple_t_contract$_ISuperfluidToken_$20450t_addresst_uint256t_uint32(headStart, dataEnd) -> value0, value1, value2, value3\n    {\n        if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }\n        let value := calldataload(headStart)\n        validator_revert_contract_ISuperfluidToken(value)\n        value0 := value\n        let value_1 := calldataload(add(headStart, 32))\n        validator_revert_contract_ISuperfluidToken(value_1)\n        value1 := value_1\n        value2 := calldataload(add(headStart, 64))\n        let value_2 := calldataload(add(headStart, 96))\n        if iszero(eq(value_2, and(value_2, 0xffffffff))) { revert(0, 0) }\n        value3 := value_2\n    }\n    function abi_encode_tuple_t_address_t_address_t_uint256_t_rational_1_by_1__to_t_address_t_address_t_uint256_t_uint256__fromStack_reversed(headStart, value3, value2, value1, value0) -> tail\n    {\n        tail := add(headStart, 128)\n        let _1 := sub(shl(160, 1), 1)\n        mstore(headStart, and(value0, _1))\n        mstore(add(headStart, 32), and(value1, _1))\n        mstore(add(headStart, 64), value2)\n        mstore(add(headStart, 96), value3)\n    }\n    function panic_error_0x41()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x41)\n        revert(0, 0x24)\n    }\n    function abi_decode_tuple_t_array$_t_bytes32_$dyn_memory_ptr_fromMemory(headStart, dataEnd) -> value0\n    {\n        let _1 := 32\n        if slt(sub(dataEnd, headStart), _1) { revert(0, 0) }\n        let offset := mload(headStart)\n        let _2 := 0xffffffffffffffff\n        if gt(offset, _2) { revert(0, 0) }\n        let _3 := add(headStart, offset)\n        if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }\n        let _4 := mload(_3)\n        if gt(_4, _2) { panic_error_0x41() }\n        let _5 := shl(5, _4)\n        let memPtr := mload(64)\n        let newFreePtr := add(memPtr, and(add(_5, 63), not(31)))\n        if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { panic_error_0x41() }\n        mstore(64, newFreePtr)\n        let dst := memPtr\n        mstore(memPtr, _4)\n        dst := add(memPtr, _1)\n        let srcEnd := add(add(_3, _5), _1)\n        if gt(srcEnd, dataEnd) { revert(0, 0) }\n        let src := add(_3, _1)\n        for { } lt(src, srcEnd) { src := add(src, _1) }\n        {\n            mstore(dst, mload(src))\n            dst := add(dst, _1)\n        }\n        value0 := memPtr\n    }\n    function panic_error_0x32()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x32)\n        revert(0, 0x24)\n    }\n    function panic_error_0x11()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x11)\n        revert(0, 0x24)\n    }\n    function checked_add_t_uint256(x, y) -> sum\n    {\n        if gt(x, not(y)) { panic_error_0x11() }\n        sum := add(x, y)\n    }\n    function increment_t_uint256(value) -> ret\n    {\n        if eq(value, not(0)) { panic_error_0x11() }\n        ret := add(value, 1)\n    }\n    function increment_t_uint32(value) -> ret\n    {\n        let _1 := 0xffffffff\n        let value_1 := and(value, _1)\n        if eq(value_1, _1) { panic_error_0x11() }\n        ret := add(value_1, 1)\n    }\n    function abi_encode_tuple_t_address_t_uint256_t_array$_t_bytes32_$dyn_memory_ptr__to_t_address_t_uint256_t_array$_t_bytes32_$dyn_memory_ptr__fromStack_reversed(headStart, value2, value1, value0) -> tail\n    {\n        let tail_1 := add(headStart, 96)\n        mstore(headStart, and(value0, sub(shl(160, 1), 1)))\n        let _1 := 32\n        mstore(add(headStart, _1), value1)\n        mstore(add(headStart, 64), 96)\n        let pos := tail_1\n        let length := mload(value2)\n        mstore(tail_1, length)\n        pos := add(headStart, 128)\n        let srcPtr := add(value2, _1)\n        let i := 0\n        for { } lt(i, length) { i := add(i, 1) }\n        {\n            mstore(pos, mload(srcPtr))\n            pos := add(pos, _1)\n            srcPtr := add(srcPtr, _1)\n        }\n        tail := pos\n    }\n    function abi_encode_tuple_t_stringliteral_9013b7fc8a2a5c2626f26d5c6b76898545e64f50dc1690d5262cde9a8f30c996__to_t_string_memory_ptr__fromStack_reversed(headStart) -> tail\n    {\n        mstore(headStart, 32)\n        mstore(add(headStart, 32), 23)\n        mstore(add(headStart, 64), \"SlotBitmap out of bound\")\n        tail := add(headStart, 96)\n    }\n    function panic_error_0x01()\n    {\n        mstore(0, shl(224, 0x4e487b71))\n        mstore(4, 0x01)\n        revert(0, 0x24)\n    }\n}",
       "id": 107,
       "language": "Yul",
       "name": "#utility.yul"
@@ -5484,18 +5484,18 @@
     "absolutePath": "project:/contracts/libs/SlotsBitmapLibrary.sol",
     "exportedSymbols": {
       "ISuperfluidToken": [
-        20442
+        20450
       ],
       "SlotsBitmapLibrary": [
-        21550
+        21558
       ]
     },
-    "id": 21551,
+    "id": 21559,
     "license": "AGPLv3",
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 21231,
+        "id": 21239,
         "literals": [
           "solidity",
           "0.8",
@@ -5507,20 +5507,20 @@
       {
         "absolutePath": "project:/contracts/interfaces/superfluid/ISuperfluidToken.sol",
         "file": "../interfaces/superfluid/ISuperfluidToken.sol",
-        "id": 21233,
+        "id": 21241,
         "nameLocation": "-1:-1:-1",
         "nodeType": "ImportDirective",
-        "scope": 21551,
-        "sourceUnit": 20443,
+        "scope": 21559,
+        "sourceUnit": 20451,
         "src": "60:79:65",
         "symbolAliases": [
           {
             "foreign": {
-              "id": 21232,
+              "id": 21240,
               "name": "ISuperfluidToken",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 20442,
+              "referencedDeclaration": 20450,
               "src": "68:16:65",
               "typeDescriptions": {}
             },
@@ -5536,15 +5536,15 @@
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 21234,
+          "id": 21242,
           "nodeType": "StructuredDocumentation",
           "src": "141:568:65",
           "text": " @title Slots Bitmap library\n @author Superfluid\n @dev A library implements slots bitmap on Superfluid Token storage\n NOTE:\n - A slots bitmap allows you to iterate through a list of data efficiently.\n - A data slot can be enabled or disabled with the help of bitmap.\n - MAX_NUM_SLOTS is 256 in this implementation (using one uint256)\n - Superfluid token storage usage:\n   - getAgreementStateSlot(bitmapStateSlotId) stores the bitmap of enabled data slots\n   - getAgreementStateSlot(dataStateSlotIDStart + stotId) stores the data of the slot"
         },
         "fullyImplemented": true,
-        "id": 21550,
+        "id": 21558,
         "linearizedBaseContracts": [
-          21550
+          21558
         ],
         "name": "SlotsBitmapLibrary",
         "nameLocation": "718:18:65",
@@ -5552,12 +5552,12 @@
         "nodes": [
           {
             "constant": true,
-            "id": 21237,
+            "id": 21245,
             "mutability": "constant",
             "name": "_MAX_NUM_SLOTS",
             "nameLocation": "769:14:65",
             "nodeType": "VariableDeclaration",
-            "scope": 21550,
+            "scope": 21558,
             "src": "744:45:65",
             "stateVariable": true,
             "storageLocation": "default",
@@ -5566,7 +5566,7 @@
               "typeString": "uint32"
             },
             "typeName": {
-              "id": 21235,
+              "id": 21243,
               "name": "uint32",
               "nodeType": "ElementaryTypeName",
               "src": "744:6:65",
@@ -5577,7 +5577,7 @@
             },
             "value": {
               "hexValue": "323536",
-              "id": 21236,
+              "id": 21244,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -5595,23 +5595,23 @@
           },
           {
             "body": {
-              "id": 21356,
+              "id": 21364,
               "nodeType": "Block",
               "src": "1035:985:65",
               "statements": [
                 {
                   "assignments": [
-                    21254
+                    21262
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 21254,
+                      "id": 21262,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "1053:10:65",
                       "nodeType": "VariableDeclaration",
-                      "scope": 21356,
+                      "scope": 21364,
                       "src": "1045:18:65",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -5620,7 +5620,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 21253,
+                        "id": 21261,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "1045:7:65",
@@ -5632,7 +5632,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 21270,
+                  "id": 21278,
                   "initialValue": {
                     "arguments": [
                       {
@@ -5641,14 +5641,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 21261,
+                                  "id": 21269,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "1123:4:65",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -5656,11 +5656,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 21260,
+                                "id": 21268,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -5672,14 +5672,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 21259,
+                                  "id": 21267,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "1115:7:65",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 21262,
+                              "id": 21270,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5695,11 +5695,11 @@
                               }
                             },
                             {
-                              "id": 21263,
+                              "id": 21271,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21242,
+                              "referencedDeclaration": 21250,
                               "src": "1142:7:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -5707,11 +5707,11 @@
                               }
                             },
                             {
-                              "id": 21264,
+                              "id": 21272,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21244,
+                              "referencedDeclaration": 21252,
                               "src": "1163:17:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -5720,7 +5720,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 21265,
+                              "id": 21273,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -5755,32 +5755,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 21257,
+                              "id": 21265,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21240,
+                              "referencedDeclaration": 21248,
                               "src": "1074:5:65",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 21258,
+                            "id": 21266,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 20359,
+                            "referencedDeclaration": 20367,
                             "src": "1074:27:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_ptr_$",
                               "typeString": "function (address,address,uint256,uint256) view external returns (bytes32[] memory)"
                             }
                           },
-                          "id": 21266,
+                          "id": 21274,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5795,10 +5795,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 21268,
+                        "id": 21276,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 21267,
+                          "id": 21275,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5831,7 +5831,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 21256,
+                      "id": 21264,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5843,14 +5843,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 21255,
+                        "id": 21263,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "1066:7:65",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 21269,
+                    "id": 21277,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5870,7 +5870,7 @@
                 },
                 {
                   "body": {
-                    "id": 21347,
+                    "id": 21355,
                     "nodeType": "Block",
                     "src": "1250:695:65",
                     "statements": [
@@ -5880,7 +5880,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 21291,
+                          "id": 21299,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5892,7 +5892,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 21288,
+                                "id": 21296,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -5904,17 +5904,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 21285,
+                                      "id": 21293,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 21283,
+                                        "id": 21291,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21254,
+                                        "referencedDeclaration": 21262,
                                         "src": "1277:10:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -5924,11 +5924,11 @@
                                       "nodeType": "BinaryOperation",
                                       "operator": ">>",
                                       "rightExpression": {
-                                        "id": 21284,
+                                        "id": 21292,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21251,
+                                        "referencedDeclaration": 21259,
                                         "src": "1291:6:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -5949,7 +5949,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 21282,
+                                    "id": 21290,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -5961,14 +5961,14 @@
                                       "typeString": "type(uint256)"
                                     },
                                     "typeName": {
-                                      "id": 21281,
+                                      "id": 21289,
                                       "name": "uint256",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1269:7:65",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 21286,
+                                  "id": 21294,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5987,7 +5987,7 @@
                                 "operator": "&",
                                 "rightExpression": {
                                   "hexValue": "31",
-                                  "id": 21287,
+                                  "id": 21295,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -6008,7 +6008,7 @@
                                 }
                               }
                             ],
-                            "id": 21289,
+                            "id": 21297,
                             "isConstant": false,
                             "isInlineArray": false,
                             "isLValue": false,
@@ -6025,7 +6025,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "hexValue": "30",
-                            "id": 21290,
+                            "id": 21298,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -6045,27 +6045,27 @@
                             "typeString": "bool"
                           }
                         },
-                        "id": 21346,
+                        "id": 21354,
                         "nodeType": "IfStatement",
                         "src": "1264:671:65",
                         "trueBody": {
-                          "id": 21345,
+                          "id": 21353,
                           "nodeType": "Block",
                           "src": "1310:625:65",
                           "statements": [
                             {
                               "assignments": [
-                                21296
+                                21304
                               ],
                               "declarations": [
                                 {
                                   "constant": false,
-                                  "id": 21296,
+                                  "id": 21304,
                                   "mutability": "mutable",
                                   "name": "slotData",
                                   "nameLocation": "1381:8:65",
                                   "nodeType": "VariableDeclaration",
-                                  "scope": 21345,
+                                  "scope": 21353,
                                   "src": "1364:25:65",
                                   "stateVariable": false,
                                   "storageLocation": "memory",
@@ -6075,7 +6075,7 @@
                                   },
                                   "typeName": {
                                     "baseType": {
-                                      "id": 21294,
+                                      "id": 21302,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1364:7:65",
@@ -6084,7 +6084,7 @@
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "id": 21295,
+                                    "id": 21303,
                                     "nodeType": "ArrayTypeName",
                                     "src": "1364:9:65",
                                     "typeDescriptions": {
@@ -6095,12 +6095,12 @@
                                   "visibility": "internal"
                                 }
                               ],
-                              "id": 21302,
+                              "id": 21310,
                               "initialValue": {
                                 "arguments": [
                                   {
                                     "hexValue": "31",
-                                    "id": 21300,
+                                    "id": 21308,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6122,7 +6122,7 @@
                                       "typeString": "int_const 1"
                                     }
                                   ],
-                                  "id": 21299,
+                                  "id": 21307,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -6135,7 +6135,7 @@
                                   },
                                   "typeName": {
                                     "baseType": {
-                                      "id": 21297,
+                                      "id": 21305,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1396:7:65",
@@ -6144,7 +6144,7 @@
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "id": 21298,
+                                    "id": 21306,
                                     "nodeType": "ArrayTypeName",
                                     "src": "1396:9:65",
                                     "typeDescriptions": {
@@ -6153,7 +6153,7 @@
                                     }
                                   }
                                 },
-                                "id": 21301,
+                                "id": 21309,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -6173,28 +6173,28 @@
                             },
                             {
                               "expression": {
-                                "id": 21307,
+                                "id": 21315,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "baseExpression": {
-                                    "id": 21303,
+                                    "id": 21311,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21296,
+                                    "referencedDeclaration": 21304,
                                     "src": "1426:8:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                       "typeString": "bytes32[] memory"
                                     }
                                   },
-                                  "id": 21305,
+                                  "id": 21313,
                                   "indexExpression": {
                                     "hexValue": "30",
-                                    "id": 21304,
+                                    "id": 21312,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6222,11 +6222,11 @@
                                 "nodeType": "Assignment",
                                 "operator": "=",
                                 "rightHandSide": {
-                                  "id": 21306,
+                                  "id": 21314,
                                   "name": "data",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 21248,
+                                  "referencedDeclaration": 21256,
                                   "src": "1440:4:65",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes32",
@@ -6239,7 +6239,7 @@
                                   "typeString": "bytes32"
                                 }
                               },
-                              "id": 21308,
+                              "id": 21316,
                               "nodeType": "ExpressionStatement",
                               "src": "1426:18:65"
                             },
@@ -6247,11 +6247,11 @@
                               "expression": {
                                 "arguments": [
                                   {
-                                    "id": 21312,
+                                    "id": 21320,
                                     "name": "account",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21242,
+                                    "referencedDeclaration": 21250,
                                     "src": "1514:7:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
@@ -6263,17 +6263,17 @@
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     },
-                                    "id": 21315,
+                                    "id": 21323,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "leftExpression": {
-                                      "id": 21313,
+                                      "id": 21321,
                                       "name": "dataStateSlotIDStart",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 21246,
+                                      "referencedDeclaration": 21254,
                                       "src": "1543:20:65",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
@@ -6283,11 +6283,11 @@
                                     "nodeType": "BinaryOperation",
                                     "operator": "+",
                                     "rightExpression": {
-                                      "id": 21314,
+                                      "id": 21322,
                                       "name": "slotId",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 21251,
+                                      "referencedDeclaration": 21259,
                                       "src": "1566:6:65",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint32",
@@ -6301,11 +6301,11 @@
                                     }
                                   },
                                   {
-                                    "id": 21316,
+                                    "id": 21324,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21296,
+                                    "referencedDeclaration": 21304,
                                     "src": "1594:8:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -6329,32 +6329,32 @@
                                     }
                                   ],
                                   "expression": {
-                                    "id": 21309,
+                                    "id": 21317,
                                     "name": "token",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21240,
+                                    "referencedDeclaration": 21248,
                                     "src": "1462:5:65",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
-                                  "id": 21311,
+                                  "id": 21319,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "updateAgreementStateSlot",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 20335,
+                                  "referencedDeclaration": 20343,
                                   "src": "1462:30:65",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_array$_t_bytes32_$dyn_memory_ptr_$returns$__$",
                                     "typeString": "function (address,uint256,bytes32[] memory) external"
                                   }
                                 },
-                                "id": 21317,
+                                "id": 21325,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6369,34 +6369,34 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 21318,
+                              "id": 21326,
                               "nodeType": "ExpressionStatement",
                               "src": "1462:141:65"
                             },
                             {
                               "expression": {
-                                "id": 21334,
+                                "id": 21342,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "baseExpression": {
-                                    "id": 21319,
+                                    "id": 21327,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21296,
+                                    "referencedDeclaration": 21304,
                                     "src": "1656:8:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                       "typeString": "bytes32[] memory"
                                     }
                                   },
-                                  "id": 21321,
+                                  "id": 21329,
                                   "indexExpression": {
                                     "hexValue": "30",
-                                    "id": 21320,
+                                    "id": 21328,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6430,17 +6430,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 21332,
+                                      "id": 21340,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 21324,
+                                        "id": 21332,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21254,
+                                        "referencedDeclaration": 21262,
                                         "src": "1678:10:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -6456,14 +6456,14 @@
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             },
-                                            "id": 21330,
+                                            "id": 21338,
                                             "isConstant": false,
                                             "isLValue": false,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "leftExpression": {
                                               "hexValue": "31",
-                                              "id": 21325,
+                                              "id": 21333,
                                               "isConstant": false,
                                               "isLValue": false,
                                               "isPure": true,
@@ -6482,11 +6482,11 @@
                                             "rightExpression": {
                                               "arguments": [
                                                 {
-                                                  "id": 21328,
+                                                  "id": 21336,
                                                   "name": "slotId",
                                                   "nodeType": "Identifier",
                                                   "overloadedDeclarations": [],
-                                                  "referencedDeclaration": 21251,
+                                                  "referencedDeclaration": 21259,
                                                   "src": "1705:6:65",
                                                   "typeDescriptions": {
                                                     "typeIdentifier": "t_uint32",
@@ -6501,7 +6501,7 @@
                                                     "typeString": "uint32"
                                                   }
                                                 ],
-                                                "id": 21327,
+                                                "id": 21335,
                                                 "isConstant": false,
                                                 "isLValue": false,
                                                 "isPure": true,
@@ -6513,14 +6513,14 @@
                                                   "typeString": "type(uint256)"
                                                 },
                                                 "typeName": {
-                                                  "id": 21326,
+                                                  "id": 21334,
                                                   "name": "uint256",
                                                   "nodeType": "ElementaryTypeName",
                                                   "src": "1697:7:65",
                                                   "typeDescriptions": {}
                                                 }
                                               },
-                                              "id": 21329,
+                                              "id": 21337,
                                               "isConstant": false,
                                               "isLValue": false,
                                               "isPure": false,
@@ -6542,7 +6542,7 @@
                                             }
                                           }
                                         ],
-                                        "id": 21331,
+                                        "id": 21339,
                                         "isConstant": false,
                                         "isInlineArray": false,
                                         "isLValue": false,
@@ -6569,7 +6569,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 21323,
+                                    "id": 21331,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6581,14 +6581,14 @@
                                       "typeString": "type(bytes32)"
                                     },
                                     "typeName": {
-                                      "id": 21322,
+                                      "id": 21330,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1670:7:65",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 21333,
+                                  "id": 21341,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -6609,7 +6609,7 @@
                                   "typeString": "bytes32"
                                 }
                               },
-                              "id": 21335,
+                              "id": 21343,
                               "nodeType": "ExpressionStatement",
                               "src": "1656:58:65"
                             },
@@ -6617,11 +6617,11 @@
                               "expression": {
                                 "arguments": [
                                   {
-                                    "id": 21339,
+                                    "id": 21347,
                                     "name": "account",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21242,
+                                    "referencedDeclaration": 21250,
                                     "src": "1784:7:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
@@ -6629,11 +6629,11 @@
                                     }
                                   },
                                   {
-                                    "id": 21340,
+                                    "id": 21348,
                                     "name": "bitmapStateSlotId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21244,
+                                    "referencedDeclaration": 21252,
                                     "src": "1813:17:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -6641,11 +6641,11 @@
                                     }
                                   },
                                   {
-                                    "id": 21341,
+                                    "id": 21349,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21296,
+                                    "referencedDeclaration": 21304,
                                     "src": "1852:8:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -6669,32 +6669,32 @@
                                     }
                                   ],
                                   "expression": {
-                                    "id": 21336,
+                                    "id": 21344,
                                     "name": "token",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21240,
+                                    "referencedDeclaration": 21248,
                                     "src": "1732:5:65",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
-                                  "id": 21338,
+                                  "id": 21346,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "updateAgreementStateSlot",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 20335,
+                                  "referencedDeclaration": 20343,
                                   "src": "1732:30:65",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_array$_t_bytes32_$dyn_memory_ptr_$returns$__$",
                                     "typeString": "function (address,uint256,bytes32[] memory) external"
                                   }
                                 },
-                                "id": 21342,
+                                "id": 21350,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6709,12 +6709,12 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 21343,
+                              "id": 21351,
                               "nodeType": "ExpressionStatement",
                               "src": "1732:129:65"
                             },
                             {
-                              "id": 21344,
+                              "id": 21352,
                               "nodeType": "Break",
                               "src": "1915:5:65"
                             }
@@ -6728,17 +6728,17 @@
                       "typeIdentifier": "t_uint32",
                       "typeString": "uint32"
                     },
-                    "id": 21277,
+                    "id": 21285,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 21275,
+                      "id": 21283,
                       "name": "slotId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21251,
+                      "referencedDeclaration": 21259,
                       "src": "1215:6:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -6748,11 +6748,11 @@
                     "nodeType": "BinaryOperation",
                     "operator": "<",
                     "rightExpression": {
-                      "id": 21276,
+                      "id": 21284,
                       "name": "_MAX_NUM_SLOTS",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21237,
+                      "referencedDeclaration": 21245,
                       "src": "1224:14:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -6765,20 +6765,20 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 21348,
+                  "id": 21356,
                   "initializationExpression": {
                     "expression": {
-                      "id": 21273,
+                      "id": 21281,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
-                        "id": 21271,
+                        "id": 21279,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21251,
+                        "referencedDeclaration": 21259,
                         "src": "1203:6:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -6789,7 +6789,7 @@
                       "operator": "=",
                       "rightHandSide": {
                         "hexValue": "30",
-                        "id": 21272,
+                        "id": 21280,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -6809,13 +6809,13 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 21274,
+                    "id": 21282,
                     "nodeType": "ExpressionStatement",
                     "src": "1203:10:65"
                   },
                   "loopExpression": {
                     "expression": {
-                      "id": 21279,
+                      "id": 21287,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6825,11 +6825,11 @@
                       "prefix": true,
                       "src": "1240:8:65",
                       "subExpression": {
-                        "id": 21278,
+                        "id": 21286,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21251,
+                        "referencedDeclaration": 21259,
                         "src": "1242:6:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -6841,7 +6841,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 21280,
+                    "id": 21288,
                     "nodeType": "ExpressionStatement",
                     "src": "1240:8:65"
                   },
@@ -6856,17 +6856,17 @@
                           "typeIdentifier": "t_uint32",
                           "typeString": "uint32"
                         },
-                        "id": 21352,
+                        "id": 21360,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
-                          "id": 21350,
+                          "id": 21358,
                           "name": "slotId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 21251,
+                          "referencedDeclaration": 21259,
                           "src": "1962:6:65",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -6876,11 +6876,11 @@
                         "nodeType": "BinaryOperation",
                         "operator": "<",
                         "rightExpression": {
-                          "id": 21351,
+                          "id": 21359,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 21237,
+                          "referencedDeclaration": 21245,
                           "src": "1971:14:65",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -6895,7 +6895,7 @@
                       },
                       {
                         "hexValue": "536c6f744269746d6170206f7574206f6620626f756e64",
-                        "id": 21353,
+                        "id": 21361,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -6921,7 +6921,7 @@
                           "typeString": "literal_string \"SlotBitmap out of bound\""
                         }
                       ],
-                      "id": 21349,
+                      "id": 21357,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
@@ -6935,7 +6935,7 @@
                         "typeString": "function (bool,string memory) pure"
                       }
                     },
-                    "id": 21354,
+                    "id": 21362,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6950,14 +6950,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 21355,
+                  "id": 21363,
                   "nodeType": "ExpressionStatement",
                   "src": "1954:59:65"
                 }
               ]
             },
             "functionSelector": "a3247010",
-            "id": 21357,
+            "id": 21365,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -6965,38 +6965,38 @@
             "nameLocation": "805:20:65",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 21249,
+              "id": 21257,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 21240,
+                  "id": 21248,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "852:5:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "835:22:65",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 21239,
+                    "id": 21247,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 21238,
+                      "id": 21246,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 20442,
+                      "referencedDeclaration": 20450,
                       "src": "835:16:65"
                     },
-                    "referencedDeclaration": 20442,
+                    "referencedDeclaration": 20450,
                     "src": "835:16:65",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -7004,12 +7004,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21242,
+                  "id": 21250,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "875:7:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "867:15:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7018,7 +7018,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 21241,
+                    "id": 21249,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "867:7:65",
@@ -7032,12 +7032,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21244,
+                  "id": 21252,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "900:17:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "892:25:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7046,7 +7046,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 21243,
+                    "id": 21251,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "892:7:65",
@@ -7059,12 +7059,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21246,
+                  "id": 21254,
                   "mutability": "mutable",
                   "name": "dataStateSlotIDStart",
                   "nameLocation": "935:20:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "927:28:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7073,7 +7073,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 21245,
+                    "id": 21253,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "927:7:65",
@@ -7086,12 +7086,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21248,
+                  "id": 21256,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "973:4:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "965:12:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7100,7 +7100,7 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 21247,
+                    "id": 21255,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
                     "src": "965:7:65",
@@ -7115,17 +7115,17 @@
               "src": "825:158:65"
             },
             "returnParameters": {
-              "id": 21252,
+              "id": 21260,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 21251,
+                  "id": 21259,
                   "mutability": "mutable",
                   "name": "slotId",
                   "nameLocation": "1023:6:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21357,
+                  "scope": 21365,
                   "src": "1016:13:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7134,7 +7134,7 @@
                     "typeString": "uint32"
                   },
                   "typeName": {
-                    "id": 21250,
+                    "id": 21258,
                     "name": "uint32",
                     "nodeType": "ElementaryTypeName",
                     "src": "1016:6:65",
@@ -7148,7 +7148,7 @@
               ],
               "src": "1015:15:65"
             },
-            "scope": 21550,
+            "scope": 21558,
             "src": "796:1224:65",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -7156,23 +7156,23 @@
           },
           {
             "body": {
-              "id": 21438,
+              "id": 21446,
               "nodeType": "Block",
               "src": "2185:555:65",
               "statements": [
                 {
                   "assignments": [
-                    21370
+                    21378
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 21370,
+                      "id": 21378,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "2203:10:65",
                       "nodeType": "VariableDeclaration",
-                      "scope": 21438,
+                      "scope": 21446,
                       "src": "2195:18:65",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -7181,7 +7181,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 21369,
+                        "id": 21377,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2195:7:65",
@@ -7193,7 +7193,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 21386,
+                  "id": 21394,
                   "initialValue": {
                     "arguments": [
                       {
@@ -7202,14 +7202,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 21377,
+                                  "id": 21385,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "2273:4:65",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -7217,11 +7217,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 21376,
+                                "id": 21384,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -7233,14 +7233,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 21375,
+                                  "id": 21383,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "2265:7:65",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 21378,
+                              "id": 21386,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -7256,11 +7256,11 @@
                               }
                             },
                             {
-                              "id": 21379,
+                              "id": 21387,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21362,
+                              "referencedDeclaration": 21370,
                               "src": "2292:7:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -7268,11 +7268,11 @@
                               }
                             },
                             {
-                              "id": 21380,
+                              "id": 21388,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21364,
+                              "referencedDeclaration": 21372,
                               "src": "2313:17:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -7281,7 +7281,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 21381,
+                              "id": 21389,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7316,32 +7316,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 21373,
+                              "id": 21381,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21360,
+                              "referencedDeclaration": 21368,
                               "src": "2224:5:65",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 21374,
+                            "id": 21382,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 20359,
+                            "referencedDeclaration": 20367,
                             "src": "2224:27:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_ptr_$",
                               "typeString": "function (address,address,uint256,uint256) view external returns (bytes32[] memory)"
                             }
                           },
-                          "id": 21382,
+                          "id": 21390,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7356,10 +7356,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 21384,
+                        "id": 21392,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 21383,
+                          "id": 21391,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7392,7 +7392,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 21372,
+                      "id": 21380,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7404,14 +7404,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 21371,
+                        "id": 21379,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2216:7:65",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 21385,
+                    "id": 21393,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7431,17 +7431,17 @@
                 },
                 {
                   "assignments": [
-                    21391
+                    21399
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 21391,
+                      "id": 21399,
                       "mutability": "mutable",
                       "name": "slotData",
                       "nameLocation": "2365:8:65",
                       "nodeType": "VariableDeclaration",
-                      "scope": 21438,
+                      "scope": 21446,
                       "src": "2348:25:65",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -7451,7 +7451,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 21389,
+                          "id": 21397,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2348:7:65",
@@ -7460,7 +7460,7 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 21390,
+                        "id": 21398,
                         "nodeType": "ArrayTypeName",
                         "src": "2348:9:65",
                         "typeDescriptions": {
@@ -7471,12 +7471,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 21397,
+                  "id": 21405,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "31",
-                        "id": 21395,
+                        "id": 21403,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7498,7 +7498,7 @@
                           "typeString": "int_const 1"
                         }
                       ],
-                      "id": 21394,
+                      "id": 21402,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7511,7 +7511,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 21392,
+                          "id": 21400,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2380:7:65",
@@ -7520,7 +7520,7 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 21393,
+                        "id": 21401,
                         "nodeType": "ArrayTypeName",
                         "src": "2380:9:65",
                         "typeDescriptions": {
@@ -7529,7 +7529,7 @@
                         }
                       }
                     },
-                    "id": 21396,
+                    "id": 21404,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -7555,7 +7555,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 21409,
+                        "id": 21417,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7565,17 +7565,17 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 21407,
+                          "id": 21415,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
-                            "id": 21399,
+                            "id": 21407,
                             "name": "subsBitmap",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 21370,
+                            "referencedDeclaration": 21378,
                             "src": "2483:10:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -7591,14 +7591,14 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 21405,
+                                "id": 21413,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "hexValue": "31",
-                                  "id": 21400,
+                                  "id": 21408,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -7617,11 +7617,11 @@
                                 "rightExpression": {
                                   "arguments": [
                                     {
-                                      "id": 21403,
+                                      "id": 21411,
                                       "name": "slotId",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 21366,
+                                      "referencedDeclaration": 21374,
                                       "src": "2510:6:65",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint32",
@@ -7636,7 +7636,7 @@
                                         "typeString": "uint32"
                                       }
                                     ],
-                                    "id": 21402,
+                                    "id": 21410,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -7648,14 +7648,14 @@
                                       "typeString": "type(uint256)"
                                     },
                                     "typeName": {
-                                      "id": 21401,
+                                      "id": 21409,
                                       "name": "uint256",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "2502:7:65",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 21404,
+                                  "id": 21412,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -7677,7 +7677,7 @@
                                 }
                               }
                             ],
-                            "id": 21406,
+                            "id": 21414,
                             "isConstant": false,
                             "isInlineArray": false,
                             "isLValue": false,
@@ -7700,7 +7700,7 @@
                         "operator": "!=",
                         "rightExpression": {
                           "hexValue": "30",
-                          "id": 21408,
+                          "id": 21416,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7728,7 +7728,7 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 21398,
+                      "id": 21406,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
@@ -7739,7 +7739,7 @@
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 21410,
+                    "id": 21418,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7754,34 +7754,34 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 21411,
+                  "id": 21419,
                   "nodeType": "ExpressionStatement",
                   "src": "2476:48:65"
                 },
                 {
                   "expression": {
-                    "id": 21428,
+                    "id": 21436,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 21412,
+                        "id": 21420,
                         "name": "slotData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21391,
+                        "referencedDeclaration": 21399,
                         "src": "2534:8:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                           "typeString": "bytes32[] memory"
                         }
                       },
-                      "id": 21414,
+                      "id": 21422,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 21413,
+                        "id": 21421,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7815,17 +7815,17 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 21426,
+                          "id": 21434,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
-                            "id": 21417,
+                            "id": 21425,
                             "name": "subsBitmap",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 21370,
+                            "referencedDeclaration": 21378,
                             "src": "2556:10:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -7835,7 +7835,7 @@
                           "nodeType": "BinaryOperation",
                           "operator": "&",
                           "rightExpression": {
-                            "id": 21425,
+                            "id": 21433,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -7851,14 +7851,14 @@
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   },
-                                  "id": 21423,
+                                  "id": 21431,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftExpression": {
                                     "hexValue": "31",
-                                    "id": 21418,
+                                    "id": 21426,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -7877,11 +7877,11 @@
                                   "rightExpression": {
                                     "arguments": [
                                       {
-                                        "id": 21421,
+                                        "id": 21429,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21366,
+                                        "referencedDeclaration": 21374,
                                         "src": "2584:6:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -7896,7 +7896,7 @@
                                           "typeString": "uint32"
                                         }
                                       ],
-                                      "id": 21420,
+                                      "id": 21428,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
@@ -7908,14 +7908,14 @@
                                         "typeString": "type(uint256)"
                                       },
                                       "typeName": {
-                                        "id": 21419,
+                                        "id": 21427,
                                         "name": "uint256",
                                         "nodeType": "ElementaryTypeName",
                                         "src": "2576:7:65",
                                         "typeDescriptions": {}
                                       }
                                     },
-                                    "id": 21422,
+                                    "id": 21430,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -7937,7 +7937,7 @@
                                   }
                                 }
                               ],
-                              "id": 21424,
+                              "id": 21432,
                               "isConstant": false,
                               "isInlineArray": false,
                               "isLValue": false,
@@ -7969,7 +7969,7 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 21416,
+                        "id": 21424,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7981,14 +7981,14 @@
                           "typeString": "type(bytes32)"
                         },
                         "typeName": {
-                          "id": 21415,
+                          "id": 21423,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2548:7:65",
                           "typeDescriptions": {}
                         }
                       },
-                      "id": 21427,
+                      "id": 21435,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -8009,7 +8009,7 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "id": 21429,
+                  "id": 21437,
                   "nodeType": "ExpressionStatement",
                   "src": "2534:59:65"
                 },
@@ -8017,11 +8017,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 21433,
+                        "id": 21441,
                         "name": "account",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21362,
+                        "referencedDeclaration": 21370,
                         "src": "2672:7:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -8029,11 +8029,11 @@
                         }
                       },
                       {
-                        "id": 21434,
+                        "id": 21442,
                         "name": "bitmapStateSlotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21364,
+                        "referencedDeclaration": 21372,
                         "src": "2693:17:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -8041,11 +8041,11 @@
                         }
                       },
                       {
-                        "id": 21435,
+                        "id": 21443,
                         "name": "slotData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21391,
+                        "referencedDeclaration": 21399,
                         "src": "2724:8:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -8069,32 +8069,32 @@
                         }
                       ],
                       "expression": {
-                        "id": 21430,
+                        "id": 21438,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21360,
+                        "referencedDeclaration": 21368,
                         "src": "2628:5:65",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                          "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                           "typeString": "contract ISuperfluidToken"
                         }
                       },
-                      "id": 21432,
+                      "id": 21440,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "updateAgreementStateSlot",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 20335,
+                      "referencedDeclaration": 20343,
                       "src": "2628:30:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_array$_t_bytes32_$dyn_memory_ptr_$returns$__$",
                         "typeString": "function (address,uint256,bytes32[] memory) external"
                       }
                     },
-                    "id": 21436,
+                    "id": 21444,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8109,14 +8109,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 21437,
+                  "id": 21445,
                   "nodeType": "ExpressionStatement",
                   "src": "2628:105:65"
                 }
               ]
             },
             "functionSelector": "a9472bf8",
-            "id": 21439,
+            "id": 21447,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -8124,38 +8124,38 @@
             "nameLocation": "2035:9:65",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 21367,
+              "id": 21375,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 21360,
+                  "id": 21368,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "2071:5:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21439,
+                  "scope": 21447,
                   "src": "2054:22:65",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 21359,
+                    "id": 21367,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 21358,
+                      "id": 21366,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 20442,
+                      "referencedDeclaration": 20450,
                       "src": "2054:16:65"
                     },
-                    "referencedDeclaration": 20442,
+                    "referencedDeclaration": 20450,
                     "src": "2054:16:65",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -8163,12 +8163,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21362,
+                  "id": 21370,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "2094:7:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21439,
+                  "scope": 21447,
                   "src": "2086:15:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8177,7 +8177,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 21361,
+                    "id": 21369,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "2086:7:65",
@@ -8191,12 +8191,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21364,
+                  "id": 21372,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "2119:17:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21439,
+                  "scope": 21447,
                   "src": "2111:25:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8205,7 +8205,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 21363,
+                    "id": 21371,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2111:7:65",
@@ -8218,12 +8218,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21366,
+                  "id": 21374,
                   "mutability": "mutable",
                   "name": "slotId",
                   "nameLocation": "2153:6:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21439,
+                  "scope": 21447,
                   "src": "2146:13:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8232,7 +8232,7 @@
                     "typeString": "uint32"
                   },
                   "typeName": {
-                    "id": 21365,
+                    "id": 21373,
                     "name": "uint32",
                     "nodeType": "ElementaryTypeName",
                     "src": "2146:6:65",
@@ -8247,12 +8247,12 @@
               "src": "2044:121:65"
             },
             "returnParameters": {
-              "id": 21368,
+              "id": 21376,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "2185:0:65"
             },
-            "scope": 21550,
+            "scope": 21558,
             "src": "2026:714:65",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -8260,23 +8260,23 @@
           },
           {
             "body": {
-              "id": 21548,
+              "id": 21556,
               "nodeType": "Block",
               "src": "3014:817:65",
               "statements": [
                 {
                   "assignments": [
-                    21458
+                    21466
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 21458,
+                      "id": 21466,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "3032:10:65",
                       "nodeType": "VariableDeclaration",
-                      "scope": 21548,
+                      "scope": 21556,
                       "src": "3024:18:65",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -8285,7 +8285,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 21457,
+                        "id": 21465,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "3024:7:65",
@@ -8297,7 +8297,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 21474,
+                  "id": 21482,
                   "initialValue": {
                     "arguments": [
                       {
@@ -8306,14 +8306,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 21465,
+                                  "id": 21473,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "3102:4:65",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -8321,11 +8321,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 21464,
+                                "id": 21472,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -8337,14 +8337,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 21463,
+                                  "id": 21471,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "3094:7:65",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 21466,
+                              "id": 21474,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8360,11 +8360,11 @@
                               }
                             },
                             {
-                              "id": 21467,
+                              "id": 21475,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21444,
+                              "referencedDeclaration": 21452,
                               "src": "3121:7:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -8372,11 +8372,11 @@
                               }
                             },
                             {
-                              "id": 21468,
+                              "id": 21476,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21446,
+                              "referencedDeclaration": 21454,
                               "src": "3142:17:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -8385,7 +8385,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 21469,
+                              "id": 21477,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -8420,32 +8420,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 21461,
+                              "id": 21469,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21442,
+                              "referencedDeclaration": 21450,
                               "src": "3053:5:65",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 21462,
+                            "id": 21470,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 20359,
+                            "referencedDeclaration": 20367,
                             "src": "3053:27:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_ptr_$",
                               "typeString": "function (address,address,uint256,uint256) view external returns (bytes32[] memory)"
                             }
                           },
-                          "id": 21470,
+                          "id": 21478,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8460,10 +8460,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 21472,
+                        "id": 21480,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 21471,
+                          "id": 21479,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -8496,7 +8496,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 21460,
+                      "id": 21468,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8508,14 +8508,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 21459,
+                        "id": 21467,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "3045:7:65",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 21473,
+                    "id": 21481,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8535,17 +8535,17 @@
                 },
                 {
                   "expression": {
-                    "id": 21481,
+                    "id": 21489,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 21475,
+                      "id": 21483,
                       "name": "slotIds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21452,
+                      "referencedDeclaration": 21460,
                       "src": "3178:7:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint32_$dyn_memory_ptr",
@@ -8557,11 +8557,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 21479,
+                          "id": 21487,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 21237,
+                          "referencedDeclaration": 21245,
                           "src": "3201:14:65",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -8576,7 +8576,7 @@
                             "typeString": "uint32"
                           }
                         ],
-                        "id": 21478,
+                        "id": 21486,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8589,7 +8589,7 @@
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 21476,
+                            "id": 21484,
                             "name": "uint32",
                             "nodeType": "ElementaryTypeName",
                             "src": "3192:6:65",
@@ -8598,7 +8598,7 @@
                               "typeString": "uint32"
                             }
                           },
-                          "id": 21477,
+                          "id": 21485,
                           "nodeType": "ArrayTypeName",
                           "src": "3192:8:65",
                           "typeDescriptions": {
@@ -8607,7 +8607,7 @@
                           }
                         }
                       },
-                      "id": 21480,
+                      "id": 21488,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8628,23 +8628,23 @@
                       "typeString": "uint32[] memory"
                     }
                   },
-                  "id": 21482,
+                  "id": 21490,
                   "nodeType": "ExpressionStatement",
                   "src": "3178:38:65"
                 },
                 {
                   "expression": {
-                    "id": 21489,
+                    "id": 21497,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 21483,
+                      "id": 21491,
                       "name": "dataList",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21455,
+                      "referencedDeclaration": 21463,
                       "src": "3226:8:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -8656,11 +8656,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 21487,
+                          "id": 21495,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 21237,
+                          "referencedDeclaration": 21245,
                           "src": "3251:14:65",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -8675,7 +8675,7 @@
                             "typeString": "uint32"
                           }
                         ],
-                        "id": 21486,
+                        "id": 21494,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8688,7 +8688,7 @@
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 21484,
+                            "id": 21492,
                             "name": "bytes32",
                             "nodeType": "ElementaryTypeName",
                             "src": "3241:7:65",
@@ -8697,7 +8697,7 @@
                               "typeString": "bytes32"
                             }
                           },
-                          "id": 21485,
+                          "id": 21493,
                           "nodeType": "ArrayTypeName",
                           "src": "3241:9:65",
                           "typeDescriptions": {
@@ -8706,7 +8706,7 @@
                           }
                         }
                       },
-                      "id": 21488,
+                      "id": 21496,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8727,23 +8727,23 @@
                       "typeString": "bytes32[] memory"
                     }
                   },
-                  "id": 21490,
+                  "id": 21498,
                   "nodeType": "ExpressionStatement",
                   "src": "3226:40:65"
                 },
                 {
                   "assignments": [
-                    21492
+                    21500
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 21492,
+                      "id": 21500,
                       "mutability": "mutable",
                       "name": "nSlots",
                       "nameLocation": "3307:6:65",
                       "nodeType": "VariableDeclaration",
-                      "scope": 21548,
+                      "scope": 21556,
                       "src": "3302:11:65",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -8752,7 +8752,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 21491,
+                        "id": 21499,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "3302:4:65",
@@ -8764,13 +8764,13 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 21493,
+                  "id": 21501,
                   "nodeType": "VariableDeclarationStatement",
                   "src": "3302:11:65"
                 },
                 {
                   "body": {
-                    "id": 21545,
+                    "id": 21553,
                     "nodeType": "Block",
                     "src": "3382:309:65",
                     "statements": [
@@ -8780,7 +8780,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 21514,
+                          "id": 21522,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8792,7 +8792,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 21511,
+                                "id": 21519,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8804,17 +8804,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 21508,
+                                      "id": 21516,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 21506,
+                                        "id": 21514,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21458,
+                                        "referencedDeclaration": 21466,
                                         "src": "3409:10:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -8824,11 +8824,11 @@
                                       "nodeType": "BinaryOperation",
                                       "operator": ">>",
                                       "rightExpression": {
-                                        "id": 21507,
+                                        "id": 21515,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 21495,
+                                        "referencedDeclaration": 21503,
                                         "src": "3423:6:65",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -8849,7 +8849,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 21505,
+                                    "id": 21513,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -8861,14 +8861,14 @@
                                       "typeString": "type(uint256)"
                                     },
                                     "typeName": {
-                                      "id": 21504,
+                                      "id": 21512,
                                       "name": "uint256",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "3401:7:65",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 21509,
+                                  "id": 21517,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -8887,7 +8887,7 @@
                                 "operator": "&",
                                 "rightExpression": {
                                   "hexValue": "31",
-                                  "id": 21510,
+                                  "id": 21518,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -8908,7 +8908,7 @@
                                 }
                               }
                             ],
-                            "id": 21512,
+                            "id": 21520,
                             "isConstant": false,
                             "isInlineArray": false,
                             "isLValue": false,
@@ -8925,7 +8925,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "hexValue": "30",
-                            "id": 21513,
+                            "id": 21521,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -8945,42 +8945,42 @@
                             "typeString": "bool"
                           }
                         },
-                        "id": 21516,
+                        "id": 21524,
                         "nodeType": "IfStatement",
                         "src": "3396:54:65",
                         "trueBody": {
-                          "id": 21515,
+                          "id": 21523,
                           "nodeType": "Continue",
                           "src": "3442:8:65"
                         }
                       },
                       {
                         "expression": {
-                          "id": 21521,
+                          "id": 21529,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "baseExpression": {
-                              "id": 21517,
+                              "id": 21525,
                               "name": "slotIds",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21452,
+                              "referencedDeclaration": 21460,
                               "src": "3464:7:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint32_$dyn_memory_ptr",
                                 "typeString": "uint32[] memory"
                               }
                             },
-                            "id": 21519,
+                            "id": 21527,
                             "indexExpression": {
-                              "id": 21518,
+                              "id": 21526,
                               "name": "nSlots",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21492,
+                              "referencedDeclaration": 21500,
                               "src": "3472:6:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -9001,11 +9001,11 @@
                           "nodeType": "Assignment",
                           "operator": "=",
                           "rightHandSide": {
-                            "id": 21520,
+                            "id": 21528,
                             "name": "slotId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 21495,
+                            "referencedDeclaration": 21503,
                             "src": "3482:6:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint32",
@@ -9018,37 +9018,37 @@
                             "typeString": "uint32"
                           }
                         },
-                        "id": 21522,
+                        "id": 21530,
                         "nodeType": "ExpressionStatement",
                         "src": "3464:24:65"
                       },
                       {
                         "expression": {
-                          "id": 21540,
+                          "id": 21548,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "baseExpression": {
-                              "id": 21523,
+                              "id": 21531,
                               "name": "dataList",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21455,
+                              "referencedDeclaration": 21463,
                               "src": "3502:8:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                 "typeString": "bytes32[] memory"
                               }
                             },
-                            "id": 21525,
+                            "id": 21533,
                             "indexExpression": {
-                              "id": 21524,
+                              "id": 21532,
                               "name": "nSlots",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 21492,
+                              "referencedDeclaration": 21500,
                               "src": "3511:6:65",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -9074,14 +9074,14 @@
                                 {
                                   "arguments": [
                                     {
-                                      "id": 21530,
+                                      "id": 21538,
                                       "name": "this",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
                                       "referencedDeclaration": 4294967268,
                                       "src": "3574:4:65",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                         "typeString": "library SlotsBitmapLibrary"
                                       }
                                     }
@@ -9089,11 +9089,11 @@
                                   "expression": {
                                     "argumentTypes": [
                                       {
-                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21550",
+                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$21558",
                                         "typeString": "library SlotsBitmapLibrary"
                                       }
                                     ],
-                                    "id": 21529,
+                                    "id": 21537,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -9105,14 +9105,14 @@
                                       "typeString": "type(address)"
                                     },
                                     "typeName": {
-                                      "id": 21528,
+                                      "id": 21536,
                                       "name": "address",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "3566:7:65",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 21531,
+                                  "id": 21539,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -9128,11 +9128,11 @@
                                   }
                                 },
                                 {
-                                  "id": 21532,
+                                  "id": 21540,
                                   "name": "account",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 21444,
+                                  "referencedDeclaration": 21452,
                                   "src": "3597:7:65",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
@@ -9144,17 +9144,17 @@
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   },
-                                  "id": 21535,
+                                  "id": 21543,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftExpression": {
-                                    "id": 21533,
+                                    "id": 21541,
                                     "name": "dataStateSlotIDStart",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21448,
+                                    "referencedDeclaration": 21456,
                                     "src": "3622:20:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -9164,11 +9164,11 @@
                                   "nodeType": "BinaryOperation",
                                   "operator": "+",
                                   "rightExpression": {
-                                    "id": 21534,
+                                    "id": 21542,
                                     "name": "slotId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 21495,
+                                    "referencedDeclaration": 21503,
                                     "src": "3645:6:65",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint32",
@@ -9183,7 +9183,7 @@
                                 },
                                 {
                                   "hexValue": "31",
-                                  "id": 21536,
+                                  "id": 21544,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -9218,32 +9218,32 @@
                                   }
                                 ],
                                 "expression": {
-                                  "id": 21526,
+                                  "id": 21534,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 21442,
+                                  "referencedDeclaration": 21450,
                                   "src": "3521:5:65",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                                     "typeString": "contract ISuperfluidToken"
                                   }
                                 },
-                                "id": 21527,
+                                "id": 21535,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "getAgreementStateSlot",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 20359,
+                                "referencedDeclaration": 20367,
                                 "src": "3521:27:65",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_ptr_$",
                                   "typeString": "function (address,address,uint256,uint256) view external returns (bytes32[] memory)"
                                 }
                               },
-                              "id": 21537,
+                              "id": 21545,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -9258,10 +9258,10 @@
                                 "typeString": "bytes32[] memory"
                               }
                             },
-                            "id": 21539,
+                            "id": 21547,
                             "indexExpression": {
                               "hexValue": "30",
-                              "id": 21538,
+                              "id": 21546,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -9292,13 +9292,13 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 21541,
+                        "id": 21549,
                         "nodeType": "ExpressionStatement",
                         "src": "3502:156:65"
                       },
                       {
                         "expression": {
-                          "id": 21543,
+                          "id": 21551,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9308,11 +9308,11 @@
                           "prefix": true,
                           "src": "3672:8:65",
                           "subExpression": {
-                            "id": 21542,
+                            "id": 21550,
                             "name": "nSlots",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 21492,
+                            "referencedDeclaration": 21500,
                             "src": "3674:6:65",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -9324,7 +9324,7 @@
                             "typeString": "uint256"
                           }
                         },
-                        "id": 21544,
+                        "id": 21552,
                         "nodeType": "ExpressionStatement",
                         "src": "3672:8:65"
                       }
@@ -9335,17 +9335,17 @@
                       "typeIdentifier": "t_uint32",
                       "typeString": "uint32"
                     },
-                    "id": 21500,
+                    "id": 21508,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 21498,
+                      "id": 21506,
                       "name": "slotId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21495,
+                      "referencedDeclaration": 21503,
                       "src": "3347:6:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -9355,11 +9355,11 @@
                     "nodeType": "BinaryOperation",
                     "operator": "<",
                     "rightExpression": {
-                      "id": 21499,
+                      "id": 21507,
                       "name": "_MAX_NUM_SLOTS",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 21237,
+                      "referencedDeclaration": 21245,
                       "src": "3356:14:65",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -9372,20 +9372,20 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 21546,
+                  "id": 21554,
                   "initializationExpression": {
                     "assignments": [
-                      21495
+                      21503
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 21495,
+                        "id": 21503,
                         "mutability": "mutable",
                         "name": "slotId",
                         "nameLocation": "3335:6:65",
                         "nodeType": "VariableDeclaration",
-                        "scope": 21546,
+                        "scope": 21554,
                         "src": "3328:13:65",
                         "stateVariable": false,
                         "storageLocation": "default",
@@ -9394,7 +9394,7 @@
                           "typeString": "uint32"
                         },
                         "typeName": {
-                          "id": 21494,
+                          "id": 21502,
                           "name": "uint32",
                           "nodeType": "ElementaryTypeName",
                           "src": "3328:6:65",
@@ -9406,10 +9406,10 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 21497,
+                    "id": 21505,
                     "initialValue": {
                       "hexValue": "30",
-                      "id": 21496,
+                      "id": 21504,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -9428,7 +9428,7 @@
                   },
                   "loopExpression": {
                     "expression": {
-                      "id": 21502,
+                      "id": 21510,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -9438,11 +9438,11 @@
                       "prefix": true,
                       "src": "3372:8:65",
                       "subExpression": {
-                        "id": 21501,
+                        "id": 21509,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 21495,
+                        "referencedDeclaration": 21503,
                         "src": "3374:6:65",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -9454,7 +9454,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 21503,
+                    "id": 21511,
                     "nodeType": "ExpressionStatement",
                     "src": "3372:8:65"
                   },
@@ -9521,42 +9521,42 @@
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 21455,
+                      "declaration": 21463,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3798:8:65",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 21492,
+                      "declaration": 21500,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3771:6:65",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 21492,
+                      "declaration": 21500,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3808:6:65",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 21452,
+                      "declaration": 21460,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3762:7:65",
                       "valueSize": 1
                     }
                   ],
-                  "id": 21547,
+                  "id": 21555,
                   "nodeType": "InlineAssembly",
                   "src": "3732:93:65"
                 }
               ]
             },
             "functionSelector": "06967a8c",
-            "id": 21549,
+            "id": 21557,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -9564,38 +9564,38 @@
             "nameLocation": "2755:8:65",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 21449,
+              "id": 21457,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 21442,
+                  "id": 21450,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "2789:5:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2772:22:65",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 21441,
+                    "id": 21449,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 21440,
+                      "id": 21448,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 20442,
+                      "referencedDeclaration": 20450,
                       "src": "2772:16:65"
                     },
-                    "referencedDeclaration": 20442,
+                    "referencedDeclaration": 20450,
                     "src": "2772:16:65",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20442",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$20450",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -9603,12 +9603,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21444,
+                  "id": 21452,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "2811:7:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2803:15:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9617,7 +9617,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 21443,
+                    "id": 21451,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "2803:7:65",
@@ -9631,12 +9631,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21446,
+                  "id": 21454,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "2835:17:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2827:25:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9645,7 +9645,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 21445,
+                    "id": 21453,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2827:7:65",
@@ -9658,12 +9658,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21448,
+                  "id": 21456,
                   "mutability": "mutable",
                   "name": "dataStateSlotIDStart",
                   "nameLocation": "2869:20:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2861:28:65",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9672,7 +9672,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 21447,
+                    "id": 21455,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2861:7:65",
@@ -9687,17 +9687,17 @@
               "src": "2763:132:65"
             },
             "returnParameters": {
-              "id": 21456,
+              "id": 21464,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 21452,
+                  "id": 21460,
                   "mutability": "mutable",
                   "name": "slotIds",
                   "nameLocation": "2962:7:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2946:23:65",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -9707,7 +9707,7 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 21450,
+                      "id": 21458,
                       "name": "uint32",
                       "nodeType": "ElementaryTypeName",
                       "src": "2946:6:65",
@@ -9716,7 +9716,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 21451,
+                    "id": 21459,
                     "nodeType": "ArrayTypeName",
                     "src": "2946:8:65",
                     "typeDescriptions": {
@@ -9728,12 +9728,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 21455,
+                  "id": 21463,
                   "mutability": "mutable",
                   "name": "dataList",
                   "nameLocation": "3000:8:65",
                   "nodeType": "VariableDeclaration",
-                  "scope": 21549,
+                  "scope": 21557,
                   "src": "2983:25:65",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -9743,7 +9743,7 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 21453,
+                      "id": 21461,
                       "name": "bytes32",
                       "nodeType": "ElementaryTypeName",
                       "src": "2983:7:65",
@@ -9752,7 +9752,7 @@
                         "typeString": "bytes32"
                       }
                     },
-                    "id": 21454,
+                    "id": 21462,
                     "nodeType": "ArrayTypeName",
                     "src": "2983:9:65",
                     "typeDescriptions": {
@@ -9765,14 +9765,14 @@
               ],
               "src": "2932:77:65"
             },
-            "scope": 21550,
+            "scope": 21558,
             "src": "2746:1085:65",
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           }
         ],
-        "scope": 21551,
+        "scope": 21559,
         "src": "710:3123:65",
         "usedErrors": []
       }
@@ -9785,7 +9785,7 @@
   },
   "networks": {},
   "schemaVersion": "3.4.8",
-  "updatedAt": "2022-08-11T12:58:51.701Z",
+  "updatedAt": "2022-08-24T13:23:34.452Z",
   "devdoc": {
     "author": "Superfluid",
     "details": "A library implements slots bitmap on Superfluid Token storage NOTE: - A slots bitmap allows you to iterate through a list of data efficiently. - A data slot can be enabled or disabled with the help of bitmap. - MAX_NUM_SLOTS is 256 in this implementation (using one uint256) - Superfluid token storage usage:   - getAgreementStateSlot(bitmapStateSlotId) stores the bitmap of enabled data slots   - getAgreementStateSlot(dataStateSlotIDStart + stotId) stores the data of the slot",