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

package/build/contracts/SlotsBitmapLibrary.json

@@ -522,7 +522,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19421t_addresst_uint256t_uint256",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19399t_addresst_uint256t_uint256",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -1805,7 +1805,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19421t_addresst_uint256t_uint256t_bytes32",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19399t_addresst_uint256t_uint256t_bytes32",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -2392,7 +2392,7 @@
                 }
               ]
             },
-            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19421t_addresst_uint256t_uint32",
+            "name": "abi_decode_tuple_t_contract$_ISuperfluidToken_$19399t_addresst_uint256t_uint32",
             "nodeType": "YulFunctionDefinition",
             "parameters": [
               {
@@ -5354,7 +5354,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_$19421t_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_$19421t_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_$19421t_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}",
+      "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_$19399t_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_$19399t_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_$19399t_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}",
       "id": 110,
       "language": "Yul",
       "name": "#utility.yul"
@@ -5368,18 +5368,18 @@
     "absolutePath": "project:/contracts/libs/SlotsBitmapLibrary.sol",
     "exportedSymbols": {
       "ISuperfluidToken": [
-        19421
+        19399
       ],
       "SlotsBitmapLibrary": [
-        20670
+        20648
       ]
     },
-    "id": 20671,
+    "id": 20649,
     "license": "AGPLv3",
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 20365,
+        "id": 20343,
         "literals": [
           "solidity",
           "0.8",
@@ -5391,20 +5391,20 @@
       {
         "absolutePath": "project:/contracts/interfaces/superfluid/ISuperfluidToken.sol",
         "file": "../interfaces/superfluid/ISuperfluidToken.sol",
-        "id": 20367,
+        "id": 20345,
         "nameLocation": "-1:-1:-1",
         "nodeType": "ImportDirective",
-        "scope": 20671,
-        "sourceUnit": 19422,
+        "scope": 20649,
+        "sourceUnit": 19400,
         "src": "60:79:67",
         "symbolAliases": [
           {
             "foreign": {
-              "id": 20366,
+              "id": 20344,
               "name": "ISuperfluidToken",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 19421,
+              "referencedDeclaration": 19399,
               "src": "68:16:67",
               "typeDescriptions": {}
             },
@@ -5420,15 +5420,15 @@
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 20368,
+          "id": 20346,
           "nodeType": "StructuredDocumentation",
           "src": "141:568:67",
           "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": 20670,
+        "id": 20648,
         "linearizedBaseContracts": [
-          20670
+          20648
         ],
         "name": "SlotsBitmapLibrary",
         "nameLocation": "718:18:67",
@@ -5436,12 +5436,12 @@
         "nodes": [
           {
             "constant": true,
-            "id": 20371,
+            "id": 20349,
             "mutability": "constant",
             "name": "_MAX_NUM_SLOTS",
             "nameLocation": "769:14:67",
             "nodeType": "VariableDeclaration",
-            "scope": 20670,
+            "scope": 20648,
             "src": "744:45:67",
             "stateVariable": true,
             "storageLocation": "default",
@@ -5450,7 +5450,7 @@
               "typeString": "uint32"
             },
             "typeName": {
-              "id": 20369,
+              "id": 20347,
               "name": "uint32",
               "nodeType": "ElementaryTypeName",
               "src": "744:6:67",
@@ -5461,7 +5461,7 @@
             },
             "value": {
               "hexValue": "323536",
-              "id": 20370,
+              "id": 20348,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -5479,23 +5479,23 @@
           },
           {
             "body": {
-              "id": 20490,
+              "id": 20468,
               "nodeType": "Block",
               "src": "1035:985:67",
               "statements": [
                 {
                   "assignments": [
-                    20388
+                    20366
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 20388,
+                      "id": 20366,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "1053:10:67",
                       "nodeType": "VariableDeclaration",
-                      "scope": 20490,
+                      "scope": 20468,
                       "src": "1045:18:67",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -5504,7 +5504,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 20387,
+                        "id": 20365,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "1045:7:67",
@@ -5516,7 +5516,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 20404,
+                  "id": 20382,
                   "initialValue": {
                     "arguments": [
                       {
@@ -5525,14 +5525,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 20395,
+                                  "id": 20373,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "1123:4:67",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -5540,11 +5540,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 20394,
+                                "id": 20372,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -5556,14 +5556,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 20393,
+                                  "id": 20371,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "1115:7:67",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 20396,
+                              "id": 20374,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5579,11 +5579,11 @@
                               }
                             },
                             {
-                              "id": 20397,
+                              "id": 20375,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20376,
+                              "referencedDeclaration": 20354,
                               "src": "1142:7:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -5591,11 +5591,11 @@
                               }
                             },
                             {
-                              "id": 20398,
+                              "id": 20376,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20378,
+                              "referencedDeclaration": 20356,
                               "src": "1163:17:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -5604,7 +5604,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 20399,
+                              "id": 20377,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -5639,32 +5639,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 20391,
+                              "id": 20369,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20374,
+                              "referencedDeclaration": 20352,
                               "src": "1074:5:67",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 20392,
+                            "id": 20370,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 19338,
+                            "referencedDeclaration": 19316,
                             "src": "1074:27:67",
                             "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": 20400,
+                          "id": 20378,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5679,10 +5679,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 20402,
+                        "id": 20380,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 20401,
+                          "id": 20379,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5715,7 +5715,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 20390,
+                      "id": 20368,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5727,14 +5727,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 20389,
+                        "id": 20367,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "1066:7:67",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 20403,
+                    "id": 20381,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5754,7 +5754,7 @@
                 },
                 {
                   "body": {
-                    "id": 20481,
+                    "id": 20459,
                     "nodeType": "Block",
                     "src": "1250:695:67",
                     "statements": [
@@ -5764,7 +5764,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 20425,
+                          "id": 20403,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5776,7 +5776,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 20422,
+                                "id": 20400,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -5788,17 +5788,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 20419,
+                                      "id": 20397,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 20417,
+                                        "id": 20395,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20388,
+                                        "referencedDeclaration": 20366,
                                         "src": "1277:10:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -5808,11 +5808,11 @@
                                       "nodeType": "BinaryOperation",
                                       "operator": ">>",
                                       "rightExpression": {
-                                        "id": 20418,
+                                        "id": 20396,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20385,
+                                        "referencedDeclaration": 20363,
                                         "src": "1291:6:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -5833,7 +5833,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 20416,
+                                    "id": 20394,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -5845,14 +5845,14 @@
                                       "typeString": "type(uint256)"
                                     },
                                     "typeName": {
-                                      "id": 20415,
+                                      "id": 20393,
                                       "name": "uint256",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1269:7:67",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 20420,
+                                  "id": 20398,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5871,7 +5871,7 @@
                                 "operator": "&",
                                 "rightExpression": {
                                   "hexValue": "31",
-                                  "id": 20421,
+                                  "id": 20399,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -5892,7 +5892,7 @@
                                 }
                               }
                             ],
-                            "id": 20423,
+                            "id": 20401,
                             "isConstant": false,
                             "isInlineArray": false,
                             "isLValue": false,
@@ -5909,7 +5909,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "hexValue": "30",
-                            "id": 20424,
+                            "id": 20402,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -5929,27 +5929,27 @@
                             "typeString": "bool"
                           }
                         },
-                        "id": 20480,
+                        "id": 20458,
                         "nodeType": "IfStatement",
                         "src": "1264:671:67",
                         "trueBody": {
-                          "id": 20479,
+                          "id": 20457,
                           "nodeType": "Block",
                           "src": "1310:625:67",
                           "statements": [
                             {
                               "assignments": [
-                                20430
+                                20408
                               ],
                               "declarations": [
                                 {
                                   "constant": false,
-                                  "id": 20430,
+                                  "id": 20408,
                                   "mutability": "mutable",
                                   "name": "slotData",
                                   "nameLocation": "1381:8:67",
                                   "nodeType": "VariableDeclaration",
-                                  "scope": 20479,
+                                  "scope": 20457,
                                   "src": "1364:25:67",
                                   "stateVariable": false,
                                   "storageLocation": "memory",
@@ -5959,7 +5959,7 @@
                                   },
                                   "typeName": {
                                     "baseType": {
-                                      "id": 20428,
+                                      "id": 20406,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1364:7:67",
@@ -5968,7 +5968,7 @@
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "id": 20429,
+                                    "id": 20407,
                                     "nodeType": "ArrayTypeName",
                                     "src": "1364:9:67",
                                     "typeDescriptions": {
@@ -5979,12 +5979,12 @@
                                   "visibility": "internal"
                                 }
                               ],
-                              "id": 20436,
+                              "id": 20414,
                               "initialValue": {
                                 "arguments": [
                                   {
                                     "hexValue": "31",
-                                    "id": 20434,
+                                    "id": 20412,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6006,7 +6006,7 @@
                                       "typeString": "int_const 1"
                                     }
                                   ],
-                                  "id": 20433,
+                                  "id": 20411,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -6019,7 +6019,7 @@
                                   },
                                   "typeName": {
                                     "baseType": {
-                                      "id": 20431,
+                                      "id": 20409,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1396:7:67",
@@ -6028,7 +6028,7 @@
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "id": 20432,
+                                    "id": 20410,
                                     "nodeType": "ArrayTypeName",
                                     "src": "1396:9:67",
                                     "typeDescriptions": {
@@ -6037,7 +6037,7 @@
                                     }
                                   }
                                 },
-                                "id": 20435,
+                                "id": 20413,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -6057,28 +6057,28 @@
                             },
                             {
                               "expression": {
-                                "id": 20441,
+                                "id": 20419,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "baseExpression": {
-                                    "id": 20437,
+                                    "id": 20415,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20430,
+                                    "referencedDeclaration": 20408,
                                     "src": "1426:8:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                       "typeString": "bytes32[] memory"
                                     }
                                   },
-                                  "id": 20439,
+                                  "id": 20417,
                                   "indexExpression": {
                                     "hexValue": "30",
-                                    "id": 20438,
+                                    "id": 20416,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6106,11 +6106,11 @@
                                 "nodeType": "Assignment",
                                 "operator": "=",
                                 "rightHandSide": {
-                                  "id": 20440,
+                                  "id": 20418,
                                   "name": "data",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 20382,
+                                  "referencedDeclaration": 20360,
                                   "src": "1440:4:67",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes32",
@@ -6123,7 +6123,7 @@
                                   "typeString": "bytes32"
                                 }
                               },
-                              "id": 20442,
+                              "id": 20420,
                               "nodeType": "ExpressionStatement",
                               "src": "1426:18:67"
                             },
@@ -6131,11 +6131,11 @@
                               "expression": {
                                 "arguments": [
                                   {
-                                    "id": 20446,
+                                    "id": 20424,
                                     "name": "account",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20376,
+                                    "referencedDeclaration": 20354,
                                     "src": "1514:7:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
@@ -6147,17 +6147,17 @@
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     },
-                                    "id": 20449,
+                                    "id": 20427,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "leftExpression": {
-                                      "id": 20447,
+                                      "id": 20425,
                                       "name": "dataStateSlotIDStart",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 20380,
+                                      "referencedDeclaration": 20358,
                                       "src": "1543:20:67",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
@@ -6167,11 +6167,11 @@
                                     "nodeType": "BinaryOperation",
                                     "operator": "+",
                                     "rightExpression": {
-                                      "id": 20448,
+                                      "id": 20426,
                                       "name": "slotId",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 20385,
+                                      "referencedDeclaration": 20363,
                                       "src": "1566:6:67",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint32",
@@ -6185,11 +6185,11 @@
                                     }
                                   },
                                   {
-                                    "id": 20450,
+                                    "id": 20428,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20430,
+                                    "referencedDeclaration": 20408,
                                     "src": "1594:8:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -6213,32 +6213,32 @@
                                     }
                                   ],
                                   "expression": {
-                                    "id": 20443,
+                                    "id": 20421,
                                     "name": "token",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20374,
+                                    "referencedDeclaration": 20352,
                                     "src": "1462:5:67",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
-                                  "id": 20445,
+                                  "id": 20423,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "updateAgreementStateSlot",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 19314,
+                                  "referencedDeclaration": 19292,
                                   "src": "1462:30:67",
                                   "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": 20451,
+                                "id": 20429,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6253,34 +6253,34 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 20452,
+                              "id": 20430,
                               "nodeType": "ExpressionStatement",
                               "src": "1462:141:67"
                             },
                             {
                               "expression": {
-                                "id": 20468,
+                                "id": 20446,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "baseExpression": {
-                                    "id": 20453,
+                                    "id": 20431,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20430,
+                                    "referencedDeclaration": 20408,
                                     "src": "1656:8:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                       "typeString": "bytes32[] memory"
                                     }
                                   },
-                                  "id": 20455,
+                                  "id": 20433,
                                   "indexExpression": {
                                     "hexValue": "30",
-                                    "id": 20454,
+                                    "id": 20432,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6314,17 +6314,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 20466,
+                                      "id": 20444,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 20458,
+                                        "id": 20436,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20388,
+                                        "referencedDeclaration": 20366,
                                         "src": "1678:10:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -6340,14 +6340,14 @@
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             },
-                                            "id": 20464,
+                                            "id": 20442,
                                             "isConstant": false,
                                             "isLValue": false,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "leftExpression": {
                                               "hexValue": "31",
-                                              "id": 20459,
+                                              "id": 20437,
                                               "isConstant": false,
                                               "isLValue": false,
                                               "isPure": true,
@@ -6366,11 +6366,11 @@
                                             "rightExpression": {
                                               "arguments": [
                                                 {
-                                                  "id": 20462,
+                                                  "id": 20440,
                                                   "name": "slotId",
                                                   "nodeType": "Identifier",
                                                   "overloadedDeclarations": [],
-                                                  "referencedDeclaration": 20385,
+                                                  "referencedDeclaration": 20363,
                                                   "src": "1705:6:67",
                                                   "typeDescriptions": {
                                                     "typeIdentifier": "t_uint32",
@@ -6385,7 +6385,7 @@
                                                     "typeString": "uint32"
                                                   }
                                                 ],
-                                                "id": 20461,
+                                                "id": 20439,
                                                 "isConstant": false,
                                                 "isLValue": false,
                                                 "isPure": true,
@@ -6397,14 +6397,14 @@
                                                   "typeString": "type(uint256)"
                                                 },
                                                 "typeName": {
-                                                  "id": 20460,
+                                                  "id": 20438,
                                                   "name": "uint256",
                                                   "nodeType": "ElementaryTypeName",
                                                   "src": "1697:7:67",
                                                   "typeDescriptions": {}
                                                 }
                                               },
-                                              "id": 20463,
+                                              "id": 20441,
                                               "isConstant": false,
                                               "isLValue": false,
                                               "isPure": false,
@@ -6426,7 +6426,7 @@
                                             }
                                           }
                                         ],
-                                        "id": 20465,
+                                        "id": 20443,
                                         "isConstant": false,
                                         "isInlineArray": false,
                                         "isLValue": false,
@@ -6453,7 +6453,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 20457,
+                                    "id": 20435,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -6465,14 +6465,14 @@
                                       "typeString": "type(bytes32)"
                                     },
                                     "typeName": {
-                                      "id": 20456,
+                                      "id": 20434,
                                       "name": "bytes32",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "1670:7:67",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 20467,
+                                  "id": 20445,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -6493,7 +6493,7 @@
                                   "typeString": "bytes32"
                                 }
                               },
-                              "id": 20469,
+                              "id": 20447,
                               "nodeType": "ExpressionStatement",
                               "src": "1656:58:67"
                             },
@@ -6501,11 +6501,11 @@
                               "expression": {
                                 "arguments": [
                                   {
-                                    "id": 20473,
+                                    "id": 20451,
                                     "name": "account",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20376,
+                                    "referencedDeclaration": 20354,
                                     "src": "1784:7:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
@@ -6513,11 +6513,11 @@
                                     }
                                   },
                                   {
-                                    "id": 20474,
+                                    "id": 20452,
                                     "name": "bitmapStateSlotId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20378,
+                                    "referencedDeclaration": 20356,
                                     "src": "1813:17:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -6525,11 +6525,11 @@
                                     }
                                   },
                                   {
-                                    "id": 20475,
+                                    "id": 20453,
                                     "name": "slotData",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20430,
+                                    "referencedDeclaration": 20408,
                                     "src": "1852:8:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -6553,32 +6553,32 @@
                                     }
                                   ],
                                   "expression": {
-                                    "id": 20470,
+                                    "id": 20448,
                                     "name": "token",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20374,
+                                    "referencedDeclaration": 20352,
                                     "src": "1732:5:67",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                       "typeString": "contract ISuperfluidToken"
                                     }
                                   },
-                                  "id": 20472,
+                                  "id": 20450,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "updateAgreementStateSlot",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 19314,
+                                  "referencedDeclaration": 19292,
                                   "src": "1732:30:67",
                                   "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": 20476,
+                                "id": 20454,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6593,12 +6593,12 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 20477,
+                              "id": 20455,
                               "nodeType": "ExpressionStatement",
                               "src": "1732:129:67"
                             },
                             {
-                              "id": 20478,
+                              "id": 20456,
                               "nodeType": "Break",
                               "src": "1915:5:67"
                             }
@@ -6612,17 +6612,17 @@
                       "typeIdentifier": "t_uint32",
                       "typeString": "uint32"
                     },
-                    "id": 20411,
+                    "id": 20389,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 20409,
+                      "id": 20387,
                       "name": "slotId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20385,
+                      "referencedDeclaration": 20363,
                       "src": "1215:6:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -6632,11 +6632,11 @@
                     "nodeType": "BinaryOperation",
                     "operator": "<",
                     "rightExpression": {
-                      "id": 20410,
+                      "id": 20388,
                       "name": "_MAX_NUM_SLOTS",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20371,
+                      "referencedDeclaration": 20349,
                       "src": "1224:14:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -6649,20 +6649,20 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 20482,
+                  "id": 20460,
                   "initializationExpression": {
                     "expression": {
-                      "id": 20407,
+                      "id": 20385,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
-                        "id": 20405,
+                        "id": 20383,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20385,
+                        "referencedDeclaration": 20363,
                         "src": "1203:6:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -6673,7 +6673,7 @@
                       "operator": "=",
                       "rightHandSide": {
                         "hexValue": "30",
-                        "id": 20406,
+                        "id": 20384,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -6693,13 +6693,13 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 20408,
+                    "id": 20386,
                     "nodeType": "ExpressionStatement",
                     "src": "1203:10:67"
                   },
                   "loopExpression": {
                     "expression": {
-                      "id": 20413,
+                      "id": 20391,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6709,11 +6709,11 @@
                       "prefix": true,
                       "src": "1240:8:67",
                       "subExpression": {
-                        "id": 20412,
+                        "id": 20390,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20385,
+                        "referencedDeclaration": 20363,
                         "src": "1242:6:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -6725,7 +6725,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 20414,
+                    "id": 20392,
                     "nodeType": "ExpressionStatement",
                     "src": "1240:8:67"
                   },
@@ -6740,17 +6740,17 @@
                           "typeIdentifier": "t_uint32",
                           "typeString": "uint32"
                         },
-                        "id": 20486,
+                        "id": 20464,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
-                          "id": 20484,
+                          "id": 20462,
                           "name": "slotId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 20385,
+                          "referencedDeclaration": 20363,
                           "src": "1962:6:67",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -6760,11 +6760,11 @@
                         "nodeType": "BinaryOperation",
                         "operator": "<",
                         "rightExpression": {
-                          "id": 20485,
+                          "id": 20463,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 20371,
+                          "referencedDeclaration": 20349,
                           "src": "1971:14:67",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -6779,7 +6779,7 @@
                       },
                       {
                         "hexValue": "536c6f744269746d6170206f7574206f6620626f756e64",
-                        "id": 20487,
+                        "id": 20465,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -6805,7 +6805,7 @@
                           "typeString": "literal_string \"SlotBitmap out of bound\""
                         }
                       ],
-                      "id": 20483,
+                      "id": 20461,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
@@ -6819,7 +6819,7 @@
                         "typeString": "function (bool,string memory) pure"
                       }
                     },
-                    "id": 20488,
+                    "id": 20466,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6834,14 +6834,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 20489,
+                  "id": 20467,
                   "nodeType": "ExpressionStatement",
                   "src": "1954:59:67"
                 }
               ]
             },
             "functionSelector": "a3247010",
-            "id": 20491,
+            "id": 20469,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -6849,38 +6849,38 @@
             "nameLocation": "805:20:67",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 20383,
+              "id": 20361,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 20374,
+                  "id": 20352,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "852:5:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "835:22:67",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 20373,
+                    "id": 20351,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 20372,
+                      "id": 20350,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19421,
+                      "referencedDeclaration": 19399,
                       "src": "835:16:67"
                     },
-                    "referencedDeclaration": 19421,
+                    "referencedDeclaration": 19399,
                     "src": "835:16:67",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -6888,12 +6888,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20376,
+                  "id": 20354,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "875:7:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "867:15:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6902,7 +6902,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 20375,
+                    "id": 20353,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "867:7:67",
@@ -6916,12 +6916,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20378,
+                  "id": 20356,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "900:17:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "892:25:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6930,7 +6930,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 20377,
+                    "id": 20355,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "892:7:67",
@@ -6943,12 +6943,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20380,
+                  "id": 20358,
                   "mutability": "mutable",
                   "name": "dataStateSlotIDStart",
                   "nameLocation": "935:20:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "927:28:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6957,7 +6957,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 20379,
+                    "id": 20357,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "927:7:67",
@@ -6970,12 +6970,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20382,
+                  "id": 20360,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "973:4:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "965:12:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6984,7 +6984,7 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 20381,
+                    "id": 20359,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
                     "src": "965:7:67",
@@ -6999,17 +6999,17 @@
               "src": "825:158:67"
             },
             "returnParameters": {
-              "id": 20386,
+              "id": 20364,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 20385,
+                  "id": 20363,
                   "mutability": "mutable",
                   "name": "slotId",
                   "nameLocation": "1023:6:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20491,
+                  "scope": 20469,
                   "src": "1016:13:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7018,7 +7018,7 @@
                     "typeString": "uint32"
                   },
                   "typeName": {
-                    "id": 20384,
+                    "id": 20362,
                     "name": "uint32",
                     "nodeType": "ElementaryTypeName",
                     "src": "1016:6:67",
@@ -7032,7 +7032,7 @@
               ],
               "src": "1015:15:67"
             },
-            "scope": 20670,
+            "scope": 20648,
             "src": "796:1224:67",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -7040,23 +7040,23 @@
           },
           {
             "body": {
-              "id": 20558,
+              "id": 20536,
               "nodeType": "Block",
               "src": "2185:423:67",
               "statements": [
                 {
                   "assignments": [
-                    20504
+                    20482
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 20504,
+                      "id": 20482,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "2203:10:67",
                       "nodeType": "VariableDeclaration",
-                      "scope": 20558,
+                      "scope": 20536,
                       "src": "2195:18:67",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -7065,7 +7065,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 20503,
+                        "id": 20481,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2195:7:67",
@@ -7077,7 +7077,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 20520,
+                  "id": 20498,
                   "initialValue": {
                     "arguments": [
                       {
@@ -7086,14 +7086,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 20511,
+                                  "id": 20489,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "2273:4:67",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -7101,11 +7101,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 20510,
+                                "id": 20488,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -7117,14 +7117,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 20509,
+                                  "id": 20487,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "2265:7:67",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 20512,
+                              "id": 20490,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -7140,11 +7140,11 @@
                               }
                             },
                             {
-                              "id": 20513,
+                              "id": 20491,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20496,
+                              "referencedDeclaration": 20474,
                               "src": "2292:7:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -7152,11 +7152,11 @@
                               }
                             },
                             {
-                              "id": 20514,
+                              "id": 20492,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20498,
+                              "referencedDeclaration": 20476,
                               "src": "2313:17:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -7165,7 +7165,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 20515,
+                              "id": 20493,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7200,32 +7200,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 20507,
+                              "id": 20485,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20494,
+                              "referencedDeclaration": 20472,
                               "src": "2224:5:67",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 20508,
+                            "id": 20486,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 19338,
+                            "referencedDeclaration": 19316,
                             "src": "2224:27:67",
                             "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": 20516,
+                          "id": 20494,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7240,10 +7240,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 20518,
+                        "id": 20496,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 20517,
+                          "id": 20495,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7276,7 +7276,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 20506,
+                      "id": 20484,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7288,14 +7288,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 20505,
+                        "id": 20483,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2216:7:67",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 20519,
+                    "id": 20497,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7315,17 +7315,17 @@
                 },
                 {
                   "assignments": [
-                    20525
+                    20503
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 20525,
+                      "id": 20503,
                       "mutability": "mutable",
                       "name": "slotData",
                       "nameLocation": "2365:8:67",
                       "nodeType": "VariableDeclaration",
-                      "scope": 20558,
+                      "scope": 20536,
                       "src": "2348:25:67",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -7335,7 +7335,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 20523,
+                          "id": 20501,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2348:7:67",
@@ -7344,7 +7344,7 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 20524,
+                        "id": 20502,
                         "nodeType": "ArrayTypeName",
                         "src": "2348:9:67",
                         "typeDescriptions": {
@@ -7355,12 +7355,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 20531,
+                  "id": 20509,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "31",
-                        "id": 20529,
+                        "id": 20507,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7382,7 +7382,7 @@
                           "typeString": "int_const 1"
                         }
                       ],
-                      "id": 20528,
+                      "id": 20506,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7395,7 +7395,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 20526,
+                          "id": 20504,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2380:7:67",
@@ -7404,7 +7404,7 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 20527,
+                        "id": 20505,
                         "nodeType": "ArrayTypeName",
                         "src": "2380:9:67",
                         "typeDescriptions": {
@@ -7413,7 +7413,7 @@
                         }
                       }
                     },
-                    "id": 20530,
+                    "id": 20508,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -7433,28 +7433,28 @@
                 },
                 {
                   "expression": {
-                    "id": 20548,
+                    "id": 20526,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 20532,
+                        "id": 20510,
                         "name": "slotData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20525,
+                        "referencedDeclaration": 20503,
                         "src": "2402:8:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                           "typeString": "bytes32[] memory"
                         }
                       },
-                      "id": 20534,
+                      "id": 20512,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 20533,
+                        "id": 20511,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7488,17 +7488,17 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 20546,
+                          "id": 20524,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
-                            "id": 20537,
+                            "id": 20515,
                             "name": "subsBitmap",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 20504,
+                            "referencedDeclaration": 20482,
                             "src": "2424:10:67",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -7508,7 +7508,7 @@
                           "nodeType": "BinaryOperation",
                           "operator": "&",
                           "rightExpression": {
-                            "id": 20545,
+                            "id": 20523,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -7524,14 +7524,14 @@
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   },
-                                  "id": 20543,
+                                  "id": 20521,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftExpression": {
                                     "hexValue": "31",
-                                    "id": 20538,
+                                    "id": 20516,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -7550,11 +7550,11 @@
                                   "rightExpression": {
                                     "arguments": [
                                       {
-                                        "id": 20541,
+                                        "id": 20519,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20500,
+                                        "referencedDeclaration": 20478,
                                         "src": "2452:6:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -7569,7 +7569,7 @@
                                           "typeString": "uint32"
                                         }
                                       ],
-                                      "id": 20540,
+                                      "id": 20518,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
@@ -7581,14 +7581,14 @@
                                         "typeString": "type(uint256)"
                                       },
                                       "typeName": {
-                                        "id": 20539,
+                                        "id": 20517,
                                         "name": "uint256",
                                         "nodeType": "ElementaryTypeName",
                                         "src": "2444:7:67",
                                         "typeDescriptions": {}
                                       }
                                     },
-                                    "id": 20542,
+                                    "id": 20520,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -7610,7 +7610,7 @@
                                   }
                                 }
                               ],
-                              "id": 20544,
+                              "id": 20522,
                               "isConstant": false,
                               "isInlineArray": false,
                               "isLValue": false,
@@ -7642,7 +7642,7 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 20536,
+                        "id": 20514,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7654,14 +7654,14 @@
                           "typeString": "type(bytes32)"
                         },
                         "typeName": {
-                          "id": 20535,
+                          "id": 20513,
                           "name": "bytes32",
                           "nodeType": "ElementaryTypeName",
                           "src": "2416:7:67",
                           "typeDescriptions": {}
                         }
                       },
-                      "id": 20547,
+                      "id": 20525,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -7682,7 +7682,7 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "id": 20549,
+                  "id": 20527,
                   "nodeType": "ExpressionStatement",
                   "src": "2402:59:67"
                 },
@@ -7690,11 +7690,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 20553,
+                        "id": 20531,
                         "name": "account",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20496,
+                        "referencedDeclaration": 20474,
                         "src": "2540:7:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -7702,11 +7702,11 @@
                         }
                       },
                       {
-                        "id": 20554,
+                        "id": 20532,
                         "name": "bitmapStateSlotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20498,
+                        "referencedDeclaration": 20476,
                         "src": "2561:17:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -7714,11 +7714,11 @@
                         }
                       },
                       {
-                        "id": 20555,
+                        "id": 20533,
                         "name": "slotData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20525,
+                        "referencedDeclaration": 20503,
                         "src": "2592:8:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -7742,32 +7742,32 @@
                         }
                       ],
                       "expression": {
-                        "id": 20550,
+                        "id": 20528,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20494,
+                        "referencedDeclaration": 20472,
                         "src": "2496:5:67",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                          "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                           "typeString": "contract ISuperfluidToken"
                         }
                       },
-                      "id": 20552,
+                      "id": 20530,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "updateAgreementStateSlot",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 19314,
+                      "referencedDeclaration": 19292,
                       "src": "2496:30:67",
                       "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": 20556,
+                    "id": 20534,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7782,14 +7782,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 20557,
+                  "id": 20535,
                   "nodeType": "ExpressionStatement",
                   "src": "2496:105:67"
                 }
               ]
             },
             "functionSelector": "a9472bf8",
-            "id": 20559,
+            "id": 20537,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -7797,38 +7797,38 @@
             "nameLocation": "2035:9:67",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 20501,
+              "id": 20479,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 20494,
+                  "id": 20472,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "2071:5:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20559,
+                  "scope": 20537,
                   "src": "2054:22:67",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 20493,
+                    "id": 20471,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 20492,
+                      "id": 20470,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19421,
+                      "referencedDeclaration": 19399,
                       "src": "2054:16:67"
                     },
-                    "referencedDeclaration": 19421,
+                    "referencedDeclaration": 19399,
                     "src": "2054:16:67",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -7836,12 +7836,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20496,
+                  "id": 20474,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "2094:7:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20559,
+                  "scope": 20537,
                   "src": "2086:15:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7850,7 +7850,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 20495,
+                    "id": 20473,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "2086:7:67",
@@ -7864,12 +7864,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20498,
+                  "id": 20476,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "2119:17:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20559,
+                  "scope": 20537,
                   "src": "2111:25:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7878,7 +7878,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 20497,
+                    "id": 20475,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2111:7:67",
@@ -7891,12 +7891,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20500,
+                  "id": 20478,
                   "mutability": "mutable",
                   "name": "slotId",
                   "nameLocation": "2153:6:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20559,
+                  "scope": 20537,
                   "src": "2146:13:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7905,7 +7905,7 @@
                     "typeString": "uint32"
                   },
                   "typeName": {
-                    "id": 20499,
+                    "id": 20477,
                     "name": "uint32",
                     "nodeType": "ElementaryTypeName",
                     "src": "2146:6:67",
@@ -7920,12 +7920,12 @@
               "src": "2044:121:67"
             },
             "returnParameters": {
-              "id": 20502,
+              "id": 20480,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "2185:0:67"
             },
-            "scope": 20670,
+            "scope": 20648,
             "src": "2026:582:67",
             "stateMutability": "nonpayable",
             "virtual": false,
@@ -7933,23 +7933,23 @@
           },
           {
             "body": {
-              "id": 20668,
+              "id": 20646,
               "nodeType": "Block",
               "src": "2882:817:67",
               "statements": [
                 {
                   "assignments": [
-                    20578
+                    20556
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 20578,
+                      "id": 20556,
                       "mutability": "mutable",
                       "name": "subsBitmap",
                       "nameLocation": "2900:10:67",
                       "nodeType": "VariableDeclaration",
-                      "scope": 20668,
+                      "scope": 20646,
                       "src": "2892:18:67",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -7958,7 +7958,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 20577,
+                        "id": 20555,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2892:7:67",
@@ -7970,7 +7970,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 20594,
+                  "id": 20572,
                   "initialValue": {
                     "arguments": [
                       {
@@ -7979,14 +7979,14 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 20585,
+                                  "id": 20563,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
                                   "referencedDeclaration": 4294967268,
                                   "src": "2970:4:67",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 }
@@ -7994,11 +7994,11 @@
                               "expression": {
                                 "argumentTypes": [
                                   {
-                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                    "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                     "typeString": "library SlotsBitmapLibrary"
                                   }
                                 ],
-                                "id": 20584,
+                                "id": 20562,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -8010,14 +8010,14 @@
                                   "typeString": "type(address)"
                                 },
                                 "typeName": {
-                                  "id": 20583,
+                                  "id": 20561,
                                   "name": "address",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "2962:7:67",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 20586,
+                              "id": 20564,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8033,11 +8033,11 @@
                               }
                             },
                             {
-                              "id": 20587,
+                              "id": 20565,
                               "name": "account",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20564,
+                              "referencedDeclaration": 20542,
                               "src": "2989:7:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -8045,11 +8045,11 @@
                               }
                             },
                             {
-                              "id": 20588,
+                              "id": 20566,
                               "name": "bitmapStateSlotId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20566,
+                              "referencedDeclaration": 20544,
                               "src": "3010:17:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -8058,7 +8058,7 @@
                             },
                             {
                               "hexValue": "31",
-                              "id": 20589,
+                              "id": 20567,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -8093,32 +8093,32 @@
                               }
                             ],
                             "expression": {
-                              "id": 20581,
+                              "id": 20559,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20562,
+                              "referencedDeclaration": 20540,
                               "src": "2921:5:67",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                 "typeString": "contract ISuperfluidToken"
                               }
                             },
-                            "id": 20582,
+                            "id": 20560,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getAgreementStateSlot",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 19338,
+                            "referencedDeclaration": 19316,
                             "src": "2921:27:67",
                             "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": 20590,
+                          "id": 20568,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8133,10 +8133,10 @@
                             "typeString": "bytes32[] memory"
                           }
                         },
-                        "id": 20592,
+                        "id": 20570,
                         "indexExpression": {
                           "hexValue": "30",
-                          "id": 20591,
+                          "id": 20569,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -8169,7 +8169,7 @@
                           "typeString": "bytes32"
                         }
                       ],
-                      "id": 20580,
+                      "id": 20558,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8181,14 +8181,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 20579,
+                        "id": 20557,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2913:7:67",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 20593,
+                    "id": 20571,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8208,17 +8208,17 @@
                 },
                 {
                   "expression": {
-                    "id": 20601,
+                    "id": 20579,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 20595,
+                      "id": 20573,
                       "name": "slotIds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20572,
+                      "referencedDeclaration": 20550,
                       "src": "3046:7:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint32_$dyn_memory_ptr",
@@ -8230,11 +8230,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 20599,
+                          "id": 20577,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 20371,
+                          "referencedDeclaration": 20349,
                           "src": "3069:14:67",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -8249,7 +8249,7 @@
                             "typeString": "uint32"
                           }
                         ],
-                        "id": 20598,
+                        "id": 20576,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8262,7 +8262,7 @@
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 20596,
+                            "id": 20574,
                             "name": "uint32",
                             "nodeType": "ElementaryTypeName",
                             "src": "3060:6:67",
@@ -8271,7 +8271,7 @@
                               "typeString": "uint32"
                             }
                           },
-                          "id": 20597,
+                          "id": 20575,
                           "nodeType": "ArrayTypeName",
                           "src": "3060:8:67",
                           "typeDescriptions": {
@@ -8280,7 +8280,7 @@
                           }
                         }
                       },
-                      "id": 20600,
+                      "id": 20578,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8301,23 +8301,23 @@
                       "typeString": "uint32[] memory"
                     }
                   },
-                  "id": 20602,
+                  "id": 20580,
                   "nodeType": "ExpressionStatement",
                   "src": "3046:38:67"
                 },
                 {
                   "expression": {
-                    "id": 20609,
+                    "id": 20587,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 20603,
+                      "id": 20581,
                       "name": "dataList",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20575,
+                      "referencedDeclaration": 20553,
                       "src": "3094:8:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
@@ -8329,11 +8329,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 20607,
+                          "id": 20585,
                           "name": "_MAX_NUM_SLOTS",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 20371,
+                          "referencedDeclaration": 20349,
                           "src": "3119:14:67",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint32",
@@ -8348,7 +8348,7 @@
                             "typeString": "uint32"
                           }
                         ],
-                        "id": 20606,
+                        "id": 20584,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8361,7 +8361,7 @@
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 20604,
+                            "id": 20582,
                             "name": "bytes32",
                             "nodeType": "ElementaryTypeName",
                             "src": "3109:7:67",
@@ -8370,7 +8370,7 @@
                               "typeString": "bytes32"
                             }
                           },
-                          "id": 20605,
+                          "id": 20583,
                           "nodeType": "ArrayTypeName",
                           "src": "3109:9:67",
                           "typeDescriptions": {
@@ -8379,7 +8379,7 @@
                           }
                         }
                       },
-                      "id": 20608,
+                      "id": 20586,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8400,23 +8400,23 @@
                       "typeString": "bytes32[] memory"
                     }
                   },
-                  "id": 20610,
+                  "id": 20588,
                   "nodeType": "ExpressionStatement",
                   "src": "3094:40:67"
                 },
                 {
                   "assignments": [
-                    20612
+                    20590
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 20612,
+                      "id": 20590,
                       "mutability": "mutable",
                       "name": "nSlots",
                       "nameLocation": "3175:6:67",
                       "nodeType": "VariableDeclaration",
-                      "scope": 20668,
+                      "scope": 20646,
                       "src": "3170:11:67",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -8425,7 +8425,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 20611,
+                        "id": 20589,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "3170:4:67",
@@ -8437,13 +8437,13 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 20613,
+                  "id": 20591,
                   "nodeType": "VariableDeclarationStatement",
                   "src": "3170:11:67"
                 },
                 {
                   "body": {
-                    "id": 20665,
+                    "id": 20643,
                     "nodeType": "Block",
                     "src": "3250:309:67",
                     "statements": [
@@ -8453,7 +8453,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 20634,
+                          "id": 20612,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8465,7 +8465,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 20631,
+                                "id": 20609,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8477,17 +8477,17 @@
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       },
-                                      "id": 20628,
+                                      "id": 20606,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "leftExpression": {
-                                        "id": 20626,
+                                        "id": 20604,
                                         "name": "subsBitmap",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20578,
+                                        "referencedDeclaration": 20556,
                                         "src": "3277:10:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
@@ -8497,11 +8497,11 @@
                                       "nodeType": "BinaryOperation",
                                       "operator": ">>",
                                       "rightExpression": {
-                                        "id": 20627,
+                                        "id": 20605,
                                         "name": "slotId",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 20615,
+                                        "referencedDeclaration": 20593,
                                         "src": "3291:6:67",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint32",
@@ -8522,7 +8522,7 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 20625,
+                                    "id": 20603,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -8534,14 +8534,14 @@
                                       "typeString": "type(uint256)"
                                     },
                                     "typeName": {
-                                      "id": 20624,
+                                      "id": 20602,
                                       "name": "uint256",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "3269:7:67",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 20629,
+                                  "id": 20607,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -8560,7 +8560,7 @@
                                 "operator": "&",
                                 "rightExpression": {
                                   "hexValue": "31",
-                                  "id": 20630,
+                                  "id": 20608,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -8581,7 +8581,7 @@
                                 }
                               }
                             ],
-                            "id": 20632,
+                            "id": 20610,
                             "isConstant": false,
                             "isInlineArray": false,
                             "isLValue": false,
@@ -8598,7 +8598,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "hexValue": "30",
-                            "id": 20633,
+                            "id": 20611,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -8618,42 +8618,42 @@
                             "typeString": "bool"
                           }
                         },
-                        "id": 20636,
+                        "id": 20614,
                         "nodeType": "IfStatement",
                         "src": "3264:54:67",
                         "trueBody": {
-                          "id": 20635,
+                          "id": 20613,
                           "nodeType": "Continue",
                           "src": "3310:8:67"
                         }
                       },
                       {
                         "expression": {
-                          "id": 20641,
+                          "id": 20619,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "baseExpression": {
-                              "id": 20637,
+                              "id": 20615,
                               "name": "slotIds",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20572,
+                              "referencedDeclaration": 20550,
                               "src": "3332:7:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint32_$dyn_memory_ptr",
                                 "typeString": "uint32[] memory"
                               }
                             },
-                            "id": 20639,
+                            "id": 20617,
                             "indexExpression": {
-                              "id": 20638,
+                              "id": 20616,
                               "name": "nSlots",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20612,
+                              "referencedDeclaration": 20590,
                               "src": "3340:6:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -8674,11 +8674,11 @@
                           "nodeType": "Assignment",
                           "operator": "=",
                           "rightHandSide": {
-                            "id": 20640,
+                            "id": 20618,
                             "name": "slotId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 20615,
+                            "referencedDeclaration": 20593,
                             "src": "3350:6:67",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint32",
@@ -8691,37 +8691,37 @@
                             "typeString": "uint32"
                           }
                         },
-                        "id": 20642,
+                        "id": 20620,
                         "nodeType": "ExpressionStatement",
                         "src": "3332:24:67"
                       },
                       {
                         "expression": {
-                          "id": 20660,
+                          "id": 20638,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "baseExpression": {
-                              "id": 20643,
+                              "id": 20621,
                               "name": "dataList",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20575,
+                              "referencedDeclaration": 20553,
                               "src": "3370:8:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr",
                                 "typeString": "bytes32[] memory"
                               }
                             },
-                            "id": 20645,
+                            "id": 20623,
                             "indexExpression": {
-                              "id": 20644,
+                              "id": 20622,
                               "name": "nSlots",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 20612,
+                              "referencedDeclaration": 20590,
                               "src": "3379:6:67",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -8747,14 +8747,14 @@
                                 {
                                   "arguments": [
                                     {
-                                      "id": 20650,
+                                      "id": 20628,
                                       "name": "this",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
                                       "referencedDeclaration": 4294967268,
                                       "src": "3442:4:67",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                         "typeString": "library SlotsBitmapLibrary"
                                       }
                                     }
@@ -8762,11 +8762,11 @@
                                   "expression": {
                                     "argumentTypes": [
                                       {
-                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20670",
+                                        "typeIdentifier": "t_contract$_SlotsBitmapLibrary_$20648",
                                         "typeString": "library SlotsBitmapLibrary"
                                       }
                                     ],
-                                    "id": 20649,
+                                    "id": 20627,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -8778,14 +8778,14 @@
                                       "typeString": "type(address)"
                                     },
                                     "typeName": {
-                                      "id": 20648,
+                                      "id": 20626,
                                       "name": "address",
                                       "nodeType": "ElementaryTypeName",
                                       "src": "3434:7:67",
                                       "typeDescriptions": {}
                                     }
                                   },
-                                  "id": 20651,
+                                  "id": 20629,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -8801,11 +8801,11 @@
                                   }
                                 },
                                 {
-                                  "id": 20652,
+                                  "id": 20630,
                                   "name": "account",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 20564,
+                                  "referencedDeclaration": 20542,
                                   "src": "3465:7:67",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
@@ -8817,17 +8817,17 @@
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   },
-                                  "id": 20655,
+                                  "id": 20633,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftExpression": {
-                                    "id": 20653,
+                                    "id": 20631,
                                     "name": "dataStateSlotIDStart",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20568,
+                                    "referencedDeclaration": 20546,
                                     "src": "3490:20:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -8837,11 +8837,11 @@
                                   "nodeType": "BinaryOperation",
                                   "operator": "+",
                                   "rightExpression": {
-                                    "id": 20654,
+                                    "id": 20632,
                                     "name": "slotId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 20615,
+                                    "referencedDeclaration": 20593,
                                     "src": "3513:6:67",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint32",
@@ -8856,7 +8856,7 @@
                                 },
                                 {
                                   "hexValue": "31",
-                                  "id": 20656,
+                                  "id": 20634,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -8891,32 +8891,32 @@
                                   }
                                 ],
                                 "expression": {
-                                  "id": 20646,
+                                  "id": 20624,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 20562,
+                                  "referencedDeclaration": 20540,
                                   "src": "3389:5:67",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                                     "typeString": "contract ISuperfluidToken"
                                   }
                                 },
-                                "id": 20647,
+                                "id": 20625,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "getAgreementStateSlot",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 19338,
+                                "referencedDeclaration": 19316,
                                 "src": "3389:27:67",
                                 "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": 20657,
+                              "id": 20635,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8931,10 +8931,10 @@
                                 "typeString": "bytes32[] memory"
                               }
                             },
-                            "id": 20659,
+                            "id": 20637,
                             "indexExpression": {
                               "hexValue": "30",
-                              "id": 20658,
+                              "id": 20636,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -8965,13 +8965,13 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 20661,
+                        "id": 20639,
                         "nodeType": "ExpressionStatement",
                         "src": "3370:156:67"
                       },
                       {
                         "expression": {
-                          "id": 20663,
+                          "id": 20641,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8981,11 +8981,11 @@
                           "prefix": true,
                           "src": "3540:8:67",
                           "subExpression": {
-                            "id": 20662,
+                            "id": 20640,
                             "name": "nSlots",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 20612,
+                            "referencedDeclaration": 20590,
                             "src": "3542:6:67",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -8997,7 +8997,7 @@
                             "typeString": "uint256"
                           }
                         },
-                        "id": 20664,
+                        "id": 20642,
                         "nodeType": "ExpressionStatement",
                         "src": "3540:8:67"
                       }
@@ -9008,17 +9008,17 @@
                       "typeIdentifier": "t_uint32",
                       "typeString": "uint32"
                     },
-                    "id": 20620,
+                    "id": 20598,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 20618,
+                      "id": 20596,
                       "name": "slotId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20615,
+                      "referencedDeclaration": 20593,
                       "src": "3215:6:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -9028,11 +9028,11 @@
                     "nodeType": "BinaryOperation",
                     "operator": "<",
                     "rightExpression": {
-                      "id": 20619,
+                      "id": 20597,
                       "name": "_MAX_NUM_SLOTS",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 20371,
+                      "referencedDeclaration": 20349,
                       "src": "3224:14:67",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint32",
@@ -9045,20 +9045,20 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 20666,
+                  "id": 20644,
                   "initializationExpression": {
                     "assignments": [
-                      20615
+                      20593
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 20615,
+                        "id": 20593,
                         "mutability": "mutable",
                         "name": "slotId",
                         "nameLocation": "3203:6:67",
                         "nodeType": "VariableDeclaration",
-                        "scope": 20666,
+                        "scope": 20644,
                         "src": "3196:13:67",
                         "stateVariable": false,
                         "storageLocation": "default",
@@ -9067,7 +9067,7 @@
                           "typeString": "uint32"
                         },
                         "typeName": {
-                          "id": 20614,
+                          "id": 20592,
                           "name": "uint32",
                           "nodeType": "ElementaryTypeName",
                           "src": "3196:6:67",
@@ -9079,10 +9079,10 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 20617,
+                    "id": 20595,
                     "initialValue": {
                       "hexValue": "30",
-                      "id": 20616,
+                      "id": 20594,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -9101,7 +9101,7 @@
                   },
                   "loopExpression": {
                     "expression": {
-                      "id": 20622,
+                      "id": 20600,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -9111,11 +9111,11 @@
                       "prefix": true,
                       "src": "3240:8:67",
                       "subExpression": {
-                        "id": 20621,
+                        "id": 20599,
                         "name": "slotId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 20615,
+                        "referencedDeclaration": 20593,
                         "src": "3242:6:67",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint32",
@@ -9127,7 +9127,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 20623,
+                    "id": 20601,
                     "nodeType": "ExpressionStatement",
                     "src": "3240:8:67"
                   },
@@ -9194,42 +9194,42 @@
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 20575,
+                      "declaration": 20553,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3666:8:67",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 20612,
+                      "declaration": 20590,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3639:6:67",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 20612,
+                      "declaration": 20590,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3676:6:67",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 20572,
+                      "declaration": 20550,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3630:7:67",
                       "valueSize": 1
                     }
                   ],
-                  "id": 20667,
+                  "id": 20645,
                   "nodeType": "InlineAssembly",
                   "src": "3600:93:67"
                 }
               ]
             },
             "functionSelector": "06967a8c",
-            "id": 20669,
+            "id": 20647,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
@@ -9237,38 +9237,38 @@
             "nameLocation": "2623:8:67",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 20569,
+              "id": 20547,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 20562,
+                  "id": 20540,
                   "mutability": "mutable",
                   "name": "token",
                   "nameLocation": "2657:5:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2640:22:67",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                    "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                     "typeString": "contract ISuperfluidToken"
                   },
                   "typeName": {
-                    "id": 20561,
+                    "id": 20539,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 20560,
+                      "id": 20538,
                       "name": "ISuperfluidToken",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 19421,
+                      "referencedDeclaration": 19399,
                       "src": "2640:16:67"
                     },
-                    "referencedDeclaration": 19421,
+                    "referencedDeclaration": 19399,
                     "src": "2640:16:67",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19421",
+                      "typeIdentifier": "t_contract$_ISuperfluidToken_$19399",
                       "typeString": "contract ISuperfluidToken"
                     }
                   },
@@ -9276,12 +9276,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20564,
+                  "id": 20542,
                   "mutability": "mutable",
                   "name": "account",
                   "nameLocation": "2679:7:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2671:15:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9290,7 +9290,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 20563,
+                    "id": 20541,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "2671:7:67",
@@ -9304,12 +9304,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20566,
+                  "id": 20544,
                   "mutability": "mutable",
                   "name": "bitmapStateSlotId",
                   "nameLocation": "2703:17:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2695:25:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9318,7 +9318,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 20565,
+                    "id": 20543,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2695:7:67",
@@ -9331,12 +9331,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20568,
+                  "id": 20546,
                   "mutability": "mutable",
                   "name": "dataStateSlotIDStart",
                   "nameLocation": "2737:20:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2729:28:67",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9345,7 +9345,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 20567,
+                    "id": 20545,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2729:7:67",
@@ -9360,17 +9360,17 @@
               "src": "2631:132:67"
             },
             "returnParameters": {
-              "id": 20576,
+              "id": 20554,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 20572,
+                  "id": 20550,
                   "mutability": "mutable",
                   "name": "slotIds",
                   "nameLocation": "2830:7:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2814:23:67",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -9380,7 +9380,7 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 20570,
+                      "id": 20548,
                       "name": "uint32",
                       "nodeType": "ElementaryTypeName",
                       "src": "2814:6:67",
@@ -9389,7 +9389,7 @@
                         "typeString": "uint32"
                       }
                     },
-                    "id": 20571,
+                    "id": 20549,
                     "nodeType": "ArrayTypeName",
                     "src": "2814:8:67",
                     "typeDescriptions": {
@@ -9401,12 +9401,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 20575,
+                  "id": 20553,
                   "mutability": "mutable",
                   "name": "dataList",
                   "nameLocation": "2868:8:67",
                   "nodeType": "VariableDeclaration",
-                  "scope": 20669,
+                  "scope": 20647,
                   "src": "2851:25:67",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -9416,7 +9416,7 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 20573,
+                      "id": 20551,
                       "name": "bytes32",
                       "nodeType": "ElementaryTypeName",
                       "src": "2851:7:67",
@@ -9425,7 +9425,7 @@
                         "typeString": "bytes32"
                       }
                     },
-                    "id": 20574,
+                    "id": 20552,
                     "nodeType": "ArrayTypeName",
                     "src": "2851:9:67",
                     "typeDescriptions": {
@@ -9438,14 +9438,14 @@
               ],
               "src": "2800:77:67"
             },
-            "scope": 20670,
+            "scope": 20648,
             "src": "2614:1085:67",
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           }
         ],
-        "scope": 20671,
+        "scope": 20649,
         "src": "710:2991:67",
         "usedErrors": []
       }
@@ -9458,7 +9458,7 @@
   },
   "networks": {},
   "schemaVersion": "3.4.7",
-  "updatedAt": "2022-05-05T13:57:31.283Z",
+  "updatedAt": "2022-05-06T12:43:05.462Z",
   "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",