@latticexyz/world-module-erc20 2.2.20-391575967cd09bd527d819222232a54a7d722fc2 → 2.2.20-b774ab28b3de6cefcbfce5e1bb6fcb68b9374abf

package/src/examples/{ERC20WithWorld.sol → ERC20PausableBurnable.sol}

@@ -5,22 +5,21 @@ pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
-import { WithWorld } from "@latticexyz/store-consumer/src/experimental/WithWorld.sol";
-import { Context } from "@latticexyz/store-consumer/src/experimental/Context.sol";
+import { WorldConsumer } from "@latticexyz/world-consumer/src/experimental/WorldConsumer.sol";
 
 import { ERC20Pausable } from "../experimental/ERC20Pausable.sol";
 import { ERC20Burnable } from "../experimental/ERC20Burnable.sol";
 import { MUDERC20 } from "../experimental/MUDERC20.sol";
 
-contract ERC20WithWorld is WithWorld, MUDERC20, ERC20Pausable, ERC20Burnable {
+contract ERC20PausableBurnable is MUDERC20, ERC20Pausable, ERC20Burnable {
   constructor(
     IBaseWorld world,
     bytes14 namespace,
     string memory name,
     string memory symbol
-  ) WithWorld(world, namespace, true) MUDERC20(name, symbol) {
+  ) WorldConsumer(world, namespace, true) MUDERC20(name, symbol) {
     // Transfer namespace ownership to the creator
-    world.transferOwnership(getNamespaceId(), _msgSender());
+    world.transferOwnership(namespaceId, _msgSender());
   }
 
   function mint(address to, uint256 value) public onlyNamespace {
@@ -37,10 +36,6 @@ contract ERC20WithWorld is WithWorld, MUDERC20, ERC20Pausable, ERC20Burnable {
 
   // The following functions are overrides required by Solidity.
 
-  function _msgSender() public view override(Context, WithWorld) returns (address sender) {
-    return WithWorld._msgSender();
-  }
-
   function _update(address from, address to, uint256 value) internal override(MUDERC20, ERC20Pausable) {
     super._update(from, to, value);
   }

package/src/experimental/ERC20Module.sol

@@ -11,7 +11,7 @@ import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.
 import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
 
 import { ERC20Registry } from "../codegen/tables/ERC20Registry.sol";
-import { ERC20WithWorld } from "../examples/ERC20WithWorld.sol";
+import { ERC20PausableBurnable } from "../examples/ERC20PausableBurnable.sol";
 import { ModuleConstants } from "./Constants.sol";
 
 contract ERC20Module is Module {
@@ -39,7 +39,7 @@ contract ERC20Module is Module {
 
     IBaseWorld world = IBaseWorld(_world());
 
-    ERC20WithWorld token = new ERC20WithWorld(world, namespace, name, symbol);
+    ERC20PausableBurnable token = new ERC20PausableBurnable(world, namespace, name, symbol);
 
     // Grant access to the token so it can write to tables after transferring ownership
     world.grantAccess(namespaceId, address(token));

package/src/experimental/MUDERC20.sol

@@ -3,8 +3,9 @@
 pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { StoreConsumer } from "@latticexyz/store-consumer/src/experimental/StoreConsumer.sol";
-import { Context } from "@latticexyz/store-consumer/src/experimental/Context.sol";
+import { WorldConsumer } from "@latticexyz/world-consumer/src/experimental/WorldConsumer.sol";
+import { WorldResourceIdLib } from "@latticexyz/world/src/WorldResourceId.sol";
+import { RESOURCE_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 import { ERC20Metadata, ERC20MetadataData } from "../codegen/tables/ERC20Metadata.sol";
 import { TotalSupply } from "../codegen/tables/TotalSupply.sol";
@@ -17,7 +18,7 @@ import { IERC20Errors } from "../interfaces/IERC20Errors.sol";
 
 import { ERC20TableNames } from "./Constants.sol";
 
-abstract contract MUDERC20 is Context, IERC20, IERC20Metadata, IERC20Errors, StoreConsumer {
+abstract contract MUDERC20 is IERC20, IERC20Metadata, IERC20Errors, WorldConsumer {
   ResourceId internal immutable totalSupplyId;
   ResourceId internal immutable balancesId;
   ResourceId internal immutable allowancesId;
@@ -25,10 +26,10 @@ abstract contract MUDERC20 is Context, IERC20, IERC20Metadata, IERC20Errors, Sto
 
   constructor(string memory _name, string memory _symbol) {
     // Needs to be inlined in the constructor
-    totalSupplyId = _encodeTableId(ERC20TableNames.TOTAL_SUPPLY);
-    balancesId = _encodeTableId(ERC20TableNames.BALANCES);
-    allowancesId = _encodeTableId(ERC20TableNames.ALLOWANCES);
-    metadataId = _encodeTableId(ERC20TableNames.METADATA);
+    totalSupplyId = WorldResourceIdLib.encode(RESOURCE_TABLE, namespace, ERC20TableNames.TOTAL_SUPPLY);
+    balancesId = WorldResourceIdLib.encode(RESOURCE_TABLE, namespace, ERC20TableNames.BALANCES);
+    allowancesId = WorldResourceIdLib.encode(RESOURCE_TABLE, namespace, ERC20TableNames.ALLOWANCES);
+    metadataId = WorldResourceIdLib.encode(RESOURCE_TABLE, namespace, ERC20TableNames.METADATA);
 
     // Register each table
     TotalSupply.register(totalSupplyId);

package/src/experimental/Pausable.sol

@@ -2,9 +2,10 @@
 // Adapted from OpenZeppelin Contracts [utils/Pausable.sol](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/f989fff93168606c726bc5e831ef50dd6e543f45/contracts/utils/Pausable.sol)
 pragma solidity >=0.8.24;
 
+import { RESOURCE_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { StoreConsumer } from "@latticexyz/store-consumer/src/experimental/StoreConsumer.sol";
-import { Context } from "@latticexyz/store-consumer/src/experimental/Context.sol";
+import { WorldResourceIdLib } from "@latticexyz/world/src/WorldResourceId.sol";
+import { WorldConsumer } from "@latticexyz/world-consumer/src/experimental/WorldConsumer.sol";
 
 import { Paused as PausedTable } from "../codegen/tables/Paused.sol";
 import { PausableTableNames } from "./Constants.sol";
@@ -18,7 +19,7 @@ import { PausableTableNames } from "./Constants.sol";
  * the functions of your contract. Note that they will not be pausable by
  * simply including this module, only once the modifiers are put in place.
  */
-abstract contract Pausable is Context, StoreConsumer {
+abstract contract Pausable is WorldConsumer {
   ResourceId internal immutable pausedId;
 
   /**
@@ -45,7 +46,7 @@ abstract contract Pausable is Context, StoreConsumer {
    * @dev Initializes the contract in unpaused state.
    */
   constructor() {
-    pausedId = _encodeTableId(PausableTableNames.PAUSED);
+    pausedId = WorldResourceIdLib.encode(RESOURCE_TABLE, namespace, PausableTableNames.PAUSED);
     PausedTable.register(pausedId);
     PausedTable.set(pausedId, false);
   }

package/out/Context.sol/Context.abi.json

@@ -1,15 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "_msgSender",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  }
-]

package/out/Context.sol/Context.abi.json.d.ts

@@ -1,17 +0,0 @@
-declare const abi: [
-  {
-    "type": "function",
-    "name": "_msgSender",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  }
-];
-
-export default abi;

package/out/Context.sol/Context.json

@@ -1 +0,0 @@
-{"abi":[{"type":"function","name":"_msgSender","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"_msgSender()":"119df25f"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.24+commit.e11b9ed9\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"_msgSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"node_modules/@latticexyz/store-consumer/src/experimental/Context.sol\":\"Context\"},\"evmVersion\":\"cancun\",\"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\":{\"node_modules/@latticexyz/store-consumer/src/experimental/Context.sol\":{\"keccak256\":\"0x09cd9a25b10c485528869e476cbe4acfb12193285aa06e2afd368bbed7e95f9a\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://a6706d0c3a3b54f04a38674a24bfdfad5b9fc1a9a8be822fd62c6845c4692f41\",\"dweb:/ipfs/QmaY1iDT4STHLF72bNn3U7WAN3X6J61KxeowKopS58VGPL\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.24+commit.e11b9ed9"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"view","type":"function","name":"_msgSender","outputs":[{"internalType":"address","name":"","type":"address"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@latticexyz/=node_modules/@latticexyz/","ds-test/=node_modules/ds-test/src/","forge-std/=node_modules/forge-std/src/"],"optimizer":{"enabled":true,"runs":3000},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"node_modules/@latticexyz/store-consumer/src/experimental/Context.sol":"Context"},"evmVersion":"cancun","libraries":{}},"sources":{"node_modules/@latticexyz/store-consumer/src/experimental/Context.sol":{"keccak256":"0x09cd9a25b10c485528869e476cbe4acfb12193285aa06e2afd368bbed7e95f9a","urls":["bzz-raw://a6706d0c3a3b54f04a38674a24bfdfad5b9fc1a9a8be822fd62c6845c4692f41","dweb:/ipfs/QmaY1iDT4STHLF72bNn3U7WAN3X6J61KxeowKopS58VGPL"],"license":"MIT"}},"version":1},"id":2}