@latticexyz/world-modules 2.2.17-32649080323d2a27cdf4a189917a70b958d062da → 2.2.17-3d5b7b75c5c68f4c7499ecd2fcf6e3b2b40c6ad5

package/src/modules/callwithsignature/Unstable_CallWithSignatureSystem.sol

@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
-
-import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { System } from "@latticexyz/world/src/System.sol";
-import { SystemCall } from "@latticexyz/world/src/SystemCall.sol";
-import { createDelegation } from "@latticexyz/world/src/modules/init/implementations/createDelegation.sol";
-
-import { CallWithSignatureNonces } from "./tables/CallWithSignatureNonces.sol";
-import { getSignedMessageHash } from "./getSignedMessageHash.sol";
-import { ECDSA } from "./ECDSA.sol";
-import { validateCallWithSignature } from "./validateCallWithSignature.sol";
-import { IUnstable_CallWithSignatureErrors } from "./IUnstable_CallWithSignatureErrors.sol";
-
-contract Unstable_CallWithSignatureSystem is System, IUnstable_CallWithSignatureErrors {
-  /**
-   * @notice Calls a system with a given system ID using the given signature.
-   * @param signer The address on whose behalf the system is called.
-   * @param systemId The ID of the system to be called.
-   * @param callData The ABI data for the system call.
-   * @param signature The EIP712 signature.
-   * @return Return data from the system call.
-   */
-  function callWithSignature(
-    address signer,
-    ResourceId systemId,
-    bytes memory callData,
-    bytes memory signature
-  ) external payable returns (bytes memory) {
-    validateCallWithSignature(signer, systemId, callData, signature);
-
-    CallWithSignatureNonces._set(signer, CallWithSignatureNonces._get(signer) + 1);
-
-    return SystemCall.callWithHooksOrRevert(signer, systemId, callData, _msgValue());
-  }
-}

package/src/modules/callwithsignature/constants.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
-
-import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";
-import { ROOT_NAMESPACE } from "@latticexyz/world/src/constants.sol";
-import { RESOURCE_TABLE, RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "@latticexyz/world/src/worldResourceTypes.sol";
-
-ResourceId constant DELEGATION_SYSTEM_ID = ResourceId.wrap(
-  (bytes32(abi.encodePacked(RESOURCE_SYSTEM, ROOT_NAMESPACE, "Delegation")))
-);

package/src/modules/callwithsignature/getSignedMessageHash.sol

@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
-
-import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { WorldResourceIdLib, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
-
-using WorldResourceIdInstance for ResourceId;
-
-// Note the intended value of the `salt` field is the chain ID.
-// It is not included in `chainId`, to allow cross-chain signing without requiring wallets to switch networks.
-// The value of this field should be the chain on which the world lives, rather than the chain the wallet is connected to.
-bytes32 constant DOMAIN_TYPEHASH = keccak256("EIP712Domain(address verifyingContract,bytes32 salt)");
-bytes32 constant CALL_TYPEHASH = keccak256(
-  "Call(address signer,string systemNamespace,string systemName,bytes callData,uint256 nonce)"
-);
-
-/**
- * @notice Generate the message hash for a given delegation signature.
- * For EIP712 signatures https://eips.ethereum.org/EIPS/eip-712
- * @dev We include the signer address to prevent generating a signature that recovers to a random address that didn't sign the message.
- * @param signer The address on whose behalf the system is called.
- * @param systemId The ID of the system to be called.
- * @param callData The ABI data for the system call.
- * @param nonce The nonce of the signer
- * @param worldAddress The world address
- * @return Return the message hash.
- */
-function getSignedMessageHash(
-  address signer,
-  ResourceId systemId,
-  bytes memory callData,
-  uint256 nonce,
-  address worldAddress
-) view returns (bytes32) {
-  bytes32 domainSeperator = keccak256(abi.encode(DOMAIN_TYPEHASH, worldAddress, bytes32(block.chainid)));
-
-  return
-    keccak256(
-      abi.encodePacked(
-        "\x19\x01",
-        domainSeperator,
-        keccak256(
-          abi.encode(
-            CALL_TYPEHASH,
-            signer,
-            keccak256(abi.encodePacked(WorldResourceIdLib.toTrimmedString(systemId.getNamespace()))),
-            keccak256(abi.encodePacked(WorldResourceIdLib.toTrimmedString(systemId.getName()))),
-            keccak256(callData),
-            nonce
-          )
-        )
-      )
-    );
-}

package/src/modules/callwithsignature/tables/CallWithSignatureNonces.sol

@@ -1,199 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
-
-/* Autogenerated file. Do not edit manually. */
-
-// Import store internals
-import { IStore } from "@latticexyz/store/src/IStore.sol";
-import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
-import { StoreCore } from "@latticexyz/store/src/StoreCore.sol";
-import { Bytes } from "@latticexyz/store/src/Bytes.sol";
-import { Memory } from "@latticexyz/store/src/Memory.sol";
-import { SliceLib } from "@latticexyz/store/src/Slice.sol";
-import { EncodeArray } from "@latticexyz/store/src/tightcoder/EncodeArray.sol";
-import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
-import { Schema } from "@latticexyz/store/src/Schema.sol";
-import { EncodedLengths, EncodedLengthsLib } from "@latticexyz/store/src/EncodedLengths.sol";
-import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-
-library CallWithSignatureNonces {
-  // Hex below is the result of `WorldResourceIdLib.encode({ namespace: "", name: "CallWithSignatur", typeId: RESOURCE_TABLE });`
-  ResourceId constant _tableId = ResourceId.wrap(0x7462000000000000000000000000000043616c6c576974685369676e61747572);
-
-  FieldLayout constant _fieldLayout =
-    FieldLayout.wrap(0x0020010020000000000000000000000000000000000000000000000000000000);
-
-  // Hex-encoded key schema of (address)
-  Schema constant _keySchema = Schema.wrap(0x0014010061000000000000000000000000000000000000000000000000000000);
-  // Hex-encoded value schema of (uint256)
-  Schema constant _valueSchema = Schema.wrap(0x002001001f000000000000000000000000000000000000000000000000000000);
-
-  /**
-   * @notice Get the table's key field names.
-   * @return keyNames An array of strings with the names of key fields.
-   */
-  function getKeyNames() internal pure returns (string[] memory keyNames) {
-    keyNames = new string[](1);
-    keyNames[0] = "signer";
-  }
-
-  /**
-   * @notice Get the table's value field names.
-   * @return fieldNames An array of strings with the names of value fields.
-   */
-  function getFieldNames() internal pure returns (string[] memory fieldNames) {
-    fieldNames = new string[](1);
-    fieldNames[0] = "nonce";
-  }
-
-  /**
-   * @notice Register the table with its config.
-   */
-  function register() internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
-  }
-
-  /**
-   * @notice Register the table with its config.
-   */
-  function _register() internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
-  }
-
-  /**
-   * @notice Get nonce.
-   */
-  function getNonce(address signer) internal view returns (uint256 nonce) {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    bytes32 _blob = StoreSwitch.getStaticField(_tableId, _keyTuple, 0, _fieldLayout);
-    return (uint256(bytes32(_blob)));
-  }
-
-  /**
-   * @notice Get nonce.
-   */
-  function _getNonce(address signer) internal view returns (uint256 nonce) {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    bytes32 _blob = StoreCore.getStaticField(_tableId, _keyTuple, 0, _fieldLayout);
-    return (uint256(bytes32(_blob)));
-  }
-
-  /**
-   * @notice Get nonce.
-   */
-  function get(address signer) internal view returns (uint256 nonce) {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    bytes32 _blob = StoreSwitch.getStaticField(_tableId, _keyTuple, 0, _fieldLayout);
-    return (uint256(bytes32(_blob)));
-  }
-
-  /**
-   * @notice Get nonce.
-   */
-  function _get(address signer) internal view returns (uint256 nonce) {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    bytes32 _blob = StoreCore.getStaticField(_tableId, _keyTuple, 0, _fieldLayout);
-    return (uint256(bytes32(_blob)));
-  }
-
-  /**
-   * @notice Set nonce.
-   */
-  function setNonce(address signer, uint256 nonce) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreSwitch.setStaticField(_tableId, _keyTuple, 0, abi.encodePacked((nonce)), _fieldLayout);
-  }
-
-  /**
-   * @notice Set nonce.
-   */
-  function _setNonce(address signer, uint256 nonce) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreCore.setStaticField(_tableId, _keyTuple, 0, abi.encodePacked((nonce)), _fieldLayout);
-  }
-
-  /**
-   * @notice Set nonce.
-   */
-  function set(address signer, uint256 nonce) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreSwitch.setStaticField(_tableId, _keyTuple, 0, abi.encodePacked((nonce)), _fieldLayout);
-  }
-
-  /**
-   * @notice Set nonce.
-   */
-  function _set(address signer, uint256 nonce) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreCore.setStaticField(_tableId, _keyTuple, 0, abi.encodePacked((nonce)), _fieldLayout);
-  }
-
-  /**
-   * @notice Delete all data for given keys.
-   */
-  function deleteRecord(address signer) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreSwitch.deleteRecord(_tableId, _keyTuple);
-  }
-
-  /**
-   * @notice Delete all data for given keys.
-   */
-  function _deleteRecord(address signer) internal {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    StoreCore.deleteRecord(_tableId, _keyTuple, _fieldLayout);
-  }
-
-  /**
-   * @notice Tightly pack static (fixed length) data using this table's schema.
-   * @return The static data, encoded into a sequence of bytes.
-   */
-  function encodeStatic(uint256 nonce) internal pure returns (bytes memory) {
-    return abi.encodePacked(nonce);
-  }
-
-  /**
-   * @notice Encode all of a record's fields.
-   * @return The static (fixed length) data, encoded into a sequence of bytes.
-   * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
-   */
-  function encode(uint256 nonce) internal pure returns (bytes memory, EncodedLengths, bytes memory) {
-    bytes memory _staticData = encodeStatic(nonce);
-
-    EncodedLengths _encodedLengths;
-    bytes memory _dynamicData;
-
-    return (_staticData, _encodedLengths, _dynamicData);
-  }
-
-  /**
-   * @notice Encode keys as a bytes32 array using this table's field layout.
-   */
-  function encodeKeyTuple(address signer) internal pure returns (bytes32[] memory) {
-    bytes32[] memory _keyTuple = new bytes32[](1);
-    _keyTuple[0] = bytes32(uint256(uint160(signer)));
-
-    return _keyTuple;
-  }
-}

package/src/modules/callwithsignature/validateCallWithSignature.sol

@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
-import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";
-import { WorldContextConsumerLib } from "@latticexyz/world/src/WorldContext.sol";
-import { CallWithSignatureNonces } from "./tables/CallWithSignatureNonces.sol";
-import { getSignedMessageHash } from "./getSignedMessageHash.sol";
-import { ECDSA } from "./ECDSA.sol";
-import { IUnstable_CallWithSignatureErrors } from "./IUnstable_CallWithSignatureErrors.sol";
-import { SignatureChecker } from "./SignatureChecker.sol";
-
-/**
- * @notice Verifies the given system call corresponds to the given signature.
- * @param signer The address on whose behalf the system is called.
- * @param systemId The ID of the system to be called.
- * @param callData The ABI data for the system call.
- * @param signature The EIP712 signature.
- * @dev Reverts with InvalidSignature(recoveredSigner) if the signature is invalid.
- */
-function validateCallWithSignature(
-  address signer,
-  ResourceId systemId,
-  bytes memory callData,
-  bytes memory signature
-) view {
-  uint256 nonce = CallWithSignatureNonces._get(signer);
-  bytes32 hash = getSignedMessageHash(signer, systemId, callData, nonce, WorldContextConsumerLib._world());
-
-  if (!SignatureChecker.isValidSignatureNow(signer, hash, signature)) {
-    revert IUnstable_CallWithSignatureErrors.InvalidSignature();
-  }
-}