@latticexyz/world-modules 2.0.0-main-08d7c471 → 2.0.0-main-9ff4f451

package/out/src/WorldContext.sol/WorldContextProviderLib.json

@@ -358,41 +358,41 @@
   },
   "ast": {
     "absolutePath": "node_modules/@latticexyz/world/src/WorldContext.sol",
-    "id": 42209,
+    "id": 42227,
     "exportedSymbols": {
       "CONTEXT_BYTES": [
-        41960
+        41978
       ],
       "ERC165_INTERFACE_ID": [
-        75587
+        75623
       ],
       "IWorldContextConsumer": [
-        75640
+        75676
       ],
       "StoreSwitch": [
-        33808
+        33826
       ],
       "WORLD_CONTEXT_CONSUMER_INTERFACE_ID": [
-        75618
+        75654
       ],
       "WorldContextConsumer": [
-        42014
+        42032
       ],
       "WorldContextConsumerLib": [
-        42054
+        42072
       ],
       "WorldContextProviderLib": [
-        42208
+        42226
       ],
       "revertWithBytes": [
-        48971
+        49007
       ]
     },
     "nodeType": "SourceUnit",
     "src": "32:8156:100",
     "nodes": [
       {
-        "id": 41946,
+        "id": 41964,
         "nodeType": "PragmaDirective",
         "src": "32:25:100",
         "nodes": [],
@@ -404,23 +404,23 @@
         ]
       },
       {
-        "id": 41948,
+        "id": 41966,
         "nodeType": "ImportDirective",
         "src": "59:68:100",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/store/src/StoreSwitch.sol",
         "file": "@latticexyz/store/src/StoreSwitch.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 42209,
-        "sourceUnit": 33809,
+        "scope": 42227,
+        "sourceUnit": 33827,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 41947,
+              "id": 41965,
               "name": "StoreSwitch",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 33808,
+              "referencedDeclaration": 33826,
               "src": "68:11:100",
               "typeDescriptions": {}
             },
@@ -430,23 +430,23 @@
         "unitAlias": ""
       },
       {
-        "id": 41950,
+        "id": 41968,
         "nodeType": "ImportDirective",
         "src": "128:56:100",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/world/src/revertWithBytes.sol",
         "file": "./revertWithBytes.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 42209,
-        "sourceUnit": 48972,
+        "scope": 42227,
+        "sourceUnit": 49008,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 41949,
+              "id": 41967,
               "name": "revertWithBytes",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 48971,
+              "referencedDeclaration": 49007,
               "src": "137:15:100",
               "typeDescriptions": {}
             },
@@ -456,23 +456,23 @@
         "unitAlias": ""
       },
       {
-        "id": 41952,
+        "id": 41970,
         "nodeType": "ImportDirective",
         "src": "185:52:100",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/world/src/IERC165.sol",
         "file": "./IERC165.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 42209,
-        "sourceUnit": 75598,
+        "scope": 42227,
+        "sourceUnit": 75634,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 41951,
+              "id": 41969,
               "name": "ERC165_INTERFACE_ID",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 75587,
+              "referencedDeclaration": 75623,
               "src": "194:19:100",
               "typeDescriptions": {}
             },
@@ -482,23 +482,23 @@
         "unitAlias": ""
       },
       {
-        "id": 41955,
+        "id": 41973,
         "nodeType": "ImportDirective",
         "src": "238:105:100",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/world/src/IWorldContextConsumer.sol",
         "file": "./IWorldContextConsumer.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 42209,
-        "sourceUnit": 75641,
+        "scope": 42227,
+        "sourceUnit": 75677,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 41953,
+              "id": 41971,
               "name": "IWorldContextConsumer",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 75640,
+              "referencedDeclaration": 75676,
               "src": "247:21:100",
               "typeDescriptions": {}
             },
@@ -506,11 +506,11 @@
           },
           {
             "foreign": {
-              "id": 41954,
+              "id": 41972,
               "name": "WORLD_CONTEXT_CONSUMER_INTERFACE_ID",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 75618,
+              "referencedDeclaration": 75654,
               "src": "270:35:100",
               "typeDescriptions": {}
             },
@@ -520,7 +520,7 @@
         "unitAlias": ""
       },
       {
-        "id": 41960,
+        "id": 41978,
         "nodeType": "VariableDeclaration",
         "src": "420:40:100",
         "nodes": [],
@@ -528,7 +528,7 @@
         "mutability": "constant",
         "name": "CONTEXT_BYTES",
         "nameLocation": "437:13:100",
-        "scope": 42209,
+        "scope": 42227,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -536,7 +536,7 @@
           "typeString": "uint256"
         },
         "typeName": {
-          "id": 41956,
+          "id": 41974,
           "name": "uint256",
           "nodeType": "ElementaryTypeName",
           "src": "420:7:100",
@@ -550,14 +550,14 @@
             "typeIdentifier": "t_rational_52_by_1",
             "typeString": "int_const 52"
           },
-          "id": 41959,
+          "id": 41977,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
           "lValueRequested": false,
           "leftExpression": {
             "hexValue": "3230",
-            "id": 41957,
+            "id": 41975,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -575,7 +575,7 @@
           "operator": "+",
           "rightExpression": {
             "hexValue": "3332",
-            "id": 41958,
+            "id": 41976,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -598,17 +598,17 @@
         "visibility": "internal"
       },
       {
-        "id": 42014,
+        "id": 42032,
         "nodeType": "ContractDefinition",
         "src": "937:1564:100",
         "nodes": [
           {
-            "id": 41974,
+            "id": 41992,
             "nodeType": "FunctionDefinition",
             "src": "1245:113:100",
             "nodes": [],
             "body": {
-              "id": 41973,
+              "id": 41991,
               "nodeType": "Block",
               "src": "1304:54:100",
               "nodes": [],
@@ -619,18 +619,18 @@
                     "expression": {
                       "argumentTypes": [],
                       "expression": {
-                        "id": 41969,
+                        "id": 41987,
                         "name": "WorldContextConsumerLib",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42054,
+                        "referencedDeclaration": 42072,
                         "src": "1317:23:100",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$42054_$",
+                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$42072_$",
                           "typeString": "type(library WorldContextConsumerLib)"
                         }
                       },
-                      "id": 41970,
+                      "id": 41988,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -638,14 +638,14 @@
                       "memberLocation": "1341:10:100",
                       "memberName": "_msgSender",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 42034,
+                      "referencedDeclaration": 42052,
                       "src": "1317:34:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
                         "typeString": "function () view returns (address)"
                       }
                     },
-                    "id": 41971,
+                    "id": 41989,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -661,18 +661,18 @@
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 41968,
-                  "id": 41972,
+                  "functionReturnParameters": 41986,
+                  "id": 41990,
                   "nodeType": "Return",
                   "src": "1310:43:100"
                 }
               ]
             },
             "baseFunctions": [
-              75627
+              75663
             ],
             "documentation": {
-              "id": 41964,
+              "id": 41982,
               "nodeType": "StructuredDocumentation",
               "src": "1005:237:100",
               "text": " @notice Extract the `msg.sender` from the context appended to the calldata.\n @return sender The `msg.sender` in the call to the World contract before the World routed the\n call to the WorldContextConsumer contract."
@@ -684,23 +684,23 @@
             "name": "_msgSender",
             "nameLocation": "1254:10:100",
             "parameters": {
-              "id": 41965,
+              "id": 41983,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1264:2:100"
             },
             "returnParameters": {
-              "id": 41968,
+              "id": 41986,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 41967,
+                  "id": 41985,
                   "mutability": "mutable",
                   "name": "sender",
                   "nameLocation": "1296:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 41974,
+                  "scope": 41992,
                   "src": "1288:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -709,7 +709,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 41966,
+                    "id": 41984,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1288:7:100",
@@ -724,18 +724,18 @@
               ],
               "src": "1287:16:100"
             },
-            "scope": 42014,
+            "scope": 42032,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 41985,
+            "id": 42003,
             "nodeType": "FunctionDefinition",
             "src": "1599:110:100",
             "nodes": [],
             "body": {
-              "id": 41984,
+              "id": 42002,
               "nodeType": "Block",
               "src": "1656:53:100",
               "nodes": [],
@@ -746,18 +746,18 @@
                     "expression": {
                       "argumentTypes": [],
                       "expression": {
-                        "id": 41980,
+                        "id": 41998,
                         "name": "WorldContextConsumerLib",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42054,
+                        "referencedDeclaration": 42072,
                         "src": "1669:23:100",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$42054_$",
+                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$42072_$",
                           "typeString": "type(library WorldContextConsumerLib)"
                         }
                       },
-                      "id": 41981,
+                      "id": 41999,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -765,14 +765,14 @@
                       "memberLocation": "1693:9:100",
                       "memberName": "_msgValue",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 42042,
+                      "referencedDeclaration": 42060,
                       "src": "1669:33:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_pure$__$returns$_t_uint256_$",
                         "typeString": "function () pure returns (uint256)"
                       }
                     },
-                    "id": 41982,
+                    "id": 42000,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -788,18 +788,18 @@
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 41979,
-                  "id": 41983,
+                  "functionReturnParameters": 41997,
+                  "id": 42001,
                   "nodeType": "Return",
                   "src": "1662:42:100"
                 }
               ]
             },
             "baseFunctions": [
-              75633
+              75669
             ],
             "documentation": {
-              "id": 41975,
+              "id": 41993,
               "nodeType": "StructuredDocumentation",
               "src": "1362:234:100",
               "text": " @notice Extract the `msg.value` from the context appended to the calldata.\n @return value The `msg.value` in the call to the World contract before the World routed the\n call to the WorldContextConsumer contract."
@@ -811,23 +811,23 @@
             "name": "_msgValue",
             "nameLocation": "1608:9:100",
             "parameters": {
-              "id": 41976,
+              "id": 41994,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1617:2:100"
             },
             "returnParameters": {
-              "id": 41979,
+              "id": 41997,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 41978,
+                  "id": 41996,
                   "mutability": "mutable",
                   "name": "value",
                   "nameLocation": "1649:5:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 41985,
+                  "scope": 42003,
                   "src": "1641:13:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -836,7 +836,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 41977,
+                    "id": 41995,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "1641:7:100",
@@ -850,18 +850,18 @@
               ],
               "src": "1640:15:100"
             },
-            "scope": 42014,
+            "scope": 42032,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 41996,
+            "id": 42014,
             "nodeType": "FunctionDefinition",
             "src": "1925:95:100",
             "nodes": [],
             "body": {
-              "id": 41995,
+              "id": 42013,
               "nodeType": "Block",
               "src": "1973:47:100",
               "nodes": [],
@@ -872,18 +872,18 @@
                     "expression": {
                       "argumentTypes": [],
                       "expression": {
-                        "id": 41991,
+                        "id": 42009,
                         "name": "StoreSwitch",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 33808,
+                        "referencedDeclaration": 33826,
                         "src": "1986:11:100",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$33808_$",
+                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$33826_$",
                           "typeString": "type(library StoreSwitch)"
                         }
                       },
-                      "id": 41992,
+                      "id": 42010,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -891,14 +891,14 @@
                       "memberLocation": "1998:15:100",
                       "memberName": "getStoreAddress",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 32552,
+                      "referencedDeclaration": 32570,
                       "src": "1986:27:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
                         "typeString": "function () view returns (address)"
                       }
                     },
-                    "id": 41993,
+                    "id": 42011,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -914,18 +914,18 @@
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 41990,
-                  "id": 41994,
+                  "functionReturnParameters": 42008,
+                  "id": 42012,
                   "nodeType": "Return",
                   "src": "1979:36:100"
                 }
               ]
             },
             "baseFunctions": [
-              75639
+              75675
             ],
             "documentation": {
-              "id": 41986,
+              "id": 42004,
               "nodeType": "StructuredDocumentation",
               "src": "1713:209:100",
               "text": " @notice Get the address of the World contract that routed the call to this WorldContextConsumer.\n @return The address of the World contract that routed the call to this WorldContextConsumer."
@@ -937,23 +937,23 @@
             "name": "_world",
             "nameLocation": "1934:6:100",
             "parameters": {
-              "id": 41987,
+              "id": 42005,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1940:2:100"
             },
             "returnParameters": {
-              "id": 41990,
+              "id": 42008,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 41989,
+                  "id": 42007,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 41996,
+                  "scope": 42014,
                   "src": "1964:7:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -962,7 +962,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 41988,
+                    "id": 42006,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1964:7:100",
@@ -977,18 +977,18 @@
               ],
               "src": "1963:9:100"
             },
-            "scope": 42014,
+            "scope": 42032,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 42013,
+            "id": 42031,
             "nodeType": "FunctionDefinition",
             "src": "2311:188:100",
             "nodes": [],
             "body": {
-              "id": 42012,
+              "id": 42030,
               "nodeType": "Block",
               "src": "2393:106:100",
               "nodes": [],
@@ -999,7 +999,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 42010,
+                    "id": 42028,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1009,17 +1009,17 @@
                         "typeIdentifier": "t_bytes4",
                         "typeString": "bytes4"
                       },
-                      "id": 42006,
+                      "id": 42024,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 42004,
+                        "id": 42022,
                         "name": "interfaceId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 41999,
+                        "referencedDeclaration": 42017,
                         "src": "2406:11:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
@@ -1029,11 +1029,11 @@
                       "nodeType": "BinaryOperation",
                       "operator": "==",
                       "rightExpression": {
-                        "id": 42005,
+                        "id": 42023,
                         "name": "WORLD_CONTEXT_CONSUMER_INTERFACE_ID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 75618,
+                        "referencedDeclaration": 75654,
                         "src": "2421:35:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
@@ -1053,17 +1053,17 @@
                         "typeIdentifier": "t_bytes4",
                         "typeString": "bytes4"
                       },
-                      "id": 42009,
+                      "id": 42027,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 42007,
+                        "id": 42025,
                         "name": "interfaceId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 41999,
+                        "referencedDeclaration": 42017,
                         "src": "2460:11:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
@@ -1073,11 +1073,11 @@
                       "nodeType": "BinaryOperation",
                       "operator": "==",
                       "rightExpression": {
-                        "id": 42008,
+                        "id": 42026,
                         "name": "ERC165_INTERFACE_ID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 75587,
+                        "referencedDeclaration": 75623,
                         "src": "2475:19:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
@@ -1096,18 +1096,18 @@
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 42003,
-                  "id": 42011,
+                  "functionReturnParameters": 42021,
+                  "id": 42029,
                   "nodeType": "Return",
                   "src": "2399:95:100"
                 }
               ]
             },
             "baseFunctions": [
-              75596
+              75632
             ],
             "documentation": {
-              "id": 41997,
+              "id": 42015,
               "nodeType": "StructuredDocumentation",
               "src": "2024:284:100",
               "text": " @notice Checks if an interface is supported by the contract.\n using ERC-165 supportsInterface (see https://eips.ethereum.org/EIPS/eip-165)\n @param interfaceId The ID of the interface in question.\n @return True if the interface is supported, false otherwise."
@@ -1119,17 +1119,17 @@
             "name": "supportsInterface",
             "nameLocation": "2320:17:100",
             "parameters": {
-              "id": 42000,
+              "id": 42018,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 41999,
+                  "id": 42017,
                   "mutability": "mutable",
                   "name": "interfaceId",
                   "nameLocation": "2345:11:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42013,
+                  "scope": 42031,
                   "src": "2338:18:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1138,7 +1138,7 @@
                     "typeString": "bytes4"
                   },
                   "typeName": {
-                    "id": 41998,
+                    "id": 42016,
                     "name": "bytes4",
                     "nodeType": "ElementaryTypeName",
                     "src": "2338:6:100",
@@ -1153,17 +1153,17 @@
               "src": "2337:20:100"
             },
             "returnParameters": {
-              "id": 42003,
+              "id": 42021,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42002,
+                  "id": 42020,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42013,
+                  "scope": 42031,
                   "src": "2387:4:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1172,7 +1172,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 42001,
+                    "id": 42019,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "2387:4:100",
@@ -1186,7 +1186,7 @@
               ],
               "src": "2386:6:100"
             },
-            "scope": 42014,
+            "scope": 42032,
             "stateMutability": "pure",
             "virtual": true,
             "visibility": "public"
@@ -1196,16 +1196,16 @@
         "baseContracts": [
           {
             "baseName": {
-              "id": 41962,
+              "id": 41980,
               "name": "IWorldContextConsumer",
               "nameLocations": [
                 "979:21:100"
               ],
               "nodeType": "IdentifierPath",
-              "referencedDeclaration": 75640,
+              "referencedDeclaration": 75676,
               "src": "979:21:100"
             },
-            "id": 41963,
+            "id": 41981,
             "nodeType": "InheritanceSpecifier",
             "src": "979:21:100"
           }
@@ -1214,35 +1214,35 @@
         "contractDependencies": [],
         "contractKind": "contract",
         "documentation": {
-          "id": 41961,
+          "id": 41979,
           "nodeType": "StructuredDocumentation",
           "src": "463:473:100",
           "text": " @title WorldContextConsumer - Extracting trusted context values from appended calldata.\n @notice This contract is designed to extract trusted context values (like msg.sender and msg.value)\n from the appended calldata. It provides mechanisms similar to EIP-2771 (https://eips.ethereum.org/EIPS/eip-2771),\n but allowing any contract to be the trusted forwarder.\n @dev This contract should only be used for contracts without their own storage, like Systems."
         },
         "fullyImplemented": true,
         "linearizedBaseContracts": [
-          42014,
-          75640,
-          75597
+          42032,
+          75676,
+          75633
         ],
         "name": "WorldContextConsumer",
         "nameLocation": "955:20:100",
-        "scope": 42209,
+        "scope": 42227,
         "usedErrors": [],
         "usedEvents": []
       },
       {
-        "id": 42054,
+        "id": 42072,
         "nodeType": "ContractDefinition",
         "src": "2503:1427:100",
         "nodes": [
           {
-            "id": 42034,
+            "id": 42052,
             "nodeType": "FunctionDefinition",
             "src": "2779:381:100",
             "nodes": [],
             "body": {
-              "id": 42033,
+              "id": 42051,
               "nodeType": "Block",
               "src": "2840:320:100",
               "nodes": [],
@@ -1336,21 +1336,21 @@
                   "evmVersion": "paris",
                   "externalReferences": [
                     {
-                      "declaration": 41960,
+                      "declaration": 41978,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3083:13:100",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 42018,
+                      "declaration": 42036,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3032:6:100",
                       "valueSize": 1
                     }
                   ],
-                  "id": 42020,
+                  "id": 42038,
                   "nodeType": "InlineAssembly",
                   "src": "2846:259:100"
                 },
@@ -1360,17 +1360,17 @@
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "id": 42026,
+                    "id": 42044,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 42021,
+                      "id": 42039,
                       "name": "sender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 42018,
+                      "referencedDeclaration": 42036,
                       "src": "3114:6:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -1383,7 +1383,7 @@
                       "arguments": [
                         {
                           "hexValue": "30",
-                          "id": 42024,
+                          "id": 42042,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1405,7 +1405,7 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 42023,
+                        "id": 42041,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1417,14 +1417,14 @@
                           "typeString": "type(address)"
                         },
                         "typeName": {
-                          "id": 42022,
+                          "id": 42040,
                           "name": "address",
                           "nodeType": "ElementaryTypeName",
                           "src": "3124:7:100",
                           "typeDescriptions": {}
                         }
                       },
-                      "id": 42025,
+                      "id": 42043,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1446,22 +1446,22 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 42032,
+                  "id": 42050,
                   "nodeType": "IfStatement",
                   "src": "3110:45:100",
                   "trueBody": {
                     "expression": {
-                      "id": 42030,
+                      "id": 42048,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
-                        "id": 42027,
+                        "id": 42045,
                         "name": "sender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42018,
+                        "referencedDeclaration": 42036,
                         "src": "3136:6:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -1472,7 +1472,7 @@
                       "operator": "=",
                       "rightHandSide": {
                         "expression": {
-                          "id": 42028,
+                          "id": 42046,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
@@ -1483,7 +1483,7 @@
                             "typeString": "msg"
                           }
                         },
-                        "id": 42029,
+                        "id": 42047,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1503,7 +1503,7 @@
                         "typeString": "address"
                       }
                     },
-                    "id": 42031,
+                    "id": 42049,
                     "nodeType": "ExpressionStatement",
                     "src": "3136:19:100"
                   }
@@ -1511,7 +1511,7 @@
               ]
             },
             "documentation": {
-              "id": 42015,
+              "id": 42033,
               "nodeType": "StructuredDocumentation",
               "src": "2539:237:100",
               "text": " @notice Extract the `msg.sender` from the context appended to the calldata.\n @return sender The `msg.sender` in the call to the World contract before the World routed the\n call to the WorldContextConsumer contract."
@@ -1522,23 +1522,23 @@
             "name": "_msgSender",
             "nameLocation": "2788:10:100",
             "parameters": {
-              "id": 42016,
+              "id": 42034,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "2798:2:100"
             },
             "returnParameters": {
-              "id": 42019,
+              "id": 42037,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42018,
+                  "id": 42036,
                   "mutability": "mutable",
                   "name": "sender",
                   "nameLocation": "2832:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42034,
+                  "scope": 42052,
                   "src": "2824:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1547,7 +1547,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42017,
+                    "id": 42035,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "2824:7:100",
@@ -1562,18 +1562,18 @@
               ],
               "src": "2823:16:100"
             },
-            "scope": 42054,
+            "scope": 42072,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42042,
+            "id": 42060,
             "nodeType": "FunctionDefinition",
             "src": "3401:214:100",
             "nodes": [],
             "body": {
-              "id": 42041,
+              "id": 42059,
               "nodeType": "Block",
               "src": "3460:155:100",
               "nodes": [],
@@ -1648,21 +1648,21 @@
                   "evmVersion": "paris",
                   "externalReferences": [
                     {
-                      "declaration": 42038,
+                      "declaration": 42056,
                       "isOffset": false,
                       "isSlot": false,
                       "src": "3559:5:100",
                       "valueSize": 1
                     }
                   ],
-                  "id": 42040,
+                  "id": 42058,
                   "nodeType": "InlineAssembly",
                   "src": "3466:145:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42035,
+              "id": 42053,
               "nodeType": "StructuredDocumentation",
               "src": "3164:234:100",
               "text": " @notice Extract the `msg.value` from the context appended to the calldata.\n @return value The `msg.value` in the call to the World contract before the World routed the\n call to the WorldContextConsumer contract."
@@ -1673,23 +1673,23 @@
             "name": "_msgValue",
             "nameLocation": "3410:9:100",
             "parameters": {
-              "id": 42036,
+              "id": 42054,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "3419:2:100"
             },
             "returnParameters": {
-              "id": 42039,
+              "id": 42057,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42038,
+                  "id": 42056,
                   "mutability": "mutable",
                   "name": "value",
                   "nameLocation": "3453:5:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42042,
+                  "scope": 42060,
                   "src": "3445:13:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1698,7 +1698,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42037,
+                    "id": 42055,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3445:7:100",
@@ -1712,18 +1712,18 @@
               ],
               "src": "3444:15:100"
             },
-            "scope": 42054,
+            "scope": 42072,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42053,
+            "id": 42071,
             "nodeType": "FunctionDefinition",
             "src": "3831:97:100",
             "nodes": [],
             "body": {
-              "id": 42052,
+              "id": 42070,
               "nodeType": "Block",
               "src": "3881:47:100",
               "nodes": [],
@@ -1734,18 +1734,18 @@
                     "expression": {
                       "argumentTypes": [],
                       "expression": {
-                        "id": 42048,
+                        "id": 42066,
                         "name": "StoreSwitch",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 33808,
+                        "referencedDeclaration": 33826,
                         "src": "3894:11:100",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$33808_$",
+                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$33826_$",
                           "typeString": "type(library StoreSwitch)"
                         }
                       },
-                      "id": 42049,
+                      "id": 42067,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1753,14 +1753,14 @@
                       "memberLocation": "3906:15:100",
                       "memberName": "getStoreAddress",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 32552,
+                      "referencedDeclaration": 32570,
                       "src": "3894:27:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
                         "typeString": "function () view returns (address)"
                       }
                     },
-                    "id": 42050,
+                    "id": 42068,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1776,15 +1776,15 @@
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 42047,
-                  "id": 42051,
+                  "functionReturnParameters": 42065,
+                  "id": 42069,
                   "nodeType": "Return",
                   "src": "3887:36:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42043,
+              "id": 42061,
               "nodeType": "StructuredDocumentation",
               "src": "3619:209:100",
               "text": " @notice Get the address of the World contract that routed the call to this WorldContextConsumer.\n @return The address of the World contract that routed the call to this WorldContextConsumer."
@@ -1795,23 +1795,23 @@
             "name": "_world",
             "nameLocation": "3840:6:100",
             "parameters": {
-              "id": 42044,
+              "id": 42062,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "3846:2:100"
             },
             "returnParameters": {
-              "id": 42047,
+              "id": 42065,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42046,
+                  "id": 42064,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42053,
+                  "scope": 42071,
                   "src": "3872:7:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1820,7 +1820,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42045,
+                    "id": 42063,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3872:7:100",
@@ -1835,7 +1835,7 @@
               ],
               "src": "3871:9:100"
             },
-            "scope": 42054,
+            "scope": 42072,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "internal"
@@ -1848,26 +1848,26 @@
         "contractKind": "library",
         "fullyImplemented": true,
         "linearizedBaseContracts": [
-          42054
+          42072
         ],
         "name": "WorldContextConsumerLib",
         "nameLocation": "2511:23:100",
-        "scope": 42209,
+        "scope": 42227,
         "usedErrors": [],
         "usedEvents": []
       },
       {
-        "id": 42208,
+        "id": 42226,
         "nodeType": "ContractDefinition",
         "src": "4265:3922:100",
         "nodes": [
           {
-            "id": 42075,
+            "id": 42093,
             "nodeType": "FunctionDefinition",
             "src": "4614:201:100",
             "nodes": [],
             "body": {
-              "id": 42074,
+              "id": 42092,
               "nodeType": "Block",
               "src": "4750:65:100",
               "nodes": [],
@@ -1876,11 +1876,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 42069,
+                        "id": 42087,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42058,
+                        "referencedDeclaration": 42076,
                         "src": "4780:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
@@ -1888,11 +1888,11 @@
                         }
                       },
                       {
-                        "id": 42070,
+                        "id": 42088,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42060,
+                        "referencedDeclaration": 42078,
                         "src": "4790:9:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -1900,11 +1900,11 @@
                         }
                       },
                       {
-                        "id": 42071,
+                        "id": 42089,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42062,
+                        "referencedDeclaration": 42080,
                         "src": "4801:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -1928,7 +1928,7 @@
                         }
                       ],
                       "expression": {
-                        "id": 42067,
+                        "id": 42085,
                         "name": "abi",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
@@ -1939,7 +1939,7 @@
                           "typeString": "abi"
                         }
                       },
-                      "id": 42068,
+                      "id": 42086,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1953,7 +1953,7 @@
                         "typeString": "function () pure returns (bytes memory)"
                       }
                     },
-                    "id": 42072,
+                    "id": 42090,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1969,15 +1969,15 @@
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 42066,
-                  "id": 42073,
+                  "functionReturnParameters": 42084,
+                  "id": 42091,
                   "nodeType": "Return",
                   "src": "4756:54:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42056,
+              "id": 42074,
               "nodeType": "StructuredDocumentation",
               "src": "4301:310:100",
               "text": " @notice Appends context values to the given calldata.\n @param callData The original calldata.\n @param msgSender The address of the transaction sender.\n @param msgValue The amount of ether sent with the original transaction.\n @return The new calldata with context values appended."
@@ -1988,17 +1988,17 @@
             "name": "appendContext",
             "nameLocation": "4623:13:100",
             "parameters": {
-              "id": 42063,
+              "id": 42081,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42058,
+                  "id": 42076,
                   "mutability": "mutable",
                   "name": "callData",
                   "nameLocation": "4655:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42075,
+                  "scope": 42093,
                   "src": "4642:21:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2007,7 +2007,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42057,
+                    "id": 42075,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "4642:5:100",
@@ -2020,12 +2020,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42060,
+                  "id": 42078,
                   "mutability": "mutable",
                   "name": "msgSender",
                   "nameLocation": "4677:9:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42075,
+                  "scope": 42093,
                   "src": "4669:17:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2034,7 +2034,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42059,
+                    "id": 42077,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4669:7:100",
@@ -2048,12 +2048,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42062,
+                  "id": 42080,
                   "mutability": "mutable",
                   "name": "msgValue",
                   "nameLocation": "4700:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42075,
+                  "scope": 42093,
                   "src": "4692:16:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2062,7 +2062,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42061,
+                    "id": 42079,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "4692:7:100",
@@ -2077,17 +2077,17 @@
               "src": "4636:76:100"
             },
             "returnParameters": {
-              "id": 42066,
+              "id": 42084,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42065,
+                  "id": 42083,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42075,
+                  "scope": 42093,
                   "src": "4736:12:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2096,7 +2096,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42064,
+                    "id": 42082,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "4736:5:100",
@@ -2110,25 +2110,25 @@
               ],
               "src": "4735:14:100"
             },
-            "scope": 42208,
+            "scope": 42226,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42107,
+            "id": 42125,
             "nodeType": "FunctionDefinition",
             "src": "5311:317:100",
             "nodes": [],
             "body": {
-              "id": 42106,
+              "id": 42124,
               "nodeType": "Block",
               "src": "5483:145:100",
               "nodes": [],
               "statements": [
                 {
                   "expression": {
-                    "id": 42104,
+                    "id": 42122,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2136,11 +2136,11 @@
                     "leftHandSide": {
                       "components": [
                         {
-                          "id": 42091,
+                          "id": 42109,
                           "name": "success",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42087,
+                          "referencedDeclaration": 42105,
                           "src": "5490:7:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2148,11 +2148,11 @@
                           }
                         },
                         {
-                          "id": 42092,
+                          "id": 42110,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42089,
+                          "referencedDeclaration": 42107,
                           "src": "5499:4:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -2160,7 +2160,7 @@
                           }
                         }
                       ],
-                      "id": 42093,
+                      "id": 42111,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": true,
@@ -2180,11 +2180,11 @@
                         {
                           "arguments": [
                             {
-                              "id": 42099,
+                              "id": 42117,
                               "name": "callData",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42084,
+                              "referencedDeclaration": 42102,
                               "src": "5564:8:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
@@ -2192,11 +2192,11 @@
                               }
                             },
                             {
-                              "id": 42100,
+                              "id": 42118,
                               "name": "msgSender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42078,
+                              "referencedDeclaration": 42096,
                               "src": "5585:9:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -2204,11 +2204,11 @@
                               }
                             },
                             {
-                              "id": 42101,
+                              "id": 42119,
                               "name": "msgValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42080,
+                              "referencedDeclaration": 42098,
                               "src": "5606:8:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -2231,18 +2231,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 42098,
+                            "id": 42116,
                             "name": "appendContext",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 42075,
+                            "referencedDeclaration": 42093,
                             "src": "5538:13:100",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (bytes memory,address,uint256) pure returns (bytes memory)"
                             }
                           },
-                          "id": 42102,
+                          "id": 42120,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2282,18 +2282,18 @@
                             }
                           ],
                           "expression": {
-                            "id": 42094,
+                            "id": 42112,
                             "name": "target",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 42082,
+                            "referencedDeclaration": 42100,
                             "src": "5507:6:100",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 42095,
+                          "id": 42113,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2307,7 +2307,7 @@
                             "typeString": "function (bytes memory) payable returns (bool,bytes memory)"
                           }
                         },
-                        "id": 42097,
+                        "id": 42115,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2319,7 +2319,7 @@
                         "options": [
                           {
                             "hexValue": "30",
-                            "id": 42096,
+                            "id": 42114,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -2340,7 +2340,7 @@
                           "typeString": "function (bytes memory) payable returns (bool,bytes memory)"
                         }
                       },
-                      "id": 42103,
+                      "id": 42121,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2362,14 +2362,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 42105,
+                  "id": 42123,
                   "nodeType": "ExpressionStatement",
                   "src": "5489:134:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42076,
+              "id": 42094,
               "nodeType": "StructuredDocumentation",
               "src": "4819:489:100",
               "text": " @notice Makes a call to the target contract with context values appended to the calldata.\n @param msgSender The address of the transaction sender.\n @param msgValue The amount of ether sent with the original transaction.\n @param target The address of the contract to call.\n @param callData The calldata for the call.\n @return success A boolean indicating whether the call was successful or not.\n @return data The abi encoded return data from the call."
@@ -2380,17 +2380,17 @@
             "name": "callWithContext",
             "nameLocation": "5320:15:100",
             "parameters": {
-              "id": 42085,
+              "id": 42103,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42078,
+                  "id": 42096,
                   "mutability": "mutable",
                   "name": "msgSender",
                   "nameLocation": "5349:9:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5341:17:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2399,7 +2399,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42077,
+                    "id": 42095,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "5341:7:100",
@@ -2413,12 +2413,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42080,
+                  "id": 42098,
                   "mutability": "mutable",
                   "name": "msgValue",
                   "nameLocation": "5372:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5364:16:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2427,7 +2427,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42079,
+                    "id": 42097,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "5364:7:100",
@@ -2440,12 +2440,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42082,
+                  "id": 42100,
                   "mutability": "mutable",
                   "name": "target",
                   "nameLocation": "5394:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5386:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2454,7 +2454,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42081,
+                    "id": 42099,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "5386:7:100",
@@ -2468,12 +2468,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42084,
+                  "id": 42102,
                   "mutability": "mutable",
                   "name": "callData",
                   "nameLocation": "5419:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5406:21:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2482,7 +2482,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42083,
+                    "id": 42101,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "5406:5:100",
@@ -2497,17 +2497,17 @@
               "src": "5335:96:100"
             },
             "returnParameters": {
-              "id": 42090,
+              "id": 42108,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42087,
+                  "id": 42105,
                   "mutability": "mutable",
                   "name": "success",
                   "nameLocation": "5455:7:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5450:12:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2516,7 +2516,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 42086,
+                    "id": 42104,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "5450:4:100",
@@ -2529,12 +2529,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42089,
+                  "id": 42107,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "5477:4:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42107,
+                  "scope": 42125,
                   "src": "5464:17:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2543,7 +2543,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42088,
+                    "id": 42106,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "5464:5:100",
@@ -2557,25 +2557,25 @@
               ],
               "src": "5449:33:100"
             },
-            "scope": 42208,
+            "scope": 42226,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42137,
+            "id": 42155,
             "nodeType": "FunctionDefinition",
             "src": "6132:321:100",
             "nodes": [],
             "body": {
-              "id": 42136,
+              "id": 42154,
               "nodeType": "Block",
               "src": "6312:141:100",
               "nodes": [],
               "statements": [
                 {
                   "expression": {
-                    "id": 42134,
+                    "id": 42152,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2583,11 +2583,11 @@
                     "leftHandSide": {
                       "components": [
                         {
-                          "id": 42123,
+                          "id": 42141,
                           "name": "success",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42119,
+                          "referencedDeclaration": 42137,
                           "src": "6319:7:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2595,11 +2595,11 @@
                           }
                         },
                         {
-                          "id": 42124,
+                          "id": 42142,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42121,
+                          "referencedDeclaration": 42139,
                           "src": "6328:4:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -2607,7 +2607,7 @@
                           }
                         }
                       ],
-                      "id": 42125,
+                      "id": 42143,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": true,
@@ -2627,11 +2627,11 @@
                         {
                           "arguments": [
                             {
-                              "id": 42129,
+                              "id": 42147,
                               "name": "callData",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42116,
+                              "referencedDeclaration": 42134,
                               "src": "6389:8:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
@@ -2639,11 +2639,11 @@
                               }
                             },
                             {
-                              "id": 42130,
+                              "id": 42148,
                               "name": "msgSender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42110,
+                              "referencedDeclaration": 42128,
                               "src": "6410:9:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -2651,11 +2651,11 @@
                               }
                             },
                             {
-                              "id": 42131,
+                              "id": 42149,
                               "name": "msgValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 42112,
+                              "referencedDeclaration": 42130,
                               "src": "6431:8:100",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -2678,18 +2678,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 42128,
+                            "id": 42146,
                             "name": "appendContext",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 42075,
+                            "referencedDeclaration": 42093,
                             "src": "6363:13:100",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (bytes memory,address,uint256) pure returns (bytes memory)"
                             }
                           },
-                          "id": 42132,
+                          "id": 42150,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2722,18 +2722,18 @@
                           }
                         ],
                         "expression": {
-                          "id": 42126,
+                          "id": 42144,
                           "name": "target",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42114,
+                          "referencedDeclaration": 42132,
                           "src": "6336:6:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 42127,
+                        "id": 42145,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2747,7 +2747,7 @@
                           "typeString": "function (bytes memory) returns (bool,bytes memory)"
                         }
                       },
-                      "id": 42133,
+                      "id": 42151,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2769,14 +2769,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 42135,
+                  "id": 42153,
                   "nodeType": "ExpressionStatement",
                   "src": "6318:130:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42108,
+              "id": 42126,
               "nodeType": "StructuredDocumentation",
               "src": "5632:497:100",
               "text": " @notice Makes a delegatecall to the target contract with context values appended to the calldata.\n @param msgSender The address of the transaction sender.\n @param msgValue The amount of ether sent with the original transaction.\n @param target The address of the contract to call.\n @param callData The calldata for the call.\n @return success A boolean indicating whether the call was successful or not.\n @return data The abi encoded return data from the call."
@@ -2787,17 +2787,17 @@
             "name": "delegatecallWithContext",
             "nameLocation": "6141:23:100",
             "parameters": {
-              "id": 42117,
+              "id": 42135,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42110,
+                  "id": 42128,
                   "mutability": "mutable",
                   "name": "msgSender",
                   "nameLocation": "6178:9:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6170:17:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2806,7 +2806,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42109,
+                    "id": 42127,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "6170:7:100",
@@ -2820,12 +2820,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42112,
+                  "id": 42130,
                   "mutability": "mutable",
                   "name": "msgValue",
                   "nameLocation": "6201:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6193:16:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2834,7 +2834,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42111,
+                    "id": 42129,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "6193:7:100",
@@ -2847,12 +2847,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42114,
+                  "id": 42132,
                   "mutability": "mutable",
                   "name": "target",
                   "nameLocation": "6223:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6215:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2861,7 +2861,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42113,
+                    "id": 42131,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "6215:7:100",
@@ -2875,12 +2875,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42116,
+                  "id": 42134,
                   "mutability": "mutable",
                   "name": "callData",
                   "nameLocation": "6248:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6235:21:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2889,7 +2889,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42115,
+                    "id": 42133,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "6235:5:100",
@@ -2904,17 +2904,17 @@
               "src": "6164:96:100"
             },
             "returnParameters": {
-              "id": 42122,
+              "id": 42140,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42119,
+                  "id": 42137,
                   "mutability": "mutable",
                   "name": "success",
                   "nameLocation": "6284:7:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6279:12:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2923,7 +2923,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 42118,
+                    "id": 42136,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "6279:4:100",
@@ -2936,12 +2936,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42121,
+                  "id": 42139,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "6306:4:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42137,
+                  "scope": 42155,
                   "src": "6293:17:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -2950,7 +2950,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42120,
+                    "id": 42138,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "6293:5:100",
@@ -2964,36 +2964,36 @@
               ],
               "src": "6278:33:100"
             },
-            "scope": 42208,
+            "scope": 42226,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42172,
+            "id": 42190,
             "nodeType": "FunctionDefinition",
             "src": "6908:399:100",
             "nodes": [],
             "body": {
-              "id": 42171,
+              "id": 42189,
               "nodeType": "Block",
               "src": "7074:233:100",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    42152,
-                    42154
+                    42170,
+                    42172
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 42152,
+                      "id": 42170,
                       "mutability": "mutable",
                       "name": "success",
                       "nameLocation": "7086:7:100",
                       "nodeType": "VariableDeclaration",
-                      "scope": 42171,
+                      "scope": 42189,
                       "src": "7081:12:100",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -3002,7 +3002,7 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 42151,
+                        "id": 42169,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
                         "src": "7081:4:100",
@@ -3015,12 +3015,12 @@
                     },
                     {
                       "constant": false,
-                      "id": 42154,
+                      "id": 42172,
                       "mutability": "mutable",
                       "name": "_data",
                       "nameLocation": "7108:5:100",
                       "nodeType": "VariableDeclaration",
-                      "scope": 42171,
+                      "scope": 42189,
                       "src": "7095:18:100",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -3029,7 +3029,7 @@
                         "typeString": "bytes"
                       },
                       "typeName": {
-                        "id": 42153,
+                        "id": 42171,
                         "name": "bytes",
                         "nodeType": "ElementaryTypeName",
                         "src": "7095:5:100",
@@ -3041,15 +3041,15 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 42161,
+                  "id": 42179,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 42156,
+                        "id": 42174,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42140,
+                        "referencedDeclaration": 42158,
                         "src": "7152:9:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -3057,11 +3057,11 @@
                         }
                       },
                       {
-                        "id": 42157,
+                        "id": 42175,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42142,
+                        "referencedDeclaration": 42160,
                         "src": "7179:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -3069,11 +3069,11 @@
                         }
                       },
                       {
-                        "id": 42158,
+                        "id": 42176,
                         "name": "target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42144,
+                        "referencedDeclaration": 42162,
                         "src": "7203:6:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -3081,11 +3081,11 @@
                         }
                       },
                       {
-                        "id": 42159,
+                        "id": 42177,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42146,
+                        "referencedDeclaration": 42164,
                         "src": "7227:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
@@ -3112,18 +3112,18 @@
                           "typeString": "bytes memory"
                         }
                       ],
-                      "id": 42155,
+                      "id": 42173,
                       "name": "callWithContext",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 42107,
+                      "referencedDeclaration": 42125,
                       "src": "7117:15:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "function (address,uint256,address,bytes memory) returns (bool,bytes memory)"
                       }
                     },
-                    "id": 42160,
+                    "id": 42178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3154,7 +3154,7 @@
                 },
                 {
                   "condition": {
-                    "id": 42163,
+                    "id": 42181,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3164,11 +3164,11 @@
                     "prefix": true,
                     "src": "7252:8:100",
                     "subExpression": {
-                      "id": 42162,
+                      "id": 42180,
                       "name": "success",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 42152,
+                      "referencedDeclaration": 42170,
                       "src": "7253:7:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -3180,18 +3180,18 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 42168,
+                  "id": 42186,
                   "nodeType": "IfStatement",
                   "src": "7248:36:100",
                   "trueBody": {
                     "expression": {
                       "arguments": [
                         {
-                          "id": 42165,
+                          "id": 42183,
                           "name": "_data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42154,
+                          "referencedDeclaration": 42172,
                           "src": "7278:5:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -3206,18 +3206,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 42164,
+                        "id": 42182,
                         "name": "revertWithBytes",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 48971,
+                        "referencedDeclaration": 49007,
                         "src": "7262:15:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$",
                           "typeString": "function (bytes memory) pure"
                         }
                       },
-                      "id": 42166,
+                      "id": 42184,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3233,33 +3233,33 @@
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 42167,
+                    "id": 42185,
                     "nodeType": "ExpressionStatement",
                     "src": "7262:22:100"
                   }
                 },
                 {
                   "expression": {
-                    "id": 42169,
+                    "id": 42187,
                     "name": "_data",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 42154,
+                    "referencedDeclaration": 42172,
                     "src": "7297:5:100",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_memory_ptr",
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 42150,
-                  "id": 42170,
+                  "functionReturnParameters": 42168,
+                  "id": 42188,
                   "nodeType": "Return",
                   "src": "7290:12:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42138,
+              "id": 42156,
               "nodeType": "StructuredDocumentation",
               "src": "6457:448:100",
               "text": " @notice Makes a call to the target contract with context values appended to the calldata.\n @dev Revert in the case of failure.\n @param msgSender The address of the transaction sender.\n @param msgValue The amount of ether sent with the original transaction.\n @param target The address of the contract to call.\n @param callData The calldata for the call.\n @return data The abi encoded return data from the call."
@@ -3270,17 +3270,17 @@
             "name": "callWithContextOrRevert",
             "nameLocation": "6917:23:100",
             "parameters": {
-              "id": 42147,
+              "id": 42165,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42140,
+                  "id": 42158,
                   "mutability": "mutable",
                   "name": "msgSender",
                   "nameLocation": "6954:9:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42172,
+                  "scope": 42190,
                   "src": "6946:17:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3289,7 +3289,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42139,
+                    "id": 42157,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "6946:7:100",
@@ -3303,12 +3303,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42142,
+                  "id": 42160,
                   "mutability": "mutable",
                   "name": "msgValue",
                   "nameLocation": "6977:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42172,
+                  "scope": 42190,
                   "src": "6969:16:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3317,7 +3317,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42141,
+                    "id": 42159,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "6969:7:100",
@@ -3330,12 +3330,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42144,
+                  "id": 42162,
                   "mutability": "mutable",
                   "name": "target",
                   "nameLocation": "6999:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42172,
+                  "scope": 42190,
                   "src": "6991:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3344,7 +3344,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42143,
+                    "id": 42161,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "6991:7:100",
@@ -3358,12 +3358,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42146,
+                  "id": 42164,
                   "mutability": "mutable",
                   "name": "callData",
                   "nameLocation": "7024:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42172,
+                  "scope": 42190,
                   "src": "7011:21:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -3372,7 +3372,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42145,
+                    "id": 42163,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "7011:5:100",
@@ -3387,17 +3387,17 @@
               "src": "6940:96:100"
             },
             "returnParameters": {
-              "id": 42150,
+              "id": 42168,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42149,
+                  "id": 42167,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "7068:4:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42172,
+                  "scope": 42190,
                   "src": "7055:17:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -3406,7 +3406,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42148,
+                    "id": 42166,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "7055:5:100",
@@ -3420,36 +3420,36 @@
               ],
               "src": "7054:19:100"
             },
-            "scope": 42208,
+            "scope": 42226,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 42207,
+            "id": 42225,
             "nodeType": "FunctionDefinition",
             "src": "7770:415:100",
             "nodes": [],
             "body": {
-              "id": 42206,
+              "id": 42224,
               "nodeType": "Block",
               "src": "7944:241:100",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    42187,
-                    42189
+                    42205,
+                    42207
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 42187,
+                      "id": 42205,
                       "mutability": "mutable",
                       "name": "success",
                       "nameLocation": "7956:7:100",
                       "nodeType": "VariableDeclaration",
-                      "scope": 42206,
+                      "scope": 42224,
                       "src": "7951:12:100",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -3458,7 +3458,7 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 42186,
+                        "id": 42204,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
                         "src": "7951:4:100",
@@ -3471,12 +3471,12 @@
                     },
                     {
                       "constant": false,
-                      "id": 42189,
+                      "id": 42207,
                       "mutability": "mutable",
                       "name": "_data",
                       "nameLocation": "7978:5:100",
                       "nodeType": "VariableDeclaration",
-                      "scope": 42206,
+                      "scope": 42224,
                       "src": "7965:18:100",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -3485,7 +3485,7 @@
                         "typeString": "bytes"
                       },
                       "typeName": {
-                        "id": 42188,
+                        "id": 42206,
                         "name": "bytes",
                         "nodeType": "ElementaryTypeName",
                         "src": "7965:5:100",
@@ -3497,15 +3497,15 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 42196,
+                  "id": 42214,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 42191,
+                        "id": 42209,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42175,
+                        "referencedDeclaration": 42193,
                         "src": "8030:9:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -3513,11 +3513,11 @@
                         }
                       },
                       {
-                        "id": 42192,
+                        "id": 42210,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42177,
+                        "referencedDeclaration": 42195,
                         "src": "8057:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -3525,11 +3525,11 @@
                         }
                       },
                       {
-                        "id": 42193,
+                        "id": 42211,
                         "name": "target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42179,
+                        "referencedDeclaration": 42197,
                         "src": "8081:6:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -3537,11 +3537,11 @@
                         }
                       },
                       {
-                        "id": 42194,
+                        "id": 42212,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 42181,
+                        "referencedDeclaration": 42199,
                         "src": "8105:8:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
@@ -3568,18 +3568,18 @@
                           "typeString": "bytes memory"
                         }
                       ],
-                      "id": 42190,
+                      "id": 42208,
                       "name": "delegatecallWithContext",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 42137,
+                      "referencedDeclaration": 42155,
                       "src": "7987:23:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "function (address,uint256,address,bytes memory) returns (bool,bytes memory)"
                       }
                     },
-                    "id": 42195,
+                    "id": 42213,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3610,7 +3610,7 @@
                 },
                 {
                   "condition": {
-                    "id": 42198,
+                    "id": 42216,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3620,11 +3620,11 @@
                     "prefix": true,
                     "src": "8130:8:100",
                     "subExpression": {
-                      "id": 42197,
+                      "id": 42215,
                       "name": "success",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 42187,
+                      "referencedDeclaration": 42205,
                       "src": "8131:7:100",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -3636,18 +3636,18 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 42203,
+                  "id": 42221,
                   "nodeType": "IfStatement",
                   "src": "8126:36:100",
                   "trueBody": {
                     "expression": {
                       "arguments": [
                         {
-                          "id": 42200,
+                          "id": 42218,
                           "name": "_data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 42189,
+                          "referencedDeclaration": 42207,
                           "src": "8156:5:100",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -3662,18 +3662,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 42199,
+                        "id": 42217,
                         "name": "revertWithBytes",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 48971,
+                        "referencedDeclaration": 49007,
                         "src": "8140:15:100",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$",
                           "typeString": "function (bytes memory) pure"
                         }
                       },
-                      "id": 42201,
+                      "id": 42219,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3689,33 +3689,33 @@
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 42202,
+                    "id": 42220,
                     "nodeType": "ExpressionStatement",
                     "src": "8140:22:100"
                   }
                 },
                 {
                   "expression": {
-                    "id": 42204,
+                    "id": 42222,
                     "name": "_data",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 42189,
+                    "referencedDeclaration": 42207,
                     "src": "8175:5:100",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_memory_ptr",
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 42185,
-                  "id": 42205,
+                  "functionReturnParameters": 42203,
+                  "id": 42223,
                   "nodeType": "Return",
                   "src": "8168:12:100"
                 }
               ]
             },
             "documentation": {
-              "id": 42173,
+              "id": 42191,
               "nodeType": "StructuredDocumentation",
               "src": "7311:456:100",
               "text": " @notice Makes a delegatecall to the target contract with context values appended to the calldata.\n @dev Revert in the case of failure.\n @param msgSender The address of the transaction sender.\n @param msgValue The amount of ether sent with the original transaction.\n @param target The address of the contract to call.\n @param callData The calldata for the call.\n @return data The abi encoded return data from the call."
@@ -3726,17 +3726,17 @@
             "name": "delegatecallWithContextOrRevert",
             "nameLocation": "7779:31:100",
             "parameters": {
-              "id": 42182,
+              "id": 42200,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42175,
+                  "id": 42193,
                   "mutability": "mutable",
                   "name": "msgSender",
                   "nameLocation": "7824:9:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42207,
+                  "scope": 42225,
                   "src": "7816:17:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3745,7 +3745,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42174,
+                    "id": 42192,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "7816:7:100",
@@ -3759,12 +3759,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42177,
+                  "id": 42195,
                   "mutability": "mutable",
                   "name": "msgValue",
                   "nameLocation": "7847:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42207,
+                  "scope": 42225,
                   "src": "7839:16:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3773,7 +3773,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 42176,
+                    "id": 42194,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "7839:7:100",
@@ -3786,12 +3786,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42179,
+                  "id": 42197,
                   "mutability": "mutable",
                   "name": "target",
                   "nameLocation": "7869:6:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42207,
+                  "scope": 42225,
                   "src": "7861:14:100",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3800,7 +3800,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 42178,
+                    "id": 42196,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "7861:7:100",
@@ -3814,12 +3814,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 42181,
+                  "id": 42199,
                   "mutability": "mutable",
                   "name": "callData",
                   "nameLocation": "7894:8:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42207,
+                  "scope": 42225,
                   "src": "7881:21:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -3828,7 +3828,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42180,
+                    "id": 42198,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "7881:5:100",
@@ -3843,17 +3843,17 @@
               "src": "7810:96:100"
             },
             "returnParameters": {
-              "id": 42185,
+              "id": 42203,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 42184,
+                  "id": 42202,
                   "mutability": "mutable",
                   "name": "data",
                   "nameLocation": "7938:4:100",
                   "nodeType": "VariableDeclaration",
-                  "scope": 42207,
+                  "scope": 42225,
                   "src": "7925:17:100",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -3862,7 +3862,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 42183,
+                    "id": 42201,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "7925:5:100",
@@ -3876,7 +3876,7 @@
               ],
               "src": "7924:19:100"
             },
-            "scope": 42208,
+            "scope": 42226,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
@@ -3888,18 +3888,18 @@
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 42055,
+          "id": 42073,
           "nodeType": "StructuredDocumentation",
           "src": "3932:332:100",
           "text": " @title WorldContextProviderLib - Utility functions to call contracts with context values appended to calldata.\n @notice This library provides functions to make calls or delegatecalls to other contracts,\n appending the context values (like msg.sender and msg.value) to the calldata for WorldContextConsumer to consume."
         },
         "fullyImplemented": true,
         "linearizedBaseContracts": [
-          42208
+          42226
         ],
         "name": "WorldContextProviderLib",
         "nameLocation": "4273:23:100",
-        "scope": 42209,
+        "scope": 42227,
         "usedErrors": [],
         "usedEvents": []
       }