@latticexyz/world-modules 2.0.0-main-071aadb9 → 2.0.0-main-7987c94d

package/out/WorldContext.sol/WorldContextConsumer.json

@@ -75,7 +75,7 @@
     "_world()": "e1af802c",
     "supportsInterface(bytes4)": "01ffc9a7"
   },
-  "rawMetadata": "{\"compiler\":{\"version\":\"0.8.21+commit.d9974bed\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"_msgSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"_msgValue\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"_world\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes4\",\"name\":\"interfaceId\",\"type\":\"bytes4\"}],\"name\":\"supportsInterface\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}],\"devdoc\":{\"details\":\"This contract should only be used for contracts without their own storage, like Systems.\",\"kind\":\"dev\",\"methods\":{\"_msgSender()\":{\"returns\":{\"sender\":\"The address of the trusted sender.\"}},\"_msgValue()\":{\"returns\":{\"value\":\"The `msg.value` in the call to the World contract before the World routed the call to the WorldContextConsumer contract.\"}},\"_world()\":{\"returns\":{\"_0\":\"The address of the World contract that routed the call to this WorldContextConsumer.\"}},\"supportsInterface(bytes4)\":{\"params\":{\"interfaceId\":\"The ID of the interface in question.\"},\"returns\":{\"_0\":\"True if the interface is supported, false otherwise.\"}}},\"title\":\"WorldContextConsumer - Extracting trusted context values from appended calldata.\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"_msgSender()\":{\"notice\":\"Extracts the trusted msg.sender value from the appended calldata.\"},\"_msgValue()\":{\"notice\":\"Extract the `msg.value` from the context appended to the calldata.\"},\"_world()\":{\"notice\":\"Get the address of the World contract that routed the call to this WorldContextConsumer.\"},\"supportsInterface(bytes4)\":{\"notice\":\"Checks if an interface is supported by the contract. using ERC-165 supportsInterface (see https://eips.ethereum.org/EIPS/eip-165)\"}},\"notice\":\"This contract is designed to extract trusted context values (like msg.sender and msg.value) from the appended calldata. It provides mechanisms similar to EIP-2771 (https://eips.ethereum.org/EIPS/eip-2771), but allowing any contract to be the trusted forwarder.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"/home/runner/work/mud/mud/packages/world/src/WorldContext.sol\":\"WorldContextConsumer\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":3000},\"remappings\":[\":@latticexyz/=node_modules/@latticexyz/\",\":ds-test/=node_modules/ds-test/src/\",\":forge-std/=node_modules/forge-std/src/\"]},\"sources\":{\"/home/runner/work/mud/mud/packages/world/src/IERC165.sol\":{\"keccak256\":\"0x7997ebbdee6a2493f28e7032c7a8b906ade40f807d95734e2653c8f1b023ff47\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://c8ca41bb2619bf27e5bf886d1322f0e2dffd096c49f7ae6e716541dd1e1ddce5\",\"dweb:/ipfs/Qmb8zATUWWTtiWaSLjbAe6PGnJPes9ANvEyk7pYoWR3P3Y\"]},\"/home/runner/work/mud/mud/packages/world/src/IWorldContextConsumer.sol\":{\"keccak256\":\"0x22b8cb3ffcc21cb1657d57fc8ac929d2d6fdd199328e6f43ad2cb54f53dcd500\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://47c001f6b7c6d6e453c340618d23b1532078abb7d0fd7283405071e4e8ff8d2d\",\"dweb:/ipfs/QmRW3femBhqQCPwDEj4Jop2Dnd3EU21ufg7GDVwN4joCQu\"]},\"/home/runner/work/mud/mud/packages/world/src/WorldContext.sol\":{\"keccak256\":\"0x45792667fe063195103e9fd74e3e9e0b0b4aea4fc4a0a8a3e69538c14751217b\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://cba8976da1e2f7e336045e8d65eba89d18ae49e4688de61ff61a95fb817fe9fc\",\"dweb:/ipfs/QmWoByJM6DmheS2jisxSvAzrqC6XWrgaKxoNNUr44aXJtE\"]},\"/home/runner/work/mud/mud/packages/world/src/revertWithBytes.sol\":{\"keccak256\":\"0x16795bdbfd7956d733df9ada1030ee7a1a714e3b9da5899149a7b07568c4af55\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7a71128b4989e78215d5fc57dae8c2f84c6b5e503c159178c0df6f642b8228df\",\"dweb:/ipfs/QmNYTfBe62SdGESZ32fxME72CbAxEqk4j79jBT7655C4u7\"]},\"node_modules/@latticexyz/schema-type/src/solidity/SchemaType.sol\":{\"keccak256\":\"0x770eff7a38b9b7b1613dc11ca09db4f28b42a117c9b39b2a06a650a58a250bdb\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://39f544110658a53def52c2a4e33b8b158b95a4f14fccea58d5268b6e728d86d4\",\"dweb:/ipfs/QmTesj6tjSFbfAiKUitXapdNYWPStS8bLkB3r22qfyHwUC\"]},\"node_modules/@latticexyz/store/src/Bytes.sol\":{\"keccak256\":\"0xab31edce915377852bb5f29f7f2ccfc50cac087d64d2a8aae669715ad862d558\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3187e86e43be1fbdd59df45c695294f1114aa1ac48e6445c0cb26089434be5c4\",\"dweb:/ipfs/Qmck7shMVrcKMVkgN2pC1byPY7hb3V9fTxnUcGgxAUeXYk\"]},\"node_modules/@latticexyz/store/src/FieldLayout.sol\":{\"keccak256\":\"0x2a0536cd6cecc479d0b81d5aad6380231f4d6873beadc54814d801c2036b02c0\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e07c041e19146a9ec258cc700a450b4d49440202895eb12f3bb17508427c23ba\",\"dweb:/ipfs/QmXoqrCGDSkuFgNSMURRFdjokjREL78nLDzNaUi6rjefy9\"]},\"node_modules/@latticexyz/store/src/Hook.sol\":{\"keccak256\":\"0x045024523eb55d08ad8d13eca6185bff2988865f4aa12e3f9372029c2ecb8ddd\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6621c53b49f8fe0557d1a1db47bfe1561801c09256948dd0652fb41541891a18\",\"dweb:/ipfs/QmZgFVCUH1pKcc9MeFyzMe1VW87SLz6c9szGwrDRUp6BZe\"]},\"node_modules/@latticexyz/store/src/IERC165.sol\":{\"keccak256\":\"0x2bbc3c43400c15a91a5cb35430a91309cb64a4d13a0a170eacec71dcf334feaf\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://f44dfc9605067de539de07a76a34bf469faa9e6dad8c192abafc2e05860c7dd2\",\"dweb:/ipfs/QmX8xgG6XWokM7YFwFZvmMhuh1uhkSjxCMD2oTHjUVdapb\"]},\"node_modules/@latticexyz/store/src/IStore.sol\":{\"keccak256\":\"0x9092b65551d0f910e5645cebb5acadb387cdd192d75fa89cd6b293bd65b28827\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://478825a6f7eff9ddab968e71e1d55ebee279d3b318f10976d9334384000059c0\",\"dweb:/ipfs/Qme7NY976woRy3RQjE4tkkiwoXnoVtTmER3PbWCSbjZ2kb\"]},\"node_modules/@latticexyz/store/src/IStoreData.sol\":{\"keccak256\":\"0xa8eade05c551aeef35c84727d7a44af239516deb2d8a0cfb7ebeb5d88c6995e5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5335910bd8a204abb5f4396fb911a5ee5c221bd7fa63b1cc8ae5e737c6458c6a\",\"dweb:/ipfs/QmckkCAfrNcWo3yDxoD1jCe1k4iDA2GzVDpFjJZs7W79vx\"]},\"node_modules/@latticexyz/store/src/IStoreErrors.sol\":{\"keccak256\":\"0xb9070663ded3cad82285bb7610949e422f88abb48c2ddbd792af83d127d64212\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://830490f1c888bec86df1e7ef43773d60ebdbdfdb2b91ab7fe074e2f38d7439dc\",\"dweb:/ipfs/QmS26fpXdZuGgMmjcdQDf9k1Bedn2dhjk9byFZJoNkctPZ\"]},\"node_modules/@latticexyz/store/src/IStoreEvents.sol\":{\"keccak256\":\"0xdd3104680808f975462a85cbd4fa87783ba5395797419caeeca37e8f8627a16f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://943864b7eb16ad2047ade5a8598e85c8a4b46d1aed6aef02bfb7cee8de732b4d\",\"dweb:/ipfs/QmTEij4caToSNk15PFpubXYDy9QhwmPyP9tMXjUse2cTdv\"]},\"node_modules/@latticexyz/store/src/IStoreHook.sol\":{\"keccak256\":\"0xa6777c7868333996ad9c61a94457dcac702d8d7445a104dfdc86543d25e7470e\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6268a16449d7529a94746d0103670dd0e38faf5117bf914fb01da9947ab44c2e\",\"dweb:/ipfs/QmaSfbx1QRA3jw2K8bGkQTw4CTGPUzNqnCJW7LwaFUJCXy\"]},\"node_modules/@latticexyz/store/src/IStoreRead.sol\":{\"keccak256\":\"0xd2180d53ecd31069b1166f170ecdcd85917ac50f45fc26fb39b49cee7ba00e37\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://1494bb0a3228e2d194bddaed4761fd3ca865979f0e3f3a53acd271143a4aa0ac\",\"dweb:/ipfs/Qmaddnzzmu99iP9dTWK9ZeByh5dZyjY9SpVnRdvyr2fBAo\"]},\"node_modules/@latticexyz/store/src/IStoreRegistration.sol\":{\"keccak256\":\"0xf448fbb2bc9c982721a43234463656da5a49cea08543e62148d54f11e1ac3e2f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://64b3579d9b9dcd73dca2beab3d4fcf60237420945ebbb2e9f4ffcc88f4110115\",\"dweb:/ipfs/QmaW5nN3zGEriSYHncye6Nz2TkAw1oo1CyG2JuJTJrJoXg\"]},\"node_modules/@latticexyz/store/src/IStoreWrite.sol\":{\"keccak256\":\"0x8b6c7af5ee330928aebb58c8872d3944304ee10ed11f8a325b6accc4ec5df81b\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://b866d158701c7a40834bed735194b804ef219f2bbe574e2307785fff7bcf9da1\",\"dweb:/ipfs/QmXzJfZkXVfyr2RFGwDuazeVnV3UWYmQxjKZ3KzFbbe75U\"]},\"node_modules/@latticexyz/store/src/Memory.sol\":{\"keccak256\":\"0x69295976e61a1a108d1b4d6eb497b238730309f3047c4320d48e01a0ce8d4ec7\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://559c451b21fb9dd4fec27b41bef42f4362f1e7ebb7992106d548b9d4f733b3e5\",\"dweb:/ipfs/QmeSE7YTW5zUrfZYFVb2pFnDe3XxiT8XNecfwC3wfpxCRv\"]},\"node_modules/@latticexyz/store/src/PackedCounter.sol\":{\"keccak256\":\"0x44ddfa9eb8a861462c550f0a9d66c40c68acdb347a61fa765949608407a2c7fb\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://47ee957f4b19cab9e20bf5fc569c015eca13852fb3351f2a105a8be9c48204c0\",\"dweb:/ipfs/QmNkyzDobVQLoq9BtQ8HtgsPLiqnmi97EZx1wsu6wp8nKH\"]},\"node_modules/@latticexyz/store/src/ResourceId.sol\":{\"keccak256\":\"0x40983c580b8958e55db4520095934a535e98544ffe8228327e598973eb6647ed\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://839d658fa2bb2b1f09a08149d2bf0c26a26c301ad2dda8154fc99458085a695d\",\"dweb:/ipfs/Qmd5jHHYrgqraPqF8bjzT4xyjsoPk8K7pkxXLLfz6MRT6d\"]},\"node_modules/@latticexyz/store/src/Schema.sol\":{\"keccak256\":\"0x58aef318ba03f8ff8866ef70f8a30f549b150657ea699734aefe16c298956401\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7dc104690a7e2bcf5ce1afadcd58f8ef4d639b4b92b9ad9293656235d54395f3\",\"dweb:/ipfs/QmYJJvEv5KBJ3kzf9AkgRn7Uu5dp4exGTRddf4cae1btgE\"]},\"node_modules/@latticexyz/store/src/Slice.sol\":{\"keccak256\":\"0xfaf54b1f5acccd4c6ce3f8377050ee84efbb423cb604b4651e8b9ea3b467bf32\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://acf2ce7ffec21f28ad1dc6da06c342f1212a03a3d16a0be7ee85715a5940718c\",\"dweb:/ipfs/QmTCN3NSdFg87hi7KS2Xtq7PsmRUMG64SxC8PtP3p2GzuT\"]},\"node_modules/@latticexyz/store/src/Storage.sol\":{\"keccak256\":\"0x0893905ebe431a414226b479a84a54804091001a406222c748adbd4b651853a5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://bcfcd3848127884041f0bcd727a0e7acbddec283aa6c16ba47abc6a3be720648\",\"dweb:/ipfs/QmY5fBd53e4Ro6vzTZYsteSibSTXVA3GHTeCAiUZTa5DPZ\"]},\"node_modules/@latticexyz/store/src/StoreCore.sol\":{\"keccak256\":\"0x1dd80c8f47d425b611aa382a226a47919831976e0da7145a227c1bf629eec24d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://ac31d8551e5ef995d45e8eef1067e9793a2228cc3a539e16121d27083b203715\",\"dweb:/ipfs/QmWntan3y5oFxNnuvit8A4Xiuk2bMWasWTA7cqkh7Tk427\"]},\"node_modules/@latticexyz/store/src/StoreSwitch.sol\":{\"keccak256\":\"0xf132af10f960a498f49c0534027056e715f4bdcb8fbdb53ac6879c92309ab416\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e85a09aeb7543bcd9d74b7ad319ae61e1f7f15a6a0ad9e79aff750fbd18111c7\",\"dweb:/ipfs/QmY6xgqeeaR1FsCPLmFbVgjm1D2UyrXNABKXWLfFaSmBhR\"]},\"node_modules/@latticexyz/store/src/codegen/index.sol\":{\"keccak256\":\"0xf337a5abb2d43ef00c1c200e7fbec30fc89c7c701e457ab4277194b700d2aea3\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eccdf6158076b4e8f1b587a0310228f53323705e054a44eaa7733f38805c3ee6\",\"dweb:/ipfs/QmbXEVNTctg54dK9awdCVyAjeuUjR6ckfmmXBP8DrFmjyq\"]},\"node_modules/@latticexyz/store/src/codegen/tables/Hooks.sol\":{\"keccak256\":\"0xacf4aee01f167b98b2869bdf4407682fd9f18b85507048bc274bcb98d094948c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://86b114326973cef4f59c17e947945d09b90a0c48ede1da80f4f8aed0b6de179c\",\"dweb:/ipfs/QmZ6K6gZnV2ZdgbT8yG7Jz4HgoPymgdX3jTy6oUnG9xdgD\"]},\"node_modules/@latticexyz/store/src/codegen/tables/ResourceIds.sol\":{\"keccak256\":\"0xc2dc1bd6335fb0cc27cb7a80298d954d9ce0a0e9864d1dd8531aadb66c0ce21d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://a7e34a386bd44933010c4f5a4dbfe8b0b8e5e9e39eaead46a2ebef0018db9b72\",\"dweb:/ipfs/QmQPyAdLUmE2Y6Ai7t2n56USg25PGHYxxXWRi1zEkdyT6a\"]},\"node_modules/@latticexyz/store/src/codegen/tables/StoreHooks.sol\":{\"keccak256\":\"0xfecdfde3b41c04dcf43e9c19f84f6a7f77df0fd844928692742b47662a0b814c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://968e83ac99e8d1799730aa6f1f23962c3fe3566cd7ec8bcf97d297823c364764\",\"dweb:/ipfs/QmVnhbeg89ajfLP1U1HDLiWi8T7HuFtsXUydjKXyyPa7MP\"]},\"node_modules/@latticexyz/store/src/codegen/tables/Tables.sol\":{\"keccak256\":\"0x42b9fd484a055e8e312a2396059fb76a962608fa3a875ea3da6e5aab79084d04\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://866fd30788245eb54ac09d70768c0b34846d361b4219781c814fb06e38fb546c\",\"dweb:/ipfs/QmRbLCYjZ9qefcC8q7gnsAUsqCTEjdRtRnXdSNB1x7saPz\"]},\"node_modules/@latticexyz/store/src/constants.sol\":{\"keccak256\":\"0x9e37c64c119ef07ad914bc589ee3f6d67946ab95877978c1ee3e2c1ffae07076\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3fad47e542025382aa28e8171253e34f93b2f149434b67a26989542d70218793\",\"dweb:/ipfs/QmW6JsKNwPc6oAMrgcikgR2EPwMUtQANiuZSQSGCd29HHC\"]},\"node_modules/@latticexyz/store/src/leftMask.sol\":{\"keccak256\":\"0xd0360567e4d77c6a8e3d8a5f4bf3653ccde4d268674c50988d55695dc6193f6f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://53e6bcb53fcb08ee9426225fdab7c41df91e12cb4f80d92895a6117338627401\",\"dweb:/ipfs/QmeLcaPGeMBpNSTSsPYK3PHpzKuGMjuitCweAWcoXK2mXr\"]},\"node_modules/@latticexyz/store/src/storeHookTypes.sol\":{\"keccak256\":\"0x60880298016fa117ed9a43ddfd020f11d98a2d345bdcb08e5884e40df98eddd5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3619dfda1fd514c0fc5fb34c14d5b5aa41dd6ba6045d37d5f4c8199f3a826f81\",\"dweb:/ipfs/QmbzRBYfVa423gNzCitpGN3i2N9oeGYfinVE1jgtqxnNZX\"]},\"node_modules/@latticexyz/store/src/storeResourceTypes.sol\":{\"keccak256\":\"0xada1867ba72930fc5cf5562dd4e36de849dbac9c833b7969cb1b046a808fabf2\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6e4b5fdcaa54f567a3f8561c2c3fbc0d68c8dad892a4a8e5418bbce8efc53d84\",\"dweb:/ipfs/QmTWbYJX1yrCqrEwUKB9rGpHdRvLNU8GCkBbxnLjGD4d2t\"]},\"node_modules/@latticexyz/store/src/tightcoder/DecodeSlice.sol\":{\"keccak256\":\"0x1af0fd984640123391ec2df855d00298504b7ce186a56c2caca769cfd9e08e04\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7305a62318890d2cc6420ba7dec13d9f2c1cb67ac689015fc83b9cbccd0696f1\",\"dweb:/ipfs/QmR8jGNLbt64Tv1YZKRVBCVsd71oeUQFzGHHtpsrs4PuRq\"]},\"node_modules/@latticexyz/store/src/tightcoder/EncodeArray.sol\":{\"keccak256\":\"0x1c280d24360282e196d9c4833c58c2437108cea2af0ac7596f95be81389e306d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6b4556b6eeae9328fbd9adcce346547e823c397503276a4d63effb67e00b5b49\",\"dweb:/ipfs/QmUsynVsMYzjh8oJR8YB7SRrwFMdXcsQsHBrXxLEEFxsiB\"]},\"node_modules/@latticexyz/store/src/tightcoder/TightCoder.sol\":{\"keccak256\":\"0x5cacd4cb371e0a79bc8d64f62349d568fd8b08093c11ae0c3db4f16480d8808b\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://12b64ddf2b5c19cf68ba93a8153ed79cbafe7a91e015d4b2f25eb1d42ab06256\",\"dweb:/ipfs/QmQz5WwztcuTbSGFv2pkhU3w5scUj1gmavoyUpduxk2v3A\"]},\"node_modules/@latticexyz/store/src/version.sol\":{\"keccak256\":\"0x01029999a48b7c1d85de84cae465dd24ec126c95b8a865cd20c7ed5dfcc0f02c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9750164ce996badb0fd7df2f526780b9cb9558912405fe46f31064bd7c522491\",\"dweb:/ipfs/QmYf8m2ZXFANRc9ysHgNkNtSF327ccxKYjCUJ49UXBKADk\"]}},\"version\":1}",
+  "rawMetadata": "{\"compiler\":{\"version\":\"0.8.21+commit.d9974bed\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"_msgSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"_msgValue\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"_world\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes4\",\"name\":\"interfaceId\",\"type\":\"bytes4\"}],\"name\":\"supportsInterface\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}],\"devdoc\":{\"details\":\"This contract should only be used for contracts without their own storage, like Systems.\",\"kind\":\"dev\",\"methods\":{\"_msgSender()\":{\"returns\":{\"sender\":\"The `msg.sender` in the call to the World contract before the World routed the call to the WorldContextConsumer contract.\"}},\"_msgValue()\":{\"returns\":{\"value\":\"The `msg.value` in the call to the World contract before the World routed the call to the WorldContextConsumer contract.\"}},\"_world()\":{\"returns\":{\"_0\":\"The address of the World contract that routed the call to this WorldContextConsumer.\"}},\"supportsInterface(bytes4)\":{\"params\":{\"interfaceId\":\"The ID of the interface in question.\"},\"returns\":{\"_0\":\"True if the interface is supported, false otherwise.\"}}},\"title\":\"WorldContextConsumer - Extracting trusted context values from appended calldata.\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"_msgSender()\":{\"notice\":\"Extract the `msg.sender` from the context appended to the calldata.\"},\"_msgValue()\":{\"notice\":\"Extract the `msg.value` from the context appended to the calldata.\"},\"_world()\":{\"notice\":\"Get the address of the World contract that routed the call to this WorldContextConsumer.\"},\"supportsInterface(bytes4)\":{\"notice\":\"Checks if an interface is supported by the contract. using ERC-165 supportsInterface (see https://eips.ethereum.org/EIPS/eip-165)\"}},\"notice\":\"This contract is designed to extract trusted context values (like msg.sender and msg.value) from the appended calldata. It provides mechanisms similar to EIP-2771 (https://eips.ethereum.org/EIPS/eip-2771), but allowing any contract to be the trusted forwarder.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"/home/runner/work/mud/mud/packages/world/src/WorldContext.sol\":\"WorldContextConsumer\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":3000},\"remappings\":[\":@latticexyz/=node_modules/@latticexyz/\",\":ds-test/=node_modules/ds-test/src/\",\":forge-std/=node_modules/forge-std/src/\"]},\"sources\":{\"/home/runner/work/mud/mud/packages/world/src/IERC165.sol\":{\"keccak256\":\"0x7997ebbdee6a2493f28e7032c7a8b906ade40f807d95734e2653c8f1b023ff47\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://c8ca41bb2619bf27e5bf886d1322f0e2dffd096c49f7ae6e716541dd1e1ddce5\",\"dweb:/ipfs/Qmb8zATUWWTtiWaSLjbAe6PGnJPes9ANvEyk7pYoWR3P3Y\"]},\"/home/runner/work/mud/mud/packages/world/src/IWorldContextConsumer.sol\":{\"keccak256\":\"0x22b8cb3ffcc21cb1657d57fc8ac929d2d6fdd199328e6f43ad2cb54f53dcd500\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://47c001f6b7c6d6e453c340618d23b1532078abb7d0fd7283405071e4e8ff8d2d\",\"dweb:/ipfs/QmRW3femBhqQCPwDEj4Jop2Dnd3EU21ufg7GDVwN4joCQu\"]},\"/home/runner/work/mud/mud/packages/world/src/WorldContext.sol\":{\"keccak256\":\"0xa11d93077d94f18683f1098b69c4713a48001ae15054476135ec9569041abb9a\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9b1d3384def68b4061c445b55602dd9cbcd4e8c58c13db5e945f284a05c1b518\",\"dweb:/ipfs/Qma5DUZrSKZUxrxiGCpyRPWMJNdHU2wu6qDEsFWEJSnLfN\"]},\"/home/runner/work/mud/mud/packages/world/src/revertWithBytes.sol\":{\"keccak256\":\"0x16795bdbfd7956d733df9ada1030ee7a1a714e3b9da5899149a7b07568c4af55\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7a71128b4989e78215d5fc57dae8c2f84c6b5e503c159178c0df6f642b8228df\",\"dweb:/ipfs/QmNYTfBe62SdGESZ32fxME72CbAxEqk4j79jBT7655C4u7\"]},\"node_modules/@latticexyz/schema-type/src/solidity/SchemaType.sol\":{\"keccak256\":\"0x770eff7a38b9b7b1613dc11ca09db4f28b42a117c9b39b2a06a650a58a250bdb\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://39f544110658a53def52c2a4e33b8b158b95a4f14fccea58d5268b6e728d86d4\",\"dweb:/ipfs/QmTesj6tjSFbfAiKUitXapdNYWPStS8bLkB3r22qfyHwUC\"]},\"node_modules/@latticexyz/store/src/Bytes.sol\":{\"keccak256\":\"0xab31edce915377852bb5f29f7f2ccfc50cac087d64d2a8aae669715ad862d558\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3187e86e43be1fbdd59df45c695294f1114aa1ac48e6445c0cb26089434be5c4\",\"dweb:/ipfs/Qmck7shMVrcKMVkgN2pC1byPY7hb3V9fTxnUcGgxAUeXYk\"]},\"node_modules/@latticexyz/store/src/FieldLayout.sol\":{\"keccak256\":\"0x2a0536cd6cecc479d0b81d5aad6380231f4d6873beadc54814d801c2036b02c0\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e07c041e19146a9ec258cc700a450b4d49440202895eb12f3bb17508427c23ba\",\"dweb:/ipfs/QmXoqrCGDSkuFgNSMURRFdjokjREL78nLDzNaUi6rjefy9\"]},\"node_modules/@latticexyz/store/src/Hook.sol\":{\"keccak256\":\"0x045024523eb55d08ad8d13eca6185bff2988865f4aa12e3f9372029c2ecb8ddd\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6621c53b49f8fe0557d1a1db47bfe1561801c09256948dd0652fb41541891a18\",\"dweb:/ipfs/QmZgFVCUH1pKcc9MeFyzMe1VW87SLz6c9szGwrDRUp6BZe\"]},\"node_modules/@latticexyz/store/src/IERC165.sol\":{\"keccak256\":\"0x2bbc3c43400c15a91a5cb35430a91309cb64a4d13a0a170eacec71dcf334feaf\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://f44dfc9605067de539de07a76a34bf469faa9e6dad8c192abafc2e05860c7dd2\",\"dweb:/ipfs/QmX8xgG6XWokM7YFwFZvmMhuh1uhkSjxCMD2oTHjUVdapb\"]},\"node_modules/@latticexyz/store/src/IStore.sol\":{\"keccak256\":\"0x9092b65551d0f910e5645cebb5acadb387cdd192d75fa89cd6b293bd65b28827\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://478825a6f7eff9ddab968e71e1d55ebee279d3b318f10976d9334384000059c0\",\"dweb:/ipfs/Qme7NY976woRy3RQjE4tkkiwoXnoVtTmER3PbWCSbjZ2kb\"]},\"node_modules/@latticexyz/store/src/IStoreData.sol\":{\"keccak256\":\"0xa8eade05c551aeef35c84727d7a44af239516deb2d8a0cfb7ebeb5d88c6995e5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5335910bd8a204abb5f4396fb911a5ee5c221bd7fa63b1cc8ae5e737c6458c6a\",\"dweb:/ipfs/QmckkCAfrNcWo3yDxoD1jCe1k4iDA2GzVDpFjJZs7W79vx\"]},\"node_modules/@latticexyz/store/src/IStoreErrors.sol\":{\"keccak256\":\"0xb9070663ded3cad82285bb7610949e422f88abb48c2ddbd792af83d127d64212\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://830490f1c888bec86df1e7ef43773d60ebdbdfdb2b91ab7fe074e2f38d7439dc\",\"dweb:/ipfs/QmS26fpXdZuGgMmjcdQDf9k1Bedn2dhjk9byFZJoNkctPZ\"]},\"node_modules/@latticexyz/store/src/IStoreEvents.sol\":{\"keccak256\":\"0xdd3104680808f975462a85cbd4fa87783ba5395797419caeeca37e8f8627a16f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://943864b7eb16ad2047ade5a8598e85c8a4b46d1aed6aef02bfb7cee8de732b4d\",\"dweb:/ipfs/QmTEij4caToSNk15PFpubXYDy9QhwmPyP9tMXjUse2cTdv\"]},\"node_modules/@latticexyz/store/src/IStoreHook.sol\":{\"keccak256\":\"0xa6777c7868333996ad9c61a94457dcac702d8d7445a104dfdc86543d25e7470e\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6268a16449d7529a94746d0103670dd0e38faf5117bf914fb01da9947ab44c2e\",\"dweb:/ipfs/QmaSfbx1QRA3jw2K8bGkQTw4CTGPUzNqnCJW7LwaFUJCXy\"]},\"node_modules/@latticexyz/store/src/IStoreRead.sol\":{\"keccak256\":\"0xd2180d53ecd31069b1166f170ecdcd85917ac50f45fc26fb39b49cee7ba00e37\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://1494bb0a3228e2d194bddaed4761fd3ca865979f0e3f3a53acd271143a4aa0ac\",\"dweb:/ipfs/Qmaddnzzmu99iP9dTWK9ZeByh5dZyjY9SpVnRdvyr2fBAo\"]},\"node_modules/@latticexyz/store/src/IStoreRegistration.sol\":{\"keccak256\":\"0xf448fbb2bc9c982721a43234463656da5a49cea08543e62148d54f11e1ac3e2f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://64b3579d9b9dcd73dca2beab3d4fcf60237420945ebbb2e9f4ffcc88f4110115\",\"dweb:/ipfs/QmaW5nN3zGEriSYHncye6Nz2TkAw1oo1CyG2JuJTJrJoXg\"]},\"node_modules/@latticexyz/store/src/IStoreWrite.sol\":{\"keccak256\":\"0x8b6c7af5ee330928aebb58c8872d3944304ee10ed11f8a325b6accc4ec5df81b\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://b866d158701c7a40834bed735194b804ef219f2bbe574e2307785fff7bcf9da1\",\"dweb:/ipfs/QmXzJfZkXVfyr2RFGwDuazeVnV3UWYmQxjKZ3KzFbbe75U\"]},\"node_modules/@latticexyz/store/src/Memory.sol\":{\"keccak256\":\"0x69295976e61a1a108d1b4d6eb497b238730309f3047c4320d48e01a0ce8d4ec7\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://559c451b21fb9dd4fec27b41bef42f4362f1e7ebb7992106d548b9d4f733b3e5\",\"dweb:/ipfs/QmeSE7YTW5zUrfZYFVb2pFnDe3XxiT8XNecfwC3wfpxCRv\"]},\"node_modules/@latticexyz/store/src/PackedCounter.sol\":{\"keccak256\":\"0x44ddfa9eb8a861462c550f0a9d66c40c68acdb347a61fa765949608407a2c7fb\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://47ee957f4b19cab9e20bf5fc569c015eca13852fb3351f2a105a8be9c48204c0\",\"dweb:/ipfs/QmNkyzDobVQLoq9BtQ8HtgsPLiqnmi97EZx1wsu6wp8nKH\"]},\"node_modules/@latticexyz/store/src/ResourceId.sol\":{\"keccak256\":\"0x40983c580b8958e55db4520095934a535e98544ffe8228327e598973eb6647ed\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://839d658fa2bb2b1f09a08149d2bf0c26a26c301ad2dda8154fc99458085a695d\",\"dweb:/ipfs/Qmd5jHHYrgqraPqF8bjzT4xyjsoPk8K7pkxXLLfz6MRT6d\"]},\"node_modules/@latticexyz/store/src/Schema.sol\":{\"keccak256\":\"0x58aef318ba03f8ff8866ef70f8a30f549b150657ea699734aefe16c298956401\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7dc104690a7e2bcf5ce1afadcd58f8ef4d639b4b92b9ad9293656235d54395f3\",\"dweb:/ipfs/QmYJJvEv5KBJ3kzf9AkgRn7Uu5dp4exGTRddf4cae1btgE\"]},\"node_modules/@latticexyz/store/src/Slice.sol\":{\"keccak256\":\"0xfaf54b1f5acccd4c6ce3f8377050ee84efbb423cb604b4651e8b9ea3b467bf32\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://acf2ce7ffec21f28ad1dc6da06c342f1212a03a3d16a0be7ee85715a5940718c\",\"dweb:/ipfs/QmTCN3NSdFg87hi7KS2Xtq7PsmRUMG64SxC8PtP3p2GzuT\"]},\"node_modules/@latticexyz/store/src/Storage.sol\":{\"keccak256\":\"0x0893905ebe431a414226b479a84a54804091001a406222c748adbd4b651853a5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://bcfcd3848127884041f0bcd727a0e7acbddec283aa6c16ba47abc6a3be720648\",\"dweb:/ipfs/QmY5fBd53e4Ro6vzTZYsteSibSTXVA3GHTeCAiUZTa5DPZ\"]},\"node_modules/@latticexyz/store/src/StoreCore.sol\":{\"keccak256\":\"0x95b7d62d84b43777c54dd1c7d941dbb5ba0afc02c444c30cfdb1de671bbbf180\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://fe62a2fdb2a73610c3072f31b7f88ed3f9d03c1009fe0f0ef37a7eb814b23534\",\"dweb:/ipfs/QmV85zaV5HAD6eGc5N4RmdtmpR6EwkswVLQTaR2aJqsXrj\"]},\"node_modules/@latticexyz/store/src/StoreSwitch.sol\":{\"keccak256\":\"0xf132af10f960a498f49c0534027056e715f4bdcb8fbdb53ac6879c92309ab416\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e85a09aeb7543bcd9d74b7ad319ae61e1f7f15a6a0ad9e79aff750fbd18111c7\",\"dweb:/ipfs/QmY6xgqeeaR1FsCPLmFbVgjm1D2UyrXNABKXWLfFaSmBhR\"]},\"node_modules/@latticexyz/store/src/codegen/index.sol\":{\"keccak256\":\"0xf337a5abb2d43ef00c1c200e7fbec30fc89c7c701e457ab4277194b700d2aea3\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eccdf6158076b4e8f1b587a0310228f53323705e054a44eaa7733f38805c3ee6\",\"dweb:/ipfs/QmbXEVNTctg54dK9awdCVyAjeuUjR6ckfmmXBP8DrFmjyq\"]},\"node_modules/@latticexyz/store/src/codegen/tables/Hooks.sol\":{\"keccak256\":\"0xacf4aee01f167b98b2869bdf4407682fd9f18b85507048bc274bcb98d094948c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://86b114326973cef4f59c17e947945d09b90a0c48ede1da80f4f8aed0b6de179c\",\"dweb:/ipfs/QmZ6K6gZnV2ZdgbT8yG7Jz4HgoPymgdX3jTy6oUnG9xdgD\"]},\"node_modules/@latticexyz/store/src/codegen/tables/ResourceIds.sol\":{\"keccak256\":\"0xc2dc1bd6335fb0cc27cb7a80298d954d9ce0a0e9864d1dd8531aadb66c0ce21d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://a7e34a386bd44933010c4f5a4dbfe8b0b8e5e9e39eaead46a2ebef0018db9b72\",\"dweb:/ipfs/QmQPyAdLUmE2Y6Ai7t2n56USg25PGHYxxXWRi1zEkdyT6a\"]},\"node_modules/@latticexyz/store/src/codegen/tables/StoreHooks.sol\":{\"keccak256\":\"0xfecdfde3b41c04dcf43e9c19f84f6a7f77df0fd844928692742b47662a0b814c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://968e83ac99e8d1799730aa6f1f23962c3fe3566cd7ec8bcf97d297823c364764\",\"dweb:/ipfs/QmVnhbeg89ajfLP1U1HDLiWi8T7HuFtsXUydjKXyyPa7MP\"]},\"node_modules/@latticexyz/store/src/codegen/tables/Tables.sol\":{\"keccak256\":\"0x42b9fd484a055e8e312a2396059fb76a962608fa3a875ea3da6e5aab79084d04\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://866fd30788245eb54ac09d70768c0b34846d361b4219781c814fb06e38fb546c\",\"dweb:/ipfs/QmRbLCYjZ9qefcC8q7gnsAUsqCTEjdRtRnXdSNB1x7saPz\"]},\"node_modules/@latticexyz/store/src/constants.sol\":{\"keccak256\":\"0x9e37c64c119ef07ad914bc589ee3f6d67946ab95877978c1ee3e2c1ffae07076\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3fad47e542025382aa28e8171253e34f93b2f149434b67a26989542d70218793\",\"dweb:/ipfs/QmW6JsKNwPc6oAMrgcikgR2EPwMUtQANiuZSQSGCd29HHC\"]},\"node_modules/@latticexyz/store/src/leftMask.sol\":{\"keccak256\":\"0xd0360567e4d77c6a8e3d8a5f4bf3653ccde4d268674c50988d55695dc6193f6f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://53e6bcb53fcb08ee9426225fdab7c41df91e12cb4f80d92895a6117338627401\",\"dweb:/ipfs/QmeLcaPGeMBpNSTSsPYK3PHpzKuGMjuitCweAWcoXK2mXr\"]},\"node_modules/@latticexyz/store/src/storeHookTypes.sol\":{\"keccak256\":\"0x60880298016fa117ed9a43ddfd020f11d98a2d345bdcb08e5884e40df98eddd5\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://3619dfda1fd514c0fc5fb34c14d5b5aa41dd6ba6045d37d5f4c8199f3a826f81\",\"dweb:/ipfs/QmbzRBYfVa423gNzCitpGN3i2N9oeGYfinVE1jgtqxnNZX\"]},\"node_modules/@latticexyz/store/src/storeResourceTypes.sol\":{\"keccak256\":\"0xada1867ba72930fc5cf5562dd4e36de849dbac9c833b7969cb1b046a808fabf2\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6e4b5fdcaa54f567a3f8561c2c3fbc0d68c8dad892a4a8e5418bbce8efc53d84\",\"dweb:/ipfs/QmTWbYJX1yrCqrEwUKB9rGpHdRvLNU8GCkBbxnLjGD4d2t\"]},\"node_modules/@latticexyz/store/src/tightcoder/DecodeSlice.sol\":{\"keccak256\":\"0x1af0fd984640123391ec2df855d00298504b7ce186a56c2caca769cfd9e08e04\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://7305a62318890d2cc6420ba7dec13d9f2c1cb67ac689015fc83b9cbccd0696f1\",\"dweb:/ipfs/QmR8jGNLbt64Tv1YZKRVBCVsd71oeUQFzGHHtpsrs4PuRq\"]},\"node_modules/@latticexyz/store/src/tightcoder/EncodeArray.sol\":{\"keccak256\":\"0x1c280d24360282e196d9c4833c58c2437108cea2af0ac7596f95be81389e306d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6b4556b6eeae9328fbd9adcce346547e823c397503276a4d63effb67e00b5b49\",\"dweb:/ipfs/QmUsynVsMYzjh8oJR8YB7SRrwFMdXcsQsHBrXxLEEFxsiB\"]},\"node_modules/@latticexyz/store/src/tightcoder/TightCoder.sol\":{\"keccak256\":\"0x5cacd4cb371e0a79bc8d64f62349d568fd8b08093c11ae0c3db4f16480d8808b\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://12b64ddf2b5c19cf68ba93a8153ed79cbafe7a91e015d4b2f25eb1d42ab06256\",\"dweb:/ipfs/QmQz5WwztcuTbSGFv2pkhU3w5scUj1gmavoyUpduxk2v3A\"]},\"node_modules/@latticexyz/store/src/version.sol\":{\"keccak256\":\"0x01029999a48b7c1d85de84cae465dd24ec126c95b8a865cd20c7ed5dfcc0f02c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9750164ce996badb0fd7df2f526780b9cb9558912405fe46f31064bd7c522491\",\"dweb:/ipfs/QmYf8m2ZXFANRc9ysHgNkNtSF327ccxKYjCUJ49UXBKADk\"]}},\"version\":1}",
   "metadata": {
     "compiler": {
       "version": "0.8.21+commit.d9974bed"
@@ -147,7 +147,7 @@
         "methods": {
           "_msgSender()": {
             "returns": {
-              "sender": "The address of the trusted sender."
+              "sender": "The `msg.sender` in the call to the World contract before the World routed the call to the WorldContextConsumer contract."
             }
           },
           "_msgValue()": {
@@ -175,7 +175,7 @@
         "kind": "user",
         "methods": {
           "_msgSender()": {
-            "notice": "Extracts the trusted msg.sender value from the appended calldata."
+            "notice": "Extract the `msg.sender` from the context appended to the calldata."
           },
           "_msgValue()": {
             "notice": "Extract the `msg.value` from the context appended to the calldata."
@@ -226,10 +226,10 @@
         "license": "MIT"
       },
       "/home/runner/work/mud/mud/packages/world/src/WorldContext.sol": {
-        "keccak256": "0x45792667fe063195103e9fd74e3e9e0b0b4aea4fc4a0a8a3e69538c14751217b",
+        "keccak256": "0xa11d93077d94f18683f1098b69c4713a48001ae15054476135ec9569041abb9a",
         "urls": [
-          "bzz-raw://cba8976da1e2f7e336045e8d65eba89d18ae49e4688de61ff61a95fb817fe9fc",
-          "dweb:/ipfs/QmWoByJM6DmheS2jisxSvAzrqC6XWrgaKxoNNUr44aXJtE"
+          "bzz-raw://9b1d3384def68b4061c445b55602dd9cbcd4e8c58c13db5e945f284a05c1b518",
+          "dweb:/ipfs/Qma5DUZrSKZUxrxiGCpyRPWMJNdHU2wu6qDEsFWEJSnLfN"
         ],
         "license": "MIT"
       },
@@ -394,10 +394,10 @@
         "license": "MIT"
       },
       "node_modules/@latticexyz/store/src/StoreCore.sol": {
-        "keccak256": "0x1dd80c8f47d425b611aa382a226a47919831976e0da7145a227c1bf629eec24d",
+        "keccak256": "0x95b7d62d84b43777c54dd1c7d941dbb5ba0afc02c444c30cfdb1de671bbbf180",
         "urls": [
-          "bzz-raw://ac31d8551e5ef995d45e8eef1067e9793a2228cc3a539e16121d27083b203715",
-          "dweb:/ipfs/QmWntan3y5oFxNnuvit8A4Xiuk2bMWasWTA7cqkh7Tk427"
+          "bzz-raw://fe62a2fdb2a73610c3072f31b7f88ed3f9d03c1009fe0f0ef37a7eb814b23534",
+          "dweb:/ipfs/QmV85zaV5HAD6eGc5N4RmdtmpR6EwkswVLQTaR2aJqsXrj"
         ],
         "license": "MIT"
       },
@@ -518,38 +518,41 @@
   },
   "ast": {
     "absolutePath": "/home/runner/work/mud/mud/packages/world/src/WorldContext.sol",
-    "id": 23782,
+    "id": 23814,
     "exportedSymbols": {
       "CONTEXT_BYTES": [
-        23567
+        23565
       ],
       "ERC165_INTERFACE_ID": [
-        23234
+        23232
       ],
       "IWorldContextConsumer": [
-        23380
+        23378
       ],
       "StoreSwitch": [
-        31262
+        31292
       ],
       "WORLD_CONTEXT_CONSUMER_INTERFACE_ID": [
-        23358
+        23356
       ],
       "WorldContextConsumer": [
-        23627
+        23619
       ],
-      "WorldContextProvider": [
-        23781
+      "WorldContextConsumerLib": [
+        23659
+      ],
+      "WorldContextProviderLib": [
+        23813
       ],
       "revertWithBytes": [
-        24356
+        24388
       ]
     },
     "nodeType": "SourceUnit",
-    "src": "32:6995:40",
+    "src": "32:8156:40",
     "nodes": [
       {
-        "id": 23553,
+        "id": 23551,
         "nodeType": "PragmaDirective",
         "src": "32:25:40",
         "nodes": [],
@@ -561,23 +564,23 @@
         ]
       },
       {
-        "id": 23555,
+        "id": 23553,
         "nodeType": "ImportDirective",
         "src": "59:68:40",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/store/src/StoreSwitch.sol",
         "file": "@latticexyz/store/src/StoreSwitch.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 23782,
-        "sourceUnit": 31263,
+        "scope": 23814,
+        "sourceUnit": 31293,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 23554,
+              "id": 23552,
               "name": "StoreSwitch",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 31262,
+              "referencedDeclaration": 31292,
               "src": "68:11:40",
               "typeDescriptions": {}
             },
@@ -587,23 +590,23 @@
         "unitAlias": ""
       },
       {
-        "id": 23557,
+        "id": 23555,
         "nodeType": "ImportDirective",
         "src": "128:56:40",
         "nodes": [],
         "absolutePath": "/home/runner/work/mud/mud/packages/world/src/revertWithBytes.sol",
         "file": "./revertWithBytes.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 23782,
-        "sourceUnit": 24357,
+        "scope": 23814,
+        "sourceUnit": 24389,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 23556,
+              "id": 23554,
               "name": "revertWithBytes",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 24356,
+              "referencedDeclaration": 24388,
               "src": "137:15:40",
               "typeDescriptions": {}
             },
@@ -613,23 +616,23 @@
         "unitAlias": ""
       },
       {
-        "id": 23559,
+        "id": 23557,
         "nodeType": "ImportDirective",
         "src": "185:52:40",
         "nodes": [],
         "absolutePath": "/home/runner/work/mud/mud/packages/world/src/IERC165.sol",
         "file": "./IERC165.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 23782,
-        "sourceUnit": 23245,
+        "scope": 23814,
+        "sourceUnit": 23243,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 23558,
+              "id": 23556,
               "name": "ERC165_INTERFACE_ID",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 23234,
+              "referencedDeclaration": 23232,
               "src": "194:19:40",
               "typeDescriptions": {}
             },
@@ -639,23 +642,23 @@
         "unitAlias": ""
       },
       {
-        "id": 23562,
+        "id": 23560,
         "nodeType": "ImportDirective",
         "src": "238:105:40",
         "nodes": [],
         "absolutePath": "/home/runner/work/mud/mud/packages/world/src/IWorldContextConsumer.sol",
         "file": "./IWorldContextConsumer.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 23782,
-        "sourceUnit": 23381,
+        "scope": 23814,
+        "sourceUnit": 23379,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 23560,
+              "id": 23558,
               "name": "IWorldContextConsumer",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 23380,
+              "referencedDeclaration": 23378,
               "src": "247:21:40",
               "typeDescriptions": {}
             },
@@ -663,11 +666,11 @@
           },
           {
             "foreign": {
-              "id": 23561,
+              "id": 23559,
               "name": "WORLD_CONTEXT_CONSUMER_INTERFACE_ID",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 23358,
+              "referencedDeclaration": 23356,
               "src": "270:35:40",
               "typeDescriptions": {}
             },
@@ -677,7 +680,7 @@
         "unitAlias": ""
       },
       {
-        "id": 23567,
+        "id": 23565,
         "nodeType": "VariableDeclaration",
         "src": "420:40:40",
         "nodes": [],
@@ -685,7 +688,7 @@
         "mutability": "constant",
         "name": "CONTEXT_BYTES",
         "nameLocation": "437:13:40",
-        "scope": 23782,
+        "scope": 23814,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -693,7 +696,7 @@
           "typeString": "uint256"
         },
         "typeName": {
-          "id": 23563,
+          "id": 23561,
           "name": "uint256",
           "nodeType": "ElementaryTypeName",
           "src": "420:7:40",
@@ -707,14 +710,14 @@
             "typeIdentifier": "t_rational_52_by_1",
             "typeString": "int_const 52"
           },
-          "id": 23566,
+          "id": 23564,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
           "lValueRequested": false,
           "leftExpression": {
             "hexValue": "3230",
-            "id": 23564,
+            "id": 23562,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -732,7 +735,7 @@
           "operator": "+",
           "rightExpression": {
             "hexValue": "3332",
-            "id": 23565,
+            "id": 23563,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -755,318 +758,110 @@
         "visibility": "internal"
       },
       {
-        "id": 23627,
+        "id": 23619,
         "nodeType": "ContractDefinition",
-        "src": "937:1838:40",
+        "src": "937:1564:40",
         "nodes": [
           {
-            "id": 23590,
+            "id": 23579,
             "nodeType": "FunctionDefinition",
-            "src": "1151:379:40",
+            "src": "1245:113:40",
             "nodes": [],
             "body": {
-              "id": 23589,
+              "id": 23578,
               "nodeType": "Block",
-              "src": "1210:320:40",
+              "src": "1304:54:40",
               "nodes": [],
               "statements": [
                 {
-                  "AST": {
-                    "nativeSrc": "1225:250:40",
-                    "nodeType": "YulBlock",
-                    "src": "1225:250:40",
-                    "statements": [
-                      {
-                        "nativeSrc": "1402:67:40",
-                        "nodeType": "YulAssignment",
-                        "src": "1402:67:40",
-                        "value": {
-                          "arguments": [
-                            {
-                              "kind": "number",
-                              "nativeSrc": "1416:2:40",
-                              "nodeType": "YulLiteral",
-                              "src": "1416:2:40",
-                              "type": "",
-                              "value": "96"
-                            },
-                            {
-                              "arguments": [
-                                {
-                                  "arguments": [
-                                    {
-                                      "arguments": [],
-                                      "functionName": {
-                                        "name": "calldatasize",
-                                        "nativeSrc": "1437:12:40",
-                                        "nodeType": "YulIdentifier",
-                                        "src": "1437:12:40"
-                                      },
-                                      "nativeSrc": "1437:14:40",
-                                      "nodeType": "YulFunctionCall",
-                                      "src": "1437:14:40"
-                                    },
-                                    {
-                                      "name": "CONTEXT_BYTES",
-                                      "nativeSrc": "1453:13:40",
-                                      "nodeType": "YulIdentifier",
-                                      "src": "1453:13:40"
-                                    }
-                                  ],
-                                  "functionName": {
-                                    "name": "sub",
-                                    "nativeSrc": "1433:3:40",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1433:3:40"
-                                  },
-                                  "nativeSrc": "1433:34:40",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "1433:34:40"
-                                }
-                              ],
-                              "functionName": {
-                                "name": "calldataload",
-                                "nativeSrc": "1420:12:40",
-                                "nodeType": "YulIdentifier",
-                                "src": "1420:12:40"
-                              },
-                              "nativeSrc": "1420:48:40",
-                              "nodeType": "YulFunctionCall",
-                              "src": "1420:48:40"
-                            }
-                          ],
-                          "functionName": {
-                            "name": "shr",
-                            "nativeSrc": "1412:3:40",
-                            "nodeType": "YulIdentifier",
-                            "src": "1412:3:40"
-                          },
-                          "nativeSrc": "1412:57:40",
-                          "nodeType": "YulFunctionCall",
-                          "src": "1412:57:40"
-                        },
-                        "variableNames": [
-                          {
-                            "name": "sender",
-                            "nativeSrc": "1402:6:40",
-                            "nodeType": "YulIdentifier",
-                            "src": "1402:6:40"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "evmVersion": "paris",
-                  "externalReferences": [
-                    {
-                      "declaration": 23567,
-                      "isOffset": false,
-                      "isSlot": false,
-                      "src": "1453:13:40",
-                      "valueSize": 1
-                    },
-                    {
-                      "declaration": 23574,
-                      "isOffset": false,
-                      "isSlot": false,
-                      "src": "1402:6:40",
-                      "valueSize": 1
-                    }
-                  ],
-                  "id": 23576,
-                  "nodeType": "InlineAssembly",
-                  "src": "1216:259:40"
-                },
-                {
-                  "condition": {
-                    "commonType": {
-                      "typeIdentifier": "t_address",
-                      "typeString": "address"
-                    },
-                    "id": 23582,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftExpression": {
-                      "id": 23577,
-                      "name": "sender",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 23574,
-                      "src": "1484:6:40",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    },
-                    "nodeType": "BinaryOperation",
-                    "operator": "==",
-                    "rightExpression": {
-                      "arguments": [
-                        {
-                          "hexValue": "30",
-                          "id": 23580,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": true,
-                          "kind": "number",
-                          "lValueRequested": false,
-                          "nodeType": "Literal",
-                          "src": "1502:1:40",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_rational_0_by_1",
-                            "typeString": "int_const 0"
-                          },
-                          "value": "0"
-                        }
-                      ],
+                  "expression": {
+                    "arguments": [],
+                    "expression": {
+                      "argumentTypes": [],
                       "expression": {
-                        "argumentTypes": [
-                          {
-                            "typeIdentifier": "t_rational_0_by_1",
-                            "typeString": "int_const 0"
-                          }
-                        ],
-                        "id": 23579,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "lValueRequested": false,
-                        "nodeType": "ElementaryTypeNameExpression",
-                        "src": "1494:7:40",
+                        "id": 23574,
+                        "name": "WorldContextConsumerLib",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 23659,
+                        "src": "1317:23:40",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_address_$",
-                          "typeString": "type(address)"
-                        },
-                        "typeName": {
-                          "id": 23578,
-                          "name": "address",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "1494:7:40",
-                          "typeDescriptions": {}
+                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$23659_$",
+                          "typeString": "type(library WorldContextConsumerLib)"
                         }
                       },
-                      "id": 23581,
+                      "id": 23575,
                       "isConstant": false,
                       "isLValue": false,
-                      "isPure": true,
-                      "kind": "typeConversion",
+                      "isPure": false,
                       "lValueRequested": false,
-                      "nameLocations": [],
-                      "names": [],
-                      "nodeType": "FunctionCall",
-                      "src": "1494:10:40",
-                      "tryCall": false,
+                      "memberLocation": "1341:10:40",
+                      "memberName": "_msgSender",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 23639,
+                      "src": "1317:34:40",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
+                        "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
+                        "typeString": "function () view returns (address)"
                       }
                     },
-                    "src": "1484:20:40",
+                    "id": 23576,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "nameLocations": [],
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "1317:36:40",
+                    "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
                     }
                   },
-                  "id": 23588,
-                  "nodeType": "IfStatement",
-                  "src": "1480:45:40",
-                  "trueBody": {
-                    "expression": {
-                      "id": 23586,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "leftHandSide": {
-                        "id": 23583,
-                        "name": "sender",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 23574,
-                        "src": "1506:6:40",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_address",
-                          "typeString": "address"
-                        }
-                      },
-                      "nodeType": "Assignment",
-                      "operator": "=",
-                      "rightHandSide": {
-                        "expression": {
-                          "id": 23584,
-                          "name": "msg",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": -15,
-                          "src": "1515:3:40",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_magic_message",
-                            "typeString": "msg"
-                          }
-                        },
-                        "id": 23585,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberLocation": "1519:6:40",
-                        "memberName": "sender",
-                        "nodeType": "MemberAccess",
-                        "src": "1515:10:40",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_address",
-                          "typeString": "address"
-                        }
-                      },
-                      "src": "1506:19:40",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      }
-                    },
-                    "id": 23587,
-                    "nodeType": "ExpressionStatement",
-                    "src": "1506:19:40"
-                  }
+                  "functionReturnParameters": 23573,
+                  "id": 23577,
+                  "nodeType": "Return",
+                  "src": "1310:43:40"
                 }
               ]
             },
             "baseFunctions": [
-              23367
+              23365
             ],
             "documentation": {
-              "id": 23571,
+              "id": 23569,
               "nodeType": "StructuredDocumentation",
-              "src": "1005:143:40",
-              "text": " @notice Extracts the trusted msg.sender value from the appended calldata.\n @return sender The address of the trusted sender."
+              "src": "1005:237:40",
+              "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."
             },
             "functionSelector": "119df25f",
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "_msgSender",
-            "nameLocation": "1160:10:40",
+            "nameLocation": "1254:10:40",
             "parameters": {
-              "id": 23572,
+              "id": 23570,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1170:2:40"
+              "src": "1264:2:40"
             },
             "returnParameters": {
-              "id": 23575,
+              "id": 23573,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23574,
+                  "id": 23572,
                   "mutability": "mutable",
                   "name": "sender",
-                  "nameLocation": "1202:6:40",
+                  "nameLocation": "1296:6:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23590,
-                  "src": "1194:14:40",
+                  "scope": 23579,
+                  "src": "1288:14:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1074,10 +869,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23573,
+                    "id": 23571,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1194:7:40",
+                    "src": "1288:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -1087,114 +882,86 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1193:16:40"
+              "src": "1287:16:40"
             },
-            "scope": 23627,
+            "scope": 23619,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 23598,
+            "id": 23590,
             "nodeType": "FunctionDefinition",
-            "src": "1771:212:40",
+            "src": "1599:110:40",
             "nodes": [],
             "body": {
-              "id": 23597,
+              "id": 23589,
               "nodeType": "Block",
-              "src": "1828:155:40",
+              "src": "1656:53:40",
               "nodes": [],
               "statements": [
                 {
-                  "AST": {
-                    "nativeSrc": "1843:136:40",
-                    "nodeType": "YulBlock",
-                    "src": "1843:136:40",
-                    "statements": [
-                      {
-                        "nativeSrc": "1927:46:40",
-                        "nodeType": "YulAssignment",
-                        "src": "1927:46:40",
-                        "value": {
-                          "arguments": [
-                            {
-                              "arguments": [
-                                {
-                                  "arguments": [],
-                                  "functionName": {
-                                    "name": "calldatasize",
-                                    "nativeSrc": "1953:12:40",
-                                    "nodeType": "YulIdentifier",
-                                    "src": "1953:12:40"
-                                  },
-                                  "nativeSrc": "1953:14:40",
-                                  "nodeType": "YulFunctionCall",
-                                  "src": "1953:14:40"
-                                },
-                                {
-                                  "kind": "number",
-                                  "nativeSrc": "1969:2:40",
-                                  "nodeType": "YulLiteral",
-                                  "src": "1969:2:40",
-                                  "type": "",
-                                  "value": "32"
-                                }
-                              ],
-                              "functionName": {
-                                "name": "sub",
-                                "nativeSrc": "1949:3:40",
-                                "nodeType": "YulIdentifier",
-                                "src": "1949:3:40"
-                              },
-                              "nativeSrc": "1949:23:40",
-                              "nodeType": "YulFunctionCall",
-                              "src": "1949:23:40"
-                            }
-                          ],
-                          "functionName": {
-                            "name": "calldataload",
-                            "nativeSrc": "1936:12:40",
-                            "nodeType": "YulIdentifier",
-                            "src": "1936:12:40"
-                          },
-                          "nativeSrc": "1936:37:40",
-                          "nodeType": "YulFunctionCall",
-                          "src": "1936:37:40"
-                        },
-                        "variableNames": [
-                          {
-                            "name": "value",
-                            "nativeSrc": "1927:5:40",
-                            "nodeType": "YulIdentifier",
-                            "src": "1927:5:40"
-                          }
-                        ]
+                  "expression": {
+                    "arguments": [],
+                    "expression": {
+                      "argumentTypes": [],
+                      "expression": {
+                        "id": 23585,
+                        "name": "WorldContextConsumerLib",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 23659,
+                        "src": "1669:23:40",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_contract$_WorldContextConsumerLib_$23659_$",
+                          "typeString": "type(library WorldContextConsumerLib)"
+                        }
+                      },
+                      "id": 23586,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberLocation": "1693:9:40",
+                      "memberName": "_msgValue",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 23647,
+                      "src": "1669:33:40",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_pure$__$returns$_t_uint256_$",
+                        "typeString": "function () pure returns (uint256)"
                       }
-                    ]
-                  },
-                  "evmVersion": "paris",
-                  "externalReferences": [
-                    {
-                      "declaration": 23594,
-                      "isOffset": false,
-                      "isSlot": false,
-                      "src": "1927:5:40",
-                      "valueSize": 1
+                    },
+                    "id": 23587,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "nameLocations": [],
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "1669:35:40",
+                    "tryCall": false,
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
                     }
-                  ],
-                  "id": 23596,
-                  "nodeType": "InlineAssembly",
-                  "src": "1834:145:40"
+                  },
+                  "functionReturnParameters": 23584,
+                  "id": 23588,
+                  "nodeType": "Return",
+                  "src": "1662:42:40"
                 }
               ]
             },
             "baseFunctions": [
-              23373
+              23371
             ],
             "documentation": {
-              "id": 23591,
+              "id": 23580,
               "nodeType": "StructuredDocumentation",
-              "src": "1534:234:40",
+              "src": "1362:234:40",
               "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."
             },
             "functionSelector": "45ec9354",
@@ -1202,26 +969,26 @@
             "kind": "function",
             "modifiers": [],
             "name": "_msgValue",
-            "nameLocation": "1780:9:40",
+            "nameLocation": "1608:9:40",
             "parameters": {
-              "id": 23592,
+              "id": 23581,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1789:2:40"
+              "src": "1617:2:40"
             },
             "returnParameters": {
-              "id": 23595,
+              "id": 23584,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23594,
+                  "id": 23583,
                   "mutability": "mutable",
                   "name": "value",
-                  "nameLocation": "1821:5:40",
+                  "nameLocation": "1649:5:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23598,
-                  "src": "1813:13:40",
+                  "scope": 23590,
+                  "src": "1641:13:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1229,10 +996,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23593,
+                    "id": 23582,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1813:7:40",
+                    "src": "1641:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1241,22 +1008,22 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1812:15:40"
+              "src": "1640:15:40"
             },
-            "scope": 23627,
+            "scope": 23619,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 23609,
+            "id": 23601,
             "nodeType": "FunctionDefinition",
-            "src": "2199:95:40",
+            "src": "1925:95:40",
             "nodes": [],
             "body": {
-              "id": 23608,
+              "id": 23600,
               "nodeType": "Block",
-              "src": "2247:47:40",
+              "src": "1973:47:40",
               "nodes": [],
               "statements": [
                 {
@@ -1265,33 +1032,33 @@
                     "expression": {
                       "argumentTypes": [],
                       "expression": {
-                        "id": 23604,
+                        "id": 23596,
                         "name": "StoreSwitch",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 31262,
-                        "src": "2260:11:40",
+                        "referencedDeclaration": 31292,
+                        "src": "1986:11:40",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$31262_$",
+                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$31292_$",
                           "typeString": "type(library StoreSwitch)"
                         }
                       },
-                      "id": 23605,
+                      "id": 23597,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
-                      "memberLocation": "2272:15:40",
+                      "memberLocation": "1998:15:40",
                       "memberName": "getStoreAddress",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 30006,
-                      "src": "2260:27:40",
+                      "referencedDeclaration": 30036,
+                      "src": "1986:27:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
                         "typeString": "function () view returns (address)"
                       }
                     },
-                    "id": 23606,
+                    "id": 23598,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1300,27 +1067,27 @@
                     "nameLocations": [],
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2260:29:40",
+                    "src": "1986:29:40",
                     "tryCall": false,
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 23603,
-                  "id": 23607,
+                  "functionReturnParameters": 23595,
+                  "id": 23599,
                   "nodeType": "Return",
-                  "src": "2253:36:40"
+                  "src": "1979:36:40"
                 }
               ]
             },
             "baseFunctions": [
-              23379
+              23377
             ],
             "documentation": {
-              "id": 23599,
+              "id": 23591,
               "nodeType": "StructuredDocumentation",
-              "src": "1987:209:40",
+              "src": "1713:209:40",
               "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."
             },
             "functionSelector": "e1af802c",
@@ -1328,26 +1095,26 @@
             "kind": "function",
             "modifiers": [],
             "name": "_world",
-            "nameLocation": "2208:6:40",
+            "nameLocation": "1934:6:40",
             "parameters": {
-              "id": 23600,
+              "id": 23592,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2214:2:40"
+              "src": "1940:2:40"
             },
             "returnParameters": {
-              "id": 23603,
+              "id": 23595,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23602,
+                  "id": 23594,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23609,
-                  "src": "2238:7:40",
+                  "scope": 23601,
+                  "src": "1964:7:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1355,10 +1122,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23601,
+                    "id": 23593,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2238:7:40",
+                    "src": "1964:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -1368,22 +1135,22 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2237:9:40"
+              "src": "1963:9:40"
             },
-            "scope": 23627,
+            "scope": 23619,
             "stateMutability": "view",
             "virtual": false,
             "visibility": "public"
           },
           {
-            "id": 23626,
+            "id": 23618,
             "nodeType": "FunctionDefinition",
-            "src": "2585:188:40",
+            "src": "2311:188:40",
             "nodes": [],
             "body": {
-              "id": 23625,
+              "id": 23617,
               "nodeType": "Block",
-              "src": "2667:106:40",
+              "src": "2393:106:40",
               "nodes": [],
               "statements": [
                 {
@@ -1392,7 +1159,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 23623,
+                    "id": 23615,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1402,18 +1169,18 @@
                         "typeIdentifier": "t_bytes4",
                         "typeString": "bytes4"
                       },
-                      "id": 23619,
+                      "id": 23611,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 23617,
+                        "id": 23609,
                         "name": "interfaceId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23612,
-                        "src": "2680:11:40",
+                        "referencedDeclaration": 23604,
+                        "src": "2406:11:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
                           "typeString": "bytes4"
@@ -1422,18 +1189,18 @@
                       "nodeType": "BinaryOperation",
                       "operator": "==",
                       "rightExpression": {
-                        "id": 23618,
+                        "id": 23610,
                         "name": "WORLD_CONTEXT_CONSUMER_INTERFACE_ID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23358,
-                        "src": "2695:35:40",
+                        "referencedDeclaration": 23356,
+                        "src": "2421:35:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
                           "typeString": "bytes4"
                         }
                       },
-                      "src": "2680:50:40",
+                      "src": "2406:50:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1446,18 +1213,18 @@
                         "typeIdentifier": "t_bytes4",
                         "typeString": "bytes4"
                       },
-                      "id": 23622,
+                      "id": 23614,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 23620,
+                        "id": 23612,
                         "name": "interfaceId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23612,
-                        "src": "2734:11:40",
+                        "referencedDeclaration": 23604,
+                        "src": "2460:11:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
                           "typeString": "bytes4"
@@ -1466,214 +1233,839 @@
                       "nodeType": "BinaryOperation",
                       "operator": "==",
                       "rightExpression": {
-                        "id": 23621,
+                        "id": 23613,
                         "name": "ERC165_INTERFACE_ID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23234,
-                        "src": "2749:19:40",
+                        "referencedDeclaration": 23232,
+                        "src": "2475:19:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes4",
                           "typeString": "bytes4"
                         }
                       },
-                      "src": "2734:34:40",
+                      "src": "2460:34:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
-                    },
-                    "src": "2680:88:40",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
-                    }
+                    },
+                    "src": "2406:88:40",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "functionReturnParameters": 23608,
+                  "id": 23616,
+                  "nodeType": "Return",
+                  "src": "2399:95:40"
+                }
+              ]
+            },
+            "baseFunctions": [
+              23241
+            ],
+            "documentation": {
+              "id": 23602,
+              "nodeType": "StructuredDocumentation",
+              "src": "2024:284:40",
+              "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."
+            },
+            "functionSelector": "01ffc9a7",
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "supportsInterface",
+            "nameLocation": "2320:17:40",
+            "parameters": {
+              "id": 23605,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 23604,
+                  "mutability": "mutable",
+                  "name": "interfaceId",
+                  "nameLocation": "2345:11:40",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 23618,
+                  "src": "2338:18:40",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes4",
+                    "typeString": "bytes4"
+                  },
+                  "typeName": {
+                    "id": 23603,
+                    "name": "bytes4",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2338:6:40",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes4",
+                      "typeString": "bytes4"
+                    }
+                  },
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2337:20:40"
+            },
+            "returnParameters": {
+              "id": 23608,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 23607,
+                  "mutability": "mutable",
+                  "name": "",
+                  "nameLocation": "-1:-1:-1",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 23618,
+                  "src": "2387:4:40",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bool",
+                    "typeString": "bool"
+                  },
+                  "typeName": {
+                    "id": 23606,
+                    "name": "bool",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2387:4:40",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2386:6:40"
+            },
+            "scope": 23619,
+            "stateMutability": "pure",
+            "virtual": true,
+            "visibility": "public"
+          }
+        ],
+        "abstract": true,
+        "baseContracts": [
+          {
+            "baseName": {
+              "id": 23567,
+              "name": "IWorldContextConsumer",
+              "nameLocations": [
+                "979:21:40"
+              ],
+              "nodeType": "IdentifierPath",
+              "referencedDeclaration": 23378,
+              "src": "979:21:40"
+            },
+            "id": 23568,
+            "nodeType": "InheritanceSpecifier",
+            "src": "979:21:40"
+          }
+        ],
+        "canonicalName": "WorldContextConsumer",
+        "contractDependencies": [],
+        "contractKind": "contract",
+        "documentation": {
+          "id": 23566,
+          "nodeType": "StructuredDocumentation",
+          "src": "463:473:40",
+          "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": [
+          23619,
+          23378,
+          23242
+        ],
+        "name": "WorldContextConsumer",
+        "nameLocation": "955:20:40",
+        "scope": 23814,
+        "usedErrors": [],
+        "usedEvents": []
+      },
+      {
+        "id": 23659,
+        "nodeType": "ContractDefinition",
+        "src": "2503:1427:40",
+        "nodes": [
+          {
+            "id": 23639,
+            "nodeType": "FunctionDefinition",
+            "src": "2779:381:40",
+            "nodes": [],
+            "body": {
+              "id": 23638,
+              "nodeType": "Block",
+              "src": "2840:320:40",
+              "nodes": [],
+              "statements": [
+                {
+                  "AST": {
+                    "nativeSrc": "2855:250:40",
+                    "nodeType": "YulBlock",
+                    "src": "2855:250:40",
+                    "statements": [
+                      {
+                        "nativeSrc": "3032:67:40",
+                        "nodeType": "YulAssignment",
+                        "src": "3032:67:40",
+                        "value": {
+                          "arguments": [
+                            {
+                              "kind": "number",
+                              "nativeSrc": "3046:2:40",
+                              "nodeType": "YulLiteral",
+                              "src": "3046:2:40",
+                              "type": "",
+                              "value": "96"
+                            },
+                            {
+                              "arguments": [
+                                {
+                                  "arguments": [
+                                    {
+                                      "arguments": [],
+                                      "functionName": {
+                                        "name": "calldatasize",
+                                        "nativeSrc": "3067:12:40",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "3067:12:40"
+                                      },
+                                      "nativeSrc": "3067:14:40",
+                                      "nodeType": "YulFunctionCall",
+                                      "src": "3067:14:40"
+                                    },
+                                    {
+                                      "name": "CONTEXT_BYTES",
+                                      "nativeSrc": "3083:13:40",
+                                      "nodeType": "YulIdentifier",
+                                      "src": "3083:13:40"
+                                    }
+                                  ],
+                                  "functionName": {
+                                    "name": "sub",
+                                    "nativeSrc": "3063:3:40",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "3063:3:40"
+                                  },
+                                  "nativeSrc": "3063:34:40",
+                                  "nodeType": "YulFunctionCall",
+                                  "src": "3063:34:40"
+                                }
+                              ],
+                              "functionName": {
+                                "name": "calldataload",
+                                "nativeSrc": "3050:12:40",
+                                "nodeType": "YulIdentifier",
+                                "src": "3050:12:40"
+                              },
+                              "nativeSrc": "3050:48:40",
+                              "nodeType": "YulFunctionCall",
+                              "src": "3050:48:40"
+                            }
+                          ],
+                          "functionName": {
+                            "name": "shr",
+                            "nativeSrc": "3042:3:40",
+                            "nodeType": "YulIdentifier",
+                            "src": "3042:3:40"
+                          },
+                          "nativeSrc": "3042:57:40",
+                          "nodeType": "YulFunctionCall",
+                          "src": "3042:57:40"
+                        },
+                        "variableNames": [
+                          {
+                            "name": "sender",
+                            "nativeSrc": "3032:6:40",
+                            "nodeType": "YulIdentifier",
+                            "src": "3032:6:40"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "evmVersion": "paris",
+                  "externalReferences": [
+                    {
+                      "declaration": 23565,
+                      "isOffset": false,
+                      "isSlot": false,
+                      "src": "3083:13:40",
+                      "valueSize": 1
+                    },
+                    {
+                      "declaration": 23623,
+                      "isOffset": false,
+                      "isSlot": false,
+                      "src": "3032:6:40",
+                      "valueSize": 1
+                    }
+                  ],
+                  "id": 23625,
+                  "nodeType": "InlineAssembly",
+                  "src": "2846:259:40"
+                },
+                {
+                  "condition": {
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 23631,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "id": 23626,
+                      "name": "sender",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 23623,
+                      "src": "3114:6:40",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "arguments": [
+                        {
+                          "hexValue": "30",
+                          "id": 23629,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "3132:1:40",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 23628,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "3124:7:40",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": {
+                          "id": 23627,
+                          "name": "address",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "3124:7:40",
+                          "typeDescriptions": {}
+                        }
+                      },
+                      "id": 23630,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "nameLocations": [],
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "3124:10:40",
+                      "tryCall": false,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "src": "3114:20:40",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "id": 23637,
+                  "nodeType": "IfStatement",
+                  "src": "3110:45:40",
+                  "trueBody": {
+                    "expression": {
+                      "id": 23635,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftHandSide": {
+                        "id": 23632,
+                        "name": "sender",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 23623,
+                        "src": "3136:6:40",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "nodeType": "Assignment",
+                      "operator": "=",
+                      "rightHandSide": {
+                        "expression": {
+                          "id": 23633,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": -15,
+                          "src": "3145:3:40",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 23634,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "3149:6:40",
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "src": "3145:10:40",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "src": "3136:19:40",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "id": 23636,
+                    "nodeType": "ExpressionStatement",
+                    "src": "3136:19:40"
+                  }
+                }
+              ]
+            },
+            "documentation": {
+              "id": 23620,
+              "nodeType": "StructuredDocumentation",
+              "src": "2539:237:40",
+              "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."
+            },
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "_msgSender",
+            "nameLocation": "2788:10:40",
+            "parameters": {
+              "id": 23621,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "2798:2:40"
+            },
+            "returnParameters": {
+              "id": 23624,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 23623,
+                  "mutability": "mutable",
+                  "name": "sender",
+                  "nameLocation": "2832:6:40",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 23639,
+                  "src": "2824:14:40",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 23622,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2824:7:40",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2823:16:40"
+            },
+            "scope": 23659,
+            "stateMutability": "view",
+            "virtual": false,
+            "visibility": "internal"
+          },
+          {
+            "id": 23647,
+            "nodeType": "FunctionDefinition",
+            "src": "3401:214:40",
+            "nodes": [],
+            "body": {
+              "id": 23646,
+              "nodeType": "Block",
+              "src": "3460:155:40",
+              "nodes": [],
+              "statements": [
+                {
+                  "AST": {
+                    "nativeSrc": "3475:136:40",
+                    "nodeType": "YulBlock",
+                    "src": "3475:136:40",
+                    "statements": [
+                      {
+                        "nativeSrc": "3559:46:40",
+                        "nodeType": "YulAssignment",
+                        "src": "3559:46:40",
+                        "value": {
+                          "arguments": [
+                            {
+                              "arguments": [
+                                {
+                                  "arguments": [],
+                                  "functionName": {
+                                    "name": "calldatasize",
+                                    "nativeSrc": "3585:12:40",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "3585:12:40"
+                                  },
+                                  "nativeSrc": "3585:14:40",
+                                  "nodeType": "YulFunctionCall",
+                                  "src": "3585:14:40"
+                                },
+                                {
+                                  "kind": "number",
+                                  "nativeSrc": "3601:2:40",
+                                  "nodeType": "YulLiteral",
+                                  "src": "3601:2:40",
+                                  "type": "",
+                                  "value": "32"
+                                }
+                              ],
+                              "functionName": {
+                                "name": "sub",
+                                "nativeSrc": "3581:3:40",
+                                "nodeType": "YulIdentifier",
+                                "src": "3581:3:40"
+                              },
+                              "nativeSrc": "3581:23:40",
+                              "nodeType": "YulFunctionCall",
+                              "src": "3581:23:40"
+                            }
+                          ],
+                          "functionName": {
+                            "name": "calldataload",
+                            "nativeSrc": "3568:12:40",
+                            "nodeType": "YulIdentifier",
+                            "src": "3568:12:40"
+                          },
+                          "nativeSrc": "3568:37:40",
+                          "nodeType": "YulFunctionCall",
+                          "src": "3568:37:40"
+                        },
+                        "variableNames": [
+                          {
+                            "name": "value",
+                            "nativeSrc": "3559:5:40",
+                            "nodeType": "YulIdentifier",
+                            "src": "3559:5:40"
+                          }
+                        ]
+                      }
+                    ]
                   },
-                  "functionReturnParameters": 23616,
-                  "id": 23624,
-                  "nodeType": "Return",
-                  "src": "2673:95:40"
+                  "evmVersion": "paris",
+                  "externalReferences": [
+                    {
+                      "declaration": 23643,
+                      "isOffset": false,
+                      "isSlot": false,
+                      "src": "3559:5:40",
+                      "valueSize": 1
+                    }
+                  ],
+                  "id": 23645,
+                  "nodeType": "InlineAssembly",
+                  "src": "3466:145:40"
                 }
               ]
             },
-            "baseFunctions": [
-              23243
-            ],
             "documentation": {
-              "id": 23610,
+              "id": 23640,
               "nodeType": "StructuredDocumentation",
-              "src": "2298:284:40",
-              "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."
+              "src": "3164:234:40",
+              "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."
             },
-            "functionSelector": "01ffc9a7",
             "implemented": true,
             "kind": "function",
             "modifiers": [],
-            "name": "supportsInterface",
-            "nameLocation": "2594:17:40",
+            "name": "_msgValue",
+            "nameLocation": "3410:9:40",
             "parameters": {
-              "id": 23613,
+              "id": 23641,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "3419:2:40"
+            },
+            "returnParameters": {
+              "id": 23644,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23612,
+                  "id": 23643,
                   "mutability": "mutable",
-                  "name": "interfaceId",
-                  "nameLocation": "2619:11:40",
+                  "name": "value",
+                  "nameLocation": "3453:5:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23626,
-                  "src": "2612:18:40",
+                  "scope": 23647,
+                  "src": "3445:13:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_bytes4",
-                    "typeString": "bytes4"
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23611,
-                    "name": "bytes4",
+                    "id": 23642,
+                    "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2612:6:40",
+                    "src": "3445:7:40",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_bytes4",
-                      "typeString": "bytes4"
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
                     }
                   },
                   "visibility": "internal"
                 }
               ],
-              "src": "2611:20:40"
+              "src": "3444:15:40"
+            },
+            "scope": 23659,
+            "stateMutability": "pure",
+            "virtual": false,
+            "visibility": "internal"
+          },
+          {
+            "id": 23658,
+            "nodeType": "FunctionDefinition",
+            "src": "3831:97:40",
+            "nodes": [],
+            "body": {
+              "id": 23657,
+              "nodeType": "Block",
+              "src": "3881:47:40",
+              "nodes": [],
+              "statements": [
+                {
+                  "expression": {
+                    "arguments": [],
+                    "expression": {
+                      "argumentTypes": [],
+                      "expression": {
+                        "id": 23653,
+                        "name": "StoreSwitch",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 31292,
+                        "src": "3894:11:40",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_contract$_StoreSwitch_$31292_$",
+                          "typeString": "type(library StoreSwitch)"
+                        }
+                      },
+                      "id": 23654,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberLocation": "3906:15:40",
+                      "memberName": "getStoreAddress",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 30036,
+                      "src": "3894:27:40",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$__$returns$_t_address_$",
+                        "typeString": "function () view returns (address)"
+                      }
+                    },
+                    "id": 23655,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "nameLocations": [],
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3894:29:40",
+                    "tryCall": false,
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "functionReturnParameters": 23652,
+                  "id": 23656,
+                  "nodeType": "Return",
+                  "src": "3887:36:40"
+                }
+              ]
+            },
+            "documentation": {
+              "id": 23648,
+              "nodeType": "StructuredDocumentation",
+              "src": "3619:209:40",
+              "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."
+            },
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "_world",
+            "nameLocation": "3840:6:40",
+            "parameters": {
+              "id": 23649,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "3846:2:40"
             },
             "returnParameters": {
-              "id": 23616,
+              "id": 23652,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23615,
+                  "id": 23651,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23626,
-                  "src": "2661:4:40",
+                  "scope": 23658,
+                  "src": "3872:7:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_bool",
-                    "typeString": "bool"
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23614,
-                    "name": "bool",
+                    "id": 23650,
+                    "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2661:4:40",
+                    "src": "3872:7:40",
+                    "stateMutability": "nonpayable",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
                     }
                   },
                   "visibility": "internal"
                 }
               ],
-              "src": "2660:6:40"
-            },
-            "scope": 23627,
-            "stateMutability": "pure",
-            "virtual": true,
-            "visibility": "public"
-          }
-        ],
-        "abstract": true,
-        "baseContracts": [
-          {
-            "baseName": {
-              "id": 23569,
-              "name": "IWorldContextConsumer",
-              "nameLocations": [
-                "979:21:40"
-              ],
-              "nodeType": "IdentifierPath",
-              "referencedDeclaration": 23380,
-              "src": "979:21:40"
+              "src": "3871:9:40"
             },
-            "id": 23570,
-            "nodeType": "InheritanceSpecifier",
-            "src": "979:21:40"
+            "scope": 23659,
+            "stateMutability": "view",
+            "virtual": false,
+            "visibility": "internal"
           }
         ],
-        "canonicalName": "WorldContextConsumer",
+        "abstract": false,
+        "baseContracts": [],
+        "canonicalName": "WorldContextConsumerLib",
         "contractDependencies": [],
-        "contractKind": "contract",
-        "documentation": {
-          "id": 23568,
-          "nodeType": "StructuredDocumentation",
-          "src": "463:473:40",
-          "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."
-        },
+        "contractKind": "library",
         "fullyImplemented": true,
         "linearizedBaseContracts": [
-          23627,
-          23380,
-          23244
+          23659
         ],
-        "name": "WorldContextConsumer",
-        "nameLocation": "955:20:40",
-        "scope": 23782,
+        "name": "WorldContextConsumerLib",
+        "nameLocation": "2511:23:40",
+        "scope": 23814,
         "usedErrors": [],
         "usedEvents": []
       },
       {
-        "id": 23781,
+        "id": 23813,
         "nodeType": "ContractDefinition",
-        "src": "3107:3919:40",
+        "src": "4265:3922:40",
         "nodes": [
           {
-            "id": 23648,
+            "id": 23680,
             "nodeType": "FunctionDefinition",
-            "src": "3453:201:40",
+            "src": "4614:201:40",
             "nodes": [],
             "body": {
-              "id": 23647,
+              "id": 23679,
               "nodeType": "Block",
-              "src": "3589:65:40",
+              "src": "4750:65:40",
               "nodes": [],
               "statements": [
                 {
                   "expression": {
                     "arguments": [
                       {
-                        "id": 23642,
+                        "id": 23674,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23631,
-                        "src": "3619:8:40",
+                        "referencedDeclaration": 23663,
+                        "src": "4780:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
                           "typeString": "bytes memory"
                         }
                       },
                       {
-                        "id": 23643,
+                        "id": 23675,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23633,
-                        "src": "3629:9:40",
+                        "referencedDeclaration": 23665,
+                        "src": "4790:9:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
                       {
-                        "id": 23644,
+                        "id": 23676,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23635,
-                        "src": "3640:8:40",
+                        "referencedDeclaration": 23667,
+                        "src": "4801:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1696,32 +2088,32 @@
                         }
                       ],
                       "expression": {
-                        "id": 23640,
+                        "id": 23672,
                         "name": "abi",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
                         "referencedDeclaration": -1,
-                        "src": "3602:3:40",
+                        "src": "4763:3:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_abi",
                           "typeString": "abi"
                         }
                       },
-                      "id": 23641,
+                      "id": 23673,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
-                      "memberLocation": "3606:12:40",
+                      "memberLocation": "4767:12:40",
                       "memberName": "encodePacked",
                       "nodeType": "MemberAccess",
-                      "src": "3602:16:40",
+                      "src": "4763:16:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$",
                         "typeString": "function () pure returns (bytes memory)"
                       }
                     },
-                    "id": 23645,
+                    "id": 23677,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1730,44 +2122,44 @@
                     "nameLocations": [],
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3602:47:40",
+                    "src": "4763:47:40",
                     "tryCall": false,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_memory_ptr",
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 23639,
-                  "id": 23646,
+                  "functionReturnParameters": 23671,
+                  "id": 23678,
                   "nodeType": "Return",
-                  "src": "3595:54:40"
+                  "src": "4756:54:40"
                 }
               ]
             },
             "documentation": {
-              "id": 23629,
+              "id": 23661,
               "nodeType": "StructuredDocumentation",
-              "src": "3140:310:40",
+              "src": "4301:310:40",
               "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."
             },
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "appendContext",
-            "nameLocation": "3462:13:40",
+            "nameLocation": "4623:13:40",
             "parameters": {
-              "id": 23636,
+              "id": 23668,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23631,
+                  "id": 23663,
                   "mutability": "mutable",
                   "name": "callData",
-                  "nameLocation": "3494:8:40",
+                  "nameLocation": "4655:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23648,
-                  "src": "3481:21:40",
+                  "scope": 23680,
+                  "src": "4642:21:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -1775,10 +2167,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23630,
+                    "id": 23662,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3481:5:40",
+                    "src": "4642:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -1788,13 +2180,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23633,
+                  "id": 23665,
                   "mutability": "mutable",
                   "name": "msgSender",
-                  "nameLocation": "3516:9:40",
+                  "nameLocation": "4677:9:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23648,
-                  "src": "3508:17:40",
+                  "scope": 23680,
+                  "src": "4669:17:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1802,10 +2194,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23632,
+                    "id": 23664,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3508:7:40",
+                    "src": "4669:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -1816,13 +2208,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23635,
+                  "id": 23667,
                   "mutability": "mutable",
                   "name": "msgValue",
-                  "nameLocation": "3539:8:40",
+                  "nameLocation": "4700:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23648,
-                  "src": "3531:16:40",
+                  "scope": 23680,
+                  "src": "4692:16:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1830,10 +2222,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23634,
+                    "id": 23666,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3531:7:40",
+                    "src": "4692:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1842,21 +2234,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3475:76:40"
+              "src": "4636:76:40"
             },
             "returnParameters": {
-              "id": 23639,
+              "id": 23671,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23638,
+                  "id": 23670,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23648,
-                  "src": "3575:12:40",
+                  "scope": 23680,
+                  "src": "4736:12:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -1864,10 +2256,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23637,
+                    "id": 23669,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3575:5:40",
+                    "src": "4736:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -1876,27 +2268,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3574:14:40"
+              "src": "4735:14:40"
             },
-            "scope": 23781,
+            "scope": 23813,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 23680,
+            "id": 23712,
             "nodeType": "FunctionDefinition",
-            "src": "4150:317:40",
+            "src": "5311:317:40",
             "nodes": [],
             "body": {
-              "id": 23679,
+              "id": 23711,
               "nodeType": "Block",
-              "src": "4322:145:40",
+              "src": "5483:145:40",
               "nodes": [],
               "statements": [
                 {
                   "expression": {
-                    "id": 23677,
+                    "id": 23709,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1904,38 +2296,38 @@
                     "leftHandSide": {
                       "components": [
                         {
-                          "id": 23664,
+                          "id": 23696,
                           "name": "success",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23660,
-                          "src": "4329:7:40",
+                          "referencedDeclaration": 23692,
+                          "src": "5490:7:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         {
-                          "id": 23665,
+                          "id": 23697,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23662,
-                          "src": "4338:4:40",
+                          "referencedDeclaration": 23694,
+                          "src": "5499:4:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
                           }
                         }
                       ],
-                      "id": 23666,
+                      "id": 23698,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "TupleExpression",
-                      "src": "4328:15:40",
+                      "src": "5489:15:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "tuple(bool,bytes memory)"
@@ -1948,36 +2340,36 @@
                         {
                           "arguments": [
                             {
-                              "id": 23672,
+                              "id": 23704,
                               "name": "callData",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23657,
-                              "src": "4403:8:40",
+                              "referencedDeclaration": 23689,
+                              "src": "5564:8:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
                                 "typeString": "bytes memory"
                               }
                             },
                             {
-                              "id": 23673,
+                              "id": 23705,
                               "name": "msgSender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23651,
-                              "src": "4424:9:40",
+                              "referencedDeclaration": 23683,
+                              "src": "5585:9:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
                             {
-                              "id": 23674,
+                              "id": 23706,
                               "name": "msgValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23653,
-                              "src": "4445:8:40",
+                              "referencedDeclaration": 23685,
+                              "src": "5606:8:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -1999,27 +2391,27 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 23671,
+                            "id": 23703,
                             "name": "appendContext",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 23648,
-                            "src": "4377:13:40",
+                            "referencedDeclaration": 23680,
+                            "src": "5538:13:40",
                             "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": 23675,
+                          "id": 23707,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "kind": "functionCall",
                           "lValueRequested": false,
                           "nameLocations": [
-                            "4393:8:40",
-                            "4413:9:40",
-                            "4435:8:40"
+                            "5554:8:40",
+                            "5574:9:40",
+                            "5596:8:40"
                           ],
                           "names": [
                             "callData",
@@ -2027,7 +2419,7 @@
                             "msgValue"
                           ],
                           "nodeType": "FunctionCall",
-                          "src": "4377:79:40",
+                          "src": "5538:79:40",
                           "tryCall": false,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -2050,32 +2442,32 @@
                             }
                           ],
                           "expression": {
-                            "id": 23667,
+                            "id": 23699,
                             "name": "target",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 23655,
-                            "src": "4346:6:40",
+                            "referencedDeclaration": 23687,
+                            "src": "5507:6:40",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 23668,
+                          "id": 23700,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
-                          "memberLocation": "4353:4:40",
+                          "memberLocation": "5514:4:40",
                           "memberName": "call",
                           "nodeType": "MemberAccess",
-                          "src": "4346:11:40",
+                          "src": "5507:11:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$",
                             "typeString": "function (bytes memory) payable returns (bool,bytes memory)"
                           }
                         },
-                        "id": 23670,
+                        "id": 23702,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2087,14 +2479,14 @@
                         "options": [
                           {
                             "hexValue": "30",
-                            "id": 23669,
+                            "id": 23701,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4366:1:40",
+                            "src": "5527:1:40",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
                               "typeString": "int_const 0"
@@ -2102,13 +2494,13 @@
                             "value": "0"
                           }
                         ],
-                        "src": "4346:23:40",
+                        "src": "5507:23:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value",
                           "typeString": "function (bytes memory) payable returns (bool,bytes memory)"
                         }
                       },
-                      "id": 23676,
+                      "id": 23708,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2117,49 +2509,49 @@
                       "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4346:116:40",
+                      "src": "5507:116:40",
                       "tryCall": false,
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "tuple(bool,bytes memory)"
                       }
                     },
-                    "src": "4328:134:40",
+                    "src": "5489:134:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 23678,
+                  "id": 23710,
                   "nodeType": "ExpressionStatement",
-                  "src": "4328:134:40"
+                  "src": "5489:134:40"
                 }
               ]
             },
             "documentation": {
-              "id": 23649,
+              "id": 23681,
               "nodeType": "StructuredDocumentation",
-              "src": "3658:489:40",
+              "src": "4819:489:40",
               "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."
             },
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "callWithContext",
-            "nameLocation": "4159:15:40",
+            "nameLocation": "5320:15:40",
             "parameters": {
-              "id": 23658,
+              "id": 23690,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23651,
+                  "id": 23683,
                   "mutability": "mutable",
                   "name": "msgSender",
-                  "nameLocation": "4188:9:40",
+                  "nameLocation": "5349:9:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4180:17:40",
+                  "scope": 23712,
+                  "src": "5341:17:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2167,10 +2559,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23650,
+                    "id": 23682,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4180:7:40",
+                    "src": "5341:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -2181,13 +2573,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23653,
+                  "id": 23685,
                   "mutability": "mutable",
                   "name": "msgValue",
-                  "nameLocation": "4211:8:40",
+                  "nameLocation": "5372:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4203:16:40",
+                  "scope": 23712,
+                  "src": "5364:16:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2195,10 +2587,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23652,
+                    "id": 23684,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4203:7:40",
+                    "src": "5364:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2208,13 +2600,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23655,
+                  "id": 23687,
                   "mutability": "mutable",
                   "name": "target",
-                  "nameLocation": "4233:6:40",
+                  "nameLocation": "5394:6:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4225:14:40",
+                  "scope": 23712,
+                  "src": "5386:14:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2222,10 +2614,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23654,
+                    "id": 23686,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4225:7:40",
+                    "src": "5386:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -2236,13 +2628,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23657,
+                  "id": 23689,
                   "mutability": "mutable",
                   "name": "callData",
-                  "nameLocation": "4258:8:40",
+                  "nameLocation": "5419:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4245:21:40",
+                  "scope": 23712,
+                  "src": "5406:21:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -2250,10 +2642,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23656,
+                    "id": 23688,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4245:5:40",
+                    "src": "5406:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -2262,21 +2654,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4174:96:40"
+              "src": "5335:96:40"
             },
             "returnParameters": {
-              "id": 23663,
+              "id": 23695,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23660,
+                  "id": 23692,
                   "mutability": "mutable",
                   "name": "success",
-                  "nameLocation": "4294:7:40",
+                  "nameLocation": "5455:7:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4289:12:40",
+                  "scope": 23712,
+                  "src": "5450:12:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2284,10 +2676,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 23659,
+                    "id": 23691,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4289:4:40",
+                    "src": "5450:4:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2297,13 +2689,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23662,
+                  "id": 23694,
                   "mutability": "mutable",
                   "name": "data",
-                  "nameLocation": "4316:4:40",
+                  "nameLocation": "5477:4:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23680,
-                  "src": "4303:17:40",
+                  "scope": 23712,
+                  "src": "5464:17:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -2311,10 +2703,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23661,
+                    "id": 23693,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4303:5:40",
+                    "src": "5464:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -2323,27 +2715,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4288:33:40"
+              "src": "5449:33:40"
             },
-            "scope": 23781,
+            "scope": 23813,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 23710,
+            "id": 23742,
             "nodeType": "FunctionDefinition",
-            "src": "4971:321:40",
+            "src": "6132:321:40",
             "nodes": [],
             "body": {
-              "id": 23709,
+              "id": 23741,
               "nodeType": "Block",
-              "src": "5151:141:40",
+              "src": "6312:141:40",
               "nodes": [],
               "statements": [
                 {
                   "expression": {
-                    "id": 23707,
+                    "id": 23739,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2351,38 +2743,38 @@
                     "leftHandSide": {
                       "components": [
                         {
-                          "id": 23696,
+                          "id": 23728,
                           "name": "success",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23692,
-                          "src": "5158:7:40",
+                          "referencedDeclaration": 23724,
+                          "src": "6319:7:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         {
-                          "id": 23697,
+                          "id": 23729,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23694,
-                          "src": "5167:4:40",
+                          "referencedDeclaration": 23726,
+                          "src": "6328:4:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
                           }
                         }
                       ],
-                      "id": 23698,
+                      "id": 23730,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "TupleExpression",
-                      "src": "5157:15:40",
+                      "src": "6318:15:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "tuple(bool,bytes memory)"
@@ -2395,36 +2787,36 @@
                         {
                           "arguments": [
                             {
-                              "id": 23702,
+                              "id": 23734,
                               "name": "callData",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23689,
-                              "src": "5228:8:40",
+                              "referencedDeclaration": 23721,
+                              "src": "6389:8:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
                                 "typeString": "bytes memory"
                               }
                             },
                             {
-                              "id": 23703,
+                              "id": 23735,
                               "name": "msgSender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23683,
-                              "src": "5249:9:40",
+                              "referencedDeclaration": 23715,
+                              "src": "6410:9:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
                             {
-                              "id": 23704,
+                              "id": 23736,
                               "name": "msgValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 23685,
-                              "src": "5270:8:40",
+                              "referencedDeclaration": 23717,
+                              "src": "6431:8:40",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2446,27 +2838,27 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 23701,
+                            "id": 23733,
                             "name": "appendContext",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 23648,
-                            "src": "5202:13:40",
+                            "referencedDeclaration": 23680,
+                            "src": "6363:13:40",
                             "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": 23705,
+                          "id": 23737,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "kind": "functionCall",
                           "lValueRequested": false,
                           "nameLocations": [
-                            "5218:8:40",
-                            "5238:9:40",
-                            "5260:8:40"
+                            "6379:8:40",
+                            "6399:9:40",
+                            "6421:8:40"
                           ],
                           "names": [
                             "callData",
@@ -2474,7 +2866,7 @@
                             "msgValue"
                           ],
                           "nodeType": "FunctionCall",
-                          "src": "5202:79:40",
+                          "src": "6363:79:40",
                           "tryCall": false,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -2490,32 +2882,32 @@
                           }
                         ],
                         "expression": {
-                          "id": 23699,
+                          "id": 23731,
                           "name": "target",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23687,
-                          "src": "5175:6:40",
+                          "referencedDeclaration": 23719,
+                          "src": "6336:6:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 23700,
+                        "id": 23732,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberLocation": "5182:12:40",
+                        "memberLocation": "6343:12:40",
                         "memberName": "delegatecall",
                         "nodeType": "MemberAccess",
-                        "src": "5175:19:40",
+                        "src": "6336:19:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_baredelegatecall_nonpayable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$",
                           "typeString": "function (bytes memory) returns (bool,bytes memory)"
                         }
                       },
-                      "id": 23706,
+                      "id": 23738,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2524,49 +2916,49 @@
                       "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5175:112:40",
+                      "src": "6336:112:40",
                       "tryCall": false,
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
                         "typeString": "tuple(bool,bytes memory)"
                       }
                     },
-                    "src": "5157:130:40",
+                    "src": "6318:130:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 23708,
+                  "id": 23740,
                   "nodeType": "ExpressionStatement",
-                  "src": "5157:130:40"
+                  "src": "6318:130:40"
                 }
               ]
             },
             "documentation": {
-              "id": 23681,
+              "id": 23713,
               "nodeType": "StructuredDocumentation",
-              "src": "4471:497:40",
+              "src": "5632:497:40",
               "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."
             },
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "delegatecallWithContext",
-            "nameLocation": "4980:23:40",
+            "nameLocation": "6141:23:40",
             "parameters": {
-              "id": 23690,
+              "id": 23722,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23683,
+                  "id": 23715,
                   "mutability": "mutable",
                   "name": "msgSender",
-                  "nameLocation": "5017:9:40",
+                  "nameLocation": "6178:9:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5009:17:40",
+                  "scope": 23742,
+                  "src": "6170:17:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2574,10 +2966,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23682,
+                    "id": 23714,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5009:7:40",
+                    "src": "6170:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -2588,13 +2980,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23685,
+                  "id": 23717,
                   "mutability": "mutable",
                   "name": "msgValue",
-                  "nameLocation": "5040:8:40",
+                  "nameLocation": "6201:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5032:16:40",
+                  "scope": 23742,
+                  "src": "6193:16:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2602,10 +2994,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23684,
+                    "id": 23716,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5032:7:40",
+                    "src": "6193:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2615,13 +3007,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23687,
+                  "id": 23719,
                   "mutability": "mutable",
                   "name": "target",
-                  "nameLocation": "5062:6:40",
+                  "nameLocation": "6223:6:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5054:14:40",
+                  "scope": 23742,
+                  "src": "6215:14:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2629,10 +3021,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23686,
+                    "id": 23718,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5054:7:40",
+                    "src": "6215:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -2643,13 +3035,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23689,
+                  "id": 23721,
                   "mutability": "mutable",
                   "name": "callData",
-                  "nameLocation": "5087:8:40",
+                  "nameLocation": "6248:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5074:21:40",
+                  "scope": 23742,
+                  "src": "6235:21:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -2657,10 +3049,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23688,
+                    "id": 23720,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5074:5:40",
+                    "src": "6235:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -2669,21 +3061,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5003:96:40"
+              "src": "6164:96:40"
             },
             "returnParameters": {
-              "id": 23695,
+              "id": 23727,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23692,
+                  "id": 23724,
                   "mutability": "mutable",
                   "name": "success",
-                  "nameLocation": "5123:7:40",
+                  "nameLocation": "6284:7:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5118:12:40",
+                  "scope": 23742,
+                  "src": "6279:12:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2691,10 +3083,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 23691,
+                    "id": 23723,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5118:4:40",
+                    "src": "6279:4:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2704,13 +3096,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23694,
+                  "id": 23726,
                   "mutability": "mutable",
                   "name": "data",
-                  "nameLocation": "5145:4:40",
+                  "nameLocation": "6306:4:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23710,
-                  "src": "5132:17:40",
+                  "scope": 23742,
+                  "src": "6293:17:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -2718,10 +3110,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23693,
+                    "id": 23725,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5132:5:40",
+                    "src": "6293:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -2730,39 +3122,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5117:33:40"
+              "src": "6278:33:40"
             },
-            "scope": 23781,
+            "scope": 23813,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 23745,
+            "id": 23777,
             "nodeType": "FunctionDefinition",
-            "src": "5747:399:40",
+            "src": "6908:399:40",
             "nodes": [],
             "body": {
-              "id": 23744,
+              "id": 23776,
               "nodeType": "Block",
-              "src": "5913:233:40",
+              "src": "7074:233:40",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    23725,
-                    23727
+                    23757,
+                    23759
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 23725,
+                      "id": 23757,
                       "mutability": "mutable",
                       "name": "success",
-                      "nameLocation": "5925:7:40",
+                      "nameLocation": "7086:7:40",
                       "nodeType": "VariableDeclaration",
-                      "scope": 23744,
-                      "src": "5920:12:40",
+                      "scope": 23776,
+                      "src": "7081:12:40",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -2770,10 +3162,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 23724,
+                        "id": 23756,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "5920:4:40",
+                        "src": "7081:4:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2783,13 +3175,13 @@
                     },
                     {
                       "constant": false,
-                      "id": 23727,
+                      "id": 23759,
                       "mutability": "mutable",
                       "name": "_data",
-                      "nameLocation": "5947:5:40",
+                      "nameLocation": "7108:5:40",
                       "nodeType": "VariableDeclaration",
-                      "scope": 23744,
-                      "src": "5934:18:40",
+                      "scope": 23776,
+                      "src": "7095:18:40",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -2797,10 +3189,10 @@
                         "typeString": "bytes"
                       },
                       "typeName": {
-                        "id": 23726,
+                        "id": 23758,
                         "name": "bytes",
                         "nodeType": "ElementaryTypeName",
-                        "src": "5934:5:40",
+                        "src": "7095:5:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage_ptr",
                           "typeString": "bytes"
@@ -2809,52 +3201,52 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 23734,
+                  "id": 23766,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 23729,
+                        "id": 23761,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23713,
-                        "src": "5991:9:40",
+                        "referencedDeclaration": 23745,
+                        "src": "7152:9:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
                       {
-                        "id": 23730,
+                        "id": 23762,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23715,
-                        "src": "6018:8:40",
+                        "referencedDeclaration": 23747,
+                        "src": "7179:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
                       {
-                        "id": 23731,
+                        "id": 23763,
                         "name": "target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23717,
-                        "src": "6042:6:40",
+                        "referencedDeclaration": 23749,
+                        "src": "7203:6:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
                       {
-                        "id": 23732,
+                        "id": 23764,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23719,
-                        "src": "6066:8:40",
+                        "referencedDeclaration": 23751,
+                        "src": "7227:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
                           "typeString": "bytes memory"
@@ -2880,28 +3272,28 @@
                           "typeString": "bytes memory"
                         }
                       ],
-                      "id": 23728,
+                      "id": 23760,
                       "name": "callWithContext",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 23680,
-                      "src": "5956:15:40",
+                      "referencedDeclaration": 23712,
+                      "src": "7117:15:40",
                       "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": 23733,
+                    "id": 23765,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "kind": "functionCall",
                     "lValueRequested": false,
                     "nameLocations": [
-                      "5980:9:40",
-                      "6008:8:40",
-                      "6034:6:40",
-                      "6056:8:40"
+                      "7141:9:40",
+                      "7169:8:40",
+                      "7195:6:40",
+                      "7217:8:40"
                     ],
                     "names": [
                       "msgSender",
@@ -2910,7 +3302,7 @@
                       "callData"
                     ],
                     "nodeType": "FunctionCall",
-                    "src": "5956:125:40",
+                    "src": "7117:125:40",
                     "tryCall": false,
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
@@ -2918,11 +3310,11 @@
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "5919:162:40"
+                  "src": "7080:162:40"
                 },
                 {
                   "condition": {
-                    "id": 23736,
+                    "id": 23768,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2930,14 +3322,14 @@
                     "nodeType": "UnaryOperation",
                     "operator": "!",
                     "prefix": true,
-                    "src": "6091:8:40",
+                    "src": "7252:8:40",
                     "subExpression": {
-                      "id": 23735,
+                      "id": 23767,
                       "name": "success",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 23725,
-                      "src": "6092:7:40",
+                      "referencedDeclaration": 23757,
+                      "src": "7253:7:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2948,19 +3340,19 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 23741,
+                  "id": 23773,
                   "nodeType": "IfStatement",
-                  "src": "6087:36:40",
+                  "src": "7248:36:40",
                   "trueBody": {
                     "expression": {
                       "arguments": [
                         {
-                          "id": 23738,
+                          "id": 23770,
                           "name": "_data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23727,
-                          "src": "6117:5:40",
+                          "referencedDeclaration": 23759,
+                          "src": "7278:5:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -2974,18 +3366,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 23737,
+                        "id": 23769,
                         "name": "revertWithBytes",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 24356,
-                        "src": "6101:15:40",
+                        "referencedDeclaration": 24388,
+                        "src": "7262:15:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$",
                           "typeString": "function (bytes memory) pure"
                         }
                       },
-                      "id": 23739,
+                      "id": 23771,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2994,62 +3386,62 @@
                       "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "6101:22:40",
+                      "src": "7262:22:40",
                       "tryCall": false,
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 23740,
+                    "id": 23772,
                     "nodeType": "ExpressionStatement",
-                    "src": "6101:22:40"
+                    "src": "7262:22:40"
                   }
                 },
                 {
                   "expression": {
-                    "id": 23742,
+                    "id": 23774,
                     "name": "_data",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 23727,
-                    "src": "6136:5:40",
+                    "referencedDeclaration": 23759,
+                    "src": "7297:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_memory_ptr",
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 23723,
-                  "id": 23743,
+                  "functionReturnParameters": 23755,
+                  "id": 23775,
                   "nodeType": "Return",
-                  "src": "6129:12:40"
+                  "src": "7290:12:40"
                 }
               ]
             },
             "documentation": {
-              "id": 23711,
+              "id": 23743,
               "nodeType": "StructuredDocumentation",
-              "src": "5296:448:40",
+              "src": "6457:448:40",
               "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."
             },
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "callWithContextOrRevert",
-            "nameLocation": "5756:23:40",
+            "nameLocation": "6917:23:40",
             "parameters": {
-              "id": 23720,
+              "id": 23752,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23713,
+                  "id": 23745,
                   "mutability": "mutable",
                   "name": "msgSender",
-                  "nameLocation": "5793:9:40",
+                  "nameLocation": "6954:9:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23745,
-                  "src": "5785:17:40",
+                  "scope": 23777,
+                  "src": "6946:17:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3057,10 +3449,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23712,
+                    "id": 23744,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5785:7:40",
+                    "src": "6946:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -3071,13 +3463,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23715,
+                  "id": 23747,
                   "mutability": "mutable",
                   "name": "msgValue",
-                  "nameLocation": "5816:8:40",
+                  "nameLocation": "6977:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23745,
-                  "src": "5808:16:40",
+                  "scope": 23777,
+                  "src": "6969:16:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3085,10 +3477,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23714,
+                    "id": 23746,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5808:7:40",
+                    "src": "6969:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3098,13 +3490,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23717,
+                  "id": 23749,
                   "mutability": "mutable",
                   "name": "target",
-                  "nameLocation": "5838:6:40",
+                  "nameLocation": "6999:6:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23745,
-                  "src": "5830:14:40",
+                  "scope": 23777,
+                  "src": "6991:14:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3112,10 +3504,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23716,
+                    "id": 23748,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5830:7:40",
+                    "src": "6991:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -3126,13 +3518,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23719,
+                  "id": 23751,
                   "mutability": "mutable",
                   "name": "callData",
-                  "nameLocation": "5863:8:40",
+                  "nameLocation": "7024:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23745,
-                  "src": "5850:21:40",
+                  "scope": 23777,
+                  "src": "7011:21:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -3140,10 +3532,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23718,
+                    "id": 23750,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5850:5:40",
+                    "src": "7011:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -3152,21 +3544,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5779:96:40"
+              "src": "6940:96:40"
             },
             "returnParameters": {
-              "id": 23723,
+              "id": 23755,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23722,
+                  "id": 23754,
                   "mutability": "mutable",
                   "name": "data",
-                  "nameLocation": "5907:4:40",
+                  "nameLocation": "7068:4:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23745,
-                  "src": "5894:17:40",
+                  "scope": 23777,
+                  "src": "7055:17:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -3174,10 +3566,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23721,
+                    "id": 23753,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5894:5:40",
+                    "src": "7055:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -3186,39 +3578,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5893:19:40"
+              "src": "7054:19:40"
             },
-            "scope": 23781,
+            "scope": 23813,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 23780,
+            "id": 23812,
             "nodeType": "FunctionDefinition",
-            "src": "6609:415:40",
+            "src": "7770:415:40",
             "nodes": [],
             "body": {
-              "id": 23779,
+              "id": 23811,
               "nodeType": "Block",
-              "src": "6783:241:40",
+              "src": "7944:241:40",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    23760,
-                    23762
+                    23792,
+                    23794
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 23760,
+                      "id": 23792,
                       "mutability": "mutable",
                       "name": "success",
-                      "nameLocation": "6795:7:40",
+                      "nameLocation": "7956:7:40",
                       "nodeType": "VariableDeclaration",
-                      "scope": 23779,
-                      "src": "6790:12:40",
+                      "scope": 23811,
+                      "src": "7951:12:40",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -3226,10 +3618,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 23759,
+                        "id": 23791,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "6790:4:40",
+                        "src": "7951:4:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3239,13 +3631,13 @@
                     },
                     {
                       "constant": false,
-                      "id": 23762,
+                      "id": 23794,
                       "mutability": "mutable",
                       "name": "_data",
-                      "nameLocation": "6817:5:40",
+                      "nameLocation": "7978:5:40",
                       "nodeType": "VariableDeclaration",
-                      "scope": 23779,
-                      "src": "6804:18:40",
+                      "scope": 23811,
+                      "src": "7965:18:40",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -3253,10 +3645,10 @@
                         "typeString": "bytes"
                       },
                       "typeName": {
-                        "id": 23761,
+                        "id": 23793,
                         "name": "bytes",
                         "nodeType": "ElementaryTypeName",
-                        "src": "6804:5:40",
+                        "src": "7965:5:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage_ptr",
                           "typeString": "bytes"
@@ -3265,52 +3657,52 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 23769,
+                  "id": 23801,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 23764,
+                        "id": 23796,
                         "name": "msgSender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23748,
-                        "src": "6869:9:40",
+                        "referencedDeclaration": 23780,
+                        "src": "8030:9:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
                       {
-                        "id": 23765,
+                        "id": 23797,
                         "name": "msgValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23750,
-                        "src": "6896:8:40",
+                        "referencedDeclaration": 23782,
+                        "src": "8057:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
                       {
-                        "id": 23766,
+                        "id": 23798,
                         "name": "target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23752,
-                        "src": "6920:6:40",
+                        "referencedDeclaration": 23784,
+                        "src": "8081:6:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
                       {
-                        "id": 23767,
+                        "id": 23799,
                         "name": "callData",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 23754,
-                        "src": "6944:8:40",
+                        "referencedDeclaration": 23786,
+                        "src": "8105:8:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
                           "typeString": "bytes memory"
@@ -3336,28 +3728,28 @@
                           "typeString": "bytes memory"
                         }
                       ],
-                      "id": 23763,
+                      "id": 23795,
                       "name": "delegatecallWithContext",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 23710,
-                      "src": "6826:23:40",
+                      "referencedDeclaration": 23742,
+                      "src": "7987:23:40",
                       "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": 23768,
+                    "id": 23800,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "kind": "functionCall",
                     "lValueRequested": false,
                     "nameLocations": [
-                      "6858:9:40",
-                      "6886:8:40",
-                      "6912:6:40",
-                      "6934:8:40"
+                      "8019:9:40",
+                      "8047:8:40",
+                      "8073:6:40",
+                      "8095:8:40"
                     ],
                     "names": [
                       "msgSender",
@@ -3366,7 +3758,7 @@
                       "callData"
                     ],
                     "nodeType": "FunctionCall",
-                    "src": "6826:133:40",
+                    "src": "7987:133:40",
                     "tryCall": false,
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$",
@@ -3374,11 +3766,11 @@
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6789:170:40"
+                  "src": "7950:170:40"
                 },
                 {
                   "condition": {
-                    "id": 23771,
+                    "id": 23803,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3386,14 +3778,14 @@
                     "nodeType": "UnaryOperation",
                     "operator": "!",
                     "prefix": true,
-                    "src": "6969:8:40",
+                    "src": "8130:8:40",
                     "subExpression": {
-                      "id": 23770,
+                      "id": 23802,
                       "name": "success",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 23760,
-                      "src": "6970:7:40",
+                      "referencedDeclaration": 23792,
+                      "src": "8131:7:40",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -3404,19 +3796,19 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 23776,
+                  "id": 23808,
                   "nodeType": "IfStatement",
-                  "src": "6965:36:40",
+                  "src": "8126:36:40",
                   "trueBody": {
                     "expression": {
                       "arguments": [
                         {
-                          "id": 23773,
+                          "id": 23805,
                           "name": "_data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 23762,
-                          "src": "6995:5:40",
+                          "referencedDeclaration": 23794,
+                          "src": "8156:5:40",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -3430,18 +3822,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 23772,
+                        "id": 23804,
                         "name": "revertWithBytes",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 24356,
-                        "src": "6979:15:40",
+                        "referencedDeclaration": 24388,
+                        "src": "8140:15:40",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$",
                           "typeString": "function (bytes memory) pure"
                         }
                       },
-                      "id": 23774,
+                      "id": 23806,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3450,62 +3842,62 @@
                       "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "6979:22:40",
+                      "src": "8140:22:40",
                       "tryCall": false,
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 23775,
+                    "id": 23807,
                     "nodeType": "ExpressionStatement",
-                    "src": "6979:22:40"
+                    "src": "8140:22:40"
                   }
                 },
                 {
                   "expression": {
-                    "id": 23777,
+                    "id": 23809,
                     "name": "_data",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 23762,
-                    "src": "7014:5:40",
+                    "referencedDeclaration": 23794,
+                    "src": "8175:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_memory_ptr",
                       "typeString": "bytes memory"
                     }
                   },
-                  "functionReturnParameters": 23758,
-                  "id": 23778,
+                  "functionReturnParameters": 23790,
+                  "id": 23810,
                   "nodeType": "Return",
-                  "src": "7007:12:40"
+                  "src": "8168:12:40"
                 }
               ]
             },
             "documentation": {
-              "id": 23746,
+              "id": 23778,
               "nodeType": "StructuredDocumentation",
-              "src": "6150:456:40",
+              "src": "7311:456:40",
               "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."
             },
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "delegatecallWithContextOrRevert",
-            "nameLocation": "6618:31:40",
+            "nameLocation": "7779:31:40",
             "parameters": {
-              "id": 23755,
+              "id": 23787,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23748,
+                  "id": 23780,
                   "mutability": "mutable",
                   "name": "msgSender",
-                  "nameLocation": "6663:9:40",
+                  "nameLocation": "7824:9:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23780,
-                  "src": "6655:17:40",
+                  "scope": 23812,
+                  "src": "7816:17:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3513,10 +3905,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23747,
+                    "id": 23779,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6655:7:40",
+                    "src": "7816:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -3527,13 +3919,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23750,
+                  "id": 23782,
                   "mutability": "mutable",
                   "name": "msgValue",
-                  "nameLocation": "6686:8:40",
+                  "nameLocation": "7847:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23780,
-                  "src": "6678:16:40",
+                  "scope": 23812,
+                  "src": "7839:16:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3541,10 +3933,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 23749,
+                    "id": 23781,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6678:7:40",
+                    "src": "7839:7:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3554,13 +3946,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23752,
+                  "id": 23784,
                   "mutability": "mutable",
                   "name": "target",
-                  "nameLocation": "6708:6:40",
+                  "nameLocation": "7869:6:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23780,
-                  "src": "6700:14:40",
+                  "scope": 23812,
+                  "src": "7861:14:40",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3568,10 +3960,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 23751,
+                    "id": 23783,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6700:7:40",
+                    "src": "7861:7:40",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -3582,13 +3974,13 @@
                 },
                 {
                   "constant": false,
-                  "id": 23754,
+                  "id": 23786,
                   "mutability": "mutable",
                   "name": "callData",
-                  "nameLocation": "6733:8:40",
+                  "nameLocation": "7894:8:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23780,
-                  "src": "6720:21:40",
+                  "scope": 23812,
+                  "src": "7881:21:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -3596,10 +3988,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23753,
+                    "id": 23785,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6720:5:40",
+                    "src": "7881:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -3608,21 +4000,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6649:96:40"
+              "src": "7810:96:40"
             },
             "returnParameters": {
-              "id": 23758,
+              "id": 23790,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 23757,
+                  "id": 23789,
                   "mutability": "mutable",
                   "name": "data",
-                  "nameLocation": "6777:4:40",
+                  "nameLocation": "7938:4:40",
                   "nodeType": "VariableDeclaration",
-                  "scope": 23780,
-                  "src": "6764:17:40",
+                  "scope": 23812,
+                  "src": "7925:17:40",
                   "stateVariable": false,
                   "storageLocation": "memory",
                   "typeDescriptions": {
@@ -3630,10 +4022,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 23756,
+                    "id": 23788,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6764:5:40",
+                    "src": "7925:5:40",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -3642,9 +4034,9 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6763:19:40"
+              "src": "7924:19:40"
             },
-            "scope": 23781,
+            "scope": 23813,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
@@ -3652,22 +4044,22 @@
         ],
         "abstract": false,
         "baseContracts": [],
-        "canonicalName": "WorldContextProvider",
+        "canonicalName": "WorldContextProviderLib",
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 23628,
+          "id": 23660,
           "nodeType": "StructuredDocumentation",
-          "src": "2777:329:40",
-          "text": " @title WorldContextProvider - 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."
+          "src": "3932:332:40",
+          "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": [
-          23781
+          23813
         ],
-        "name": "WorldContextProvider",
-        "nameLocation": "3115:20:40",
-        "scope": 23782,
+        "name": "WorldContextProviderLib",
+        "nameLocation": "4273:23:40",
+        "scope": 23814,
         "usedErrors": [],
         "usedEvents": []
       }