@latticexyz/world-module-metadata 2.2.22-a3645c819959efe97ff2e50f6f5b88ebe77fa980 → 2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/MetadataModule.sol/MetadataModule.json +1 -1
- package/out/MetadataModule.t.sol/MetadataModuleTest.abi.json +1 -1
- package/out/MetadataModule.t.sol/MetadataModuleTest.abi.json.d.ts +1 -1
- package/out/MetadataModule.t.sol/MetadataModuleTest.json +1 -1
- package/out/MetadataSystem.sol/MetadataSystem.abi.json +0 -16
- package/out/MetadataSystem.sol/MetadataSystem.abi.json.d.ts +0 -16
- package/out/MetadataSystem.sol/MetadataSystem.json +1 -1
- package/out/MetadataSystemLib.sol/MetadataSystemLib.json +1 -1
- package/out/MetadataSystemLib.sol/_deleteResourceTag_ResourceId_bytes32.json +1 -1
- package/out/MetadataSystemLib.sol/_getResourceTag_ResourceId_bytes32.json +1 -1
- package/out/MetadataSystemLib.sol/_setResourceTag_ResourceId_bytes32_bytes.json +1 -1
- package/out/build-info/{d8683521b55401b8908d2309dc58c4c2.json → ab06a8abecbdcde4f4822c15edcb5846.json} +1 -1
- package/package.json +6 -6
- package/src/MetadataModule.sol +8 -8
- package/src/MetadataSystem.sol +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"id":"
|
|
1
|
+
{"id":"ab06a8abecbdcde4f4822c15edcb5846","source_id_to_path":{"0":"node_modules/@latticexyz/gas-report/src/GasReporter.sol","1":"node_modules/@latticexyz/schema-type/src/solidity/SchemaType.sol","2":"node_modules/@latticexyz/store/src/Bytes.sol","3":"node_modules/@latticexyz/store/src/EncodedLengths.sol","4":"node_modules/@latticexyz/store/src/FieldLayout.sol","5":"node_modules/@latticexyz/store/src/Hook.sol","6":"node_modules/@latticexyz/store/src/IERC165.sol","7":"node_modules/@latticexyz/store/src/IEncodedLengthsErrors.sol","8":"node_modules/@latticexyz/store/src/IFieldLayoutErrors.sol","9":"node_modules/@latticexyz/store/src/ISchemaErrors.sol","10":"node_modules/@latticexyz/store/src/ISliceErrors.sol","11":"node_modules/@latticexyz/store/src/IStore.sol","12":"node_modules/@latticexyz/store/src/IStoreErrors.sol","13":"node_modules/@latticexyz/store/src/IStoreEvents.sol","14":"node_modules/@latticexyz/store/src/IStoreHook.sol","15":"node_modules/@latticexyz/store/src/IStoreKernel.sol","16":"node_modules/@latticexyz/store/src/IStoreRead.sol","17":"node_modules/@latticexyz/store/src/IStoreRegistration.sol","18":"node_modules/@latticexyz/store/src/IStoreWrite.sol","19":"node_modules/@latticexyz/store/src/Memory.sol","20":"node_modules/@latticexyz/store/src/ResourceId.sol","21":"node_modules/@latticexyz/store/src/Schema.sol","22":"node_modules/@latticexyz/store/src/Slice.sol","23":"node_modules/@latticexyz/store/src/Storage.sol","24":"node_modules/@latticexyz/store/src/StoreCore.sol","25":"node_modules/@latticexyz/store/src/StoreKernel.sol","26":"node_modules/@latticexyz/store/src/StoreRead.sol","27":"node_modules/@latticexyz/store/src/StoreSwitch.sol","28":"node_modules/@latticexyz/store/src/codegen/index.sol","29":"node_modules/@latticexyz/store/src/codegen/tables/Hooks.sol","30":"node_modules/@latticexyz/store/src/codegen/tables/ResourceIds.sol","31":"node_modules/@latticexyz/store/src/codegen/tables/StoreHooks.sol","32":"node_modules/@latticexyz/store/src/codegen/tables/Tables.sol","33":"node_modules/@latticexyz/store/src/constants.sol","34":"node_modules/@latticexyz/store/src/rightMask.sol","35":"node_modules/@latticexyz/store/src/storeHookTypes.sol","36":"node_modules/@latticexyz/store/src/storeResourceTypes.sol","37":"node_modules/@latticexyz/store/src/tightcoder/DecodeSlice.sol","38":"node_modules/@latticexyz/store/src/tightcoder/EncodeArray.sol","39":"node_modules/@latticexyz/store/src/tightcoder/TightCoder.sol","40":"node_modules/@latticexyz/store/src/version.sol","41":"node_modules/@latticexyz/world/src/AccessControl.sol","42":"node_modules/@latticexyz/world/src/Delegation.sol","43":"node_modules/@latticexyz/world/src/ERC165Checker.sol","44":"node_modules/@latticexyz/world/src/IDelegationControl.sol","45":"node_modules/@latticexyz/world/src/IERC165.sol","46":"node_modules/@latticexyz/world/src/IModule.sol","47":"node_modules/@latticexyz/world/src/IModuleErrors.sol","48":"node_modules/@latticexyz/world/src/ISystemHook.sol","49":"node_modules/@latticexyz/world/src/IWorldContextConsumer.sol","50":"node_modules/@latticexyz/world/src/IWorldErrors.sol","51":"node_modules/@latticexyz/world/src/IWorldEvents.sol","52":"node_modules/@latticexyz/world/src/IWorldKernel.sol","53":"node_modules/@latticexyz/world/src/Module.sol","54":"node_modules/@latticexyz/world/src/System.sol","55":"node_modules/@latticexyz/world/src/SystemCall.sol","56":"node_modules/@latticexyz/world/src/World.sol","57":"node_modules/@latticexyz/world/src/WorldContext.sol","58":"node_modules/@latticexyz/world/src/WorldResourceId.sol","59":"node_modules/@latticexyz/world/src/codegen/experimental/systems/StoreRegistrationSystemLib.sol","60":"node_modules/@latticexyz/world/src/codegen/experimental/systems/WorldRegistrationSystemLib.sol","61":"node_modules/@latticexyz/world/src/codegen/interfaces/IAccessManagementSystem.sol","62":"node_modules/@latticexyz/world/src/codegen/interfaces/IBalanceTransferSystem.sol","63":"node_modules/@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol","64":"node_modules/@latticexyz/world/src/codegen/interfaces/IBatchCallSystem.sol","65":"node_modules/@latticexyz/world/src/codegen/interfaces/IModuleInstallationSystem.sol","66":"node_modules/@latticexyz/world/src/codegen/interfaces/IRegistrationSystem.sol","67":"node_modules/@latticexyz/world/src/codegen/interfaces/IWorldRegistrationSystem.sol","68":"node_modules/@latticexyz/world/src/codegen/tables/Balances.sol","69":"node_modules/@latticexyz/world/src/codegen/tables/FunctionSelectors.sol","70":"node_modules/@latticexyz/world/src/codegen/tables/FunctionSignatures.sol","71":"node_modules/@latticexyz/world/src/codegen/tables/InitModuleAddress.sol","72":"node_modules/@latticexyz/world/src/codegen/tables/InstalledModules.sol","73":"node_modules/@latticexyz/world/src/codegen/tables/NamespaceDelegationControl.sol","74":"node_modules/@latticexyz/world/src/codegen/tables/NamespaceOwner.sol","75":"node_modules/@latticexyz/world/src/codegen/tables/ResourceAccess.sol","76":"node_modules/@latticexyz/world/src/codegen/tables/SystemHooks.sol","77":"node_modules/@latticexyz/world/src/codegen/tables/SystemRegistry.sol","78":"node_modules/@latticexyz/world/src/codegen/tables/Systems.sol","79":"node_modules/@latticexyz/world/src/codegen/tables/UserDelegationControl.sol","80":"node_modules/@latticexyz/world/src/constants.sol","81":"node_modules/@latticexyz/world/src/modules/init/InitModule.sol","82":"node_modules/@latticexyz/world/src/modules/init/LimitedCallContext.sol","83":"node_modules/@latticexyz/world/src/modules/init/RegistrationSystem.sol","84":"node_modules/@latticexyz/world/src/modules/init/constants.sol","85":"node_modules/@latticexyz/world/src/modules/init/functionSignatures.sol","86":"node_modules/@latticexyz/world/src/modules/init/implementations/AccessManagementSystem.sol","87":"node_modules/@latticexyz/world/src/modules/init/implementations/BalanceTransferSystem.sol","88":"node_modules/@latticexyz/world/src/modules/init/implementations/BatchCallSystem.sol","89":"node_modules/@latticexyz/world/src/modules/init/implementations/ModuleInstallationSystem.sol","90":"node_modules/@latticexyz/world/src/modules/init/implementations/StoreRegistrationSystem.sol","91":"node_modules/@latticexyz/world/src/modules/init/implementations/WorldRegistrationSystem.sol","92":"node_modules/@latticexyz/world/src/modules/init/implementations/createDelegation.sol","93":"node_modules/@latticexyz/world/src/modules/init/types.sol","94":"node_modules/@latticexyz/world/src/requireInterface.sol","95":"node_modules/@latticexyz/world/src/requireNamespace.sol","96":"node_modules/@latticexyz/world/src/requireValidNamespace.sol","97":"node_modules/@latticexyz/world/src/revertWithBytes.sol","98":"node_modules/@latticexyz/world/src/systemHookTypes.sol","99":"node_modules/@latticexyz/world/src/version.sol","100":"node_modules/@latticexyz/world/src/worldResourceTypes.sol","101":"node_modules/@latticexyz/world/test/createInitModule.sol","102":"node_modules/@latticexyz/world/test/createWorld.sol","103":"node_modules/ds-test/src/test.sol","104":"node_modules/forge-std/src/Base.sol","105":"node_modules/forge-std/src/StdAssertions.sol","106":"node_modules/forge-std/src/StdChains.sol","107":"node_modules/forge-std/src/StdCheats.sol","108":"node_modules/forge-std/src/StdError.sol","109":"node_modules/forge-std/src/StdInvariant.sol","110":"node_modules/forge-std/src/StdJson.sol","111":"node_modules/forge-std/src/StdMath.sol","112":"node_modules/forge-std/src/StdStorage.sol","113":"node_modules/forge-std/src/StdStyle.sol","114":"node_modules/forge-std/src/StdUtils.sol","115":"node_modules/forge-std/src/Test.sol","116":"node_modules/forge-std/src/Vm.sol","117":"node_modules/forge-std/src/console.sol","118":"node_modules/forge-std/src/console2.sol","119":"node_modules/forge-std/src/interfaces/IMulticall3.sol","120":"node_modules/forge-std/src/safeconsole.sol","121":"src/MetadataModule.sol","122":"src/MetadataSystem.sol","123":"src/codegen/experimental/systems/MetadataSystemLib.sol","124":"src/codegen/index.sol","125":"src/codegen/tables/ResourceTag.sol","126":"src/codegen/world/IMetadataSystem.sol","127":"src/codegen/world/IWorld.sol","128":"test/MetadataModule.t.sol"},"language":"Solidity"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@latticexyz/world-module-metadata",
|
|
3
|
-
"version": "2.2.22-
|
|
3
|
+
"version": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb",
|
|
4
4
|
"description": "Metadata world module",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"src"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@latticexyz/schema-type": "2.2.22-
|
|
30
|
-
"@latticexyz/store": "2.2.22-
|
|
31
|
-
"@latticexyz/world": "2.2.22-
|
|
29
|
+
"@latticexyz/schema-type": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb",
|
|
30
|
+
"@latticexyz/store": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb",
|
|
31
|
+
"@latticexyz/world": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
|
|
35
35
|
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
|
|
36
36
|
"solhint": "^3.3.7",
|
|
37
|
-
"@latticexyz/abi-ts": "2.2.22-
|
|
38
|
-
"@latticexyz/gas-report": "2.2.22-
|
|
37
|
+
"@latticexyz/abi-ts": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb",
|
|
38
|
+
"@latticexyz/gas-report": "2.2.22-ca7a36a114ba65468662dbeef343129fa60f04eb"
|
|
39
39
|
},
|
|
40
40
|
"publishConfig": {
|
|
41
41
|
"access": "public"
|
package/src/MetadataModule.sol
CHANGED
|
@@ -12,6 +12,7 @@ import { worldRegistrationSystem } from "@latticexyz/world/src/codegen/experimen
|
|
|
12
12
|
import { storeRegistrationSystem } from "@latticexyz/world/src/codegen/experimental/systems/StoreRegistrationSystemLib.sol";
|
|
13
13
|
|
|
14
14
|
import { MetadataSystem } from "./MetadataSystem.sol";
|
|
15
|
+
import { metadataSystem } from "./codegen/experimental/systems/MetadataSystemLib.sol";
|
|
15
16
|
import { ResourceTag } from "./codegen/tables/ResourceTag.sol";
|
|
16
17
|
|
|
17
18
|
/**
|
|
@@ -23,7 +24,7 @@ import { ResourceTag } from "./codegen/tables/ResourceTag.sol";
|
|
|
23
24
|
contract MetadataModule is Module {
|
|
24
25
|
using WorldResourceIdInstance for ResourceId;
|
|
25
26
|
|
|
26
|
-
MetadataSystem private immutable
|
|
27
|
+
MetadataSystem private immutable metadataSystemAddress = new MetadataSystem();
|
|
27
28
|
|
|
28
29
|
function install(bytes memory args) public override {
|
|
29
30
|
ResourceId namespace = ResourceTag._tableId.getNamespaceId();
|
|
@@ -44,14 +45,10 @@ contract MetadataModule is Module {
|
|
|
44
45
|
);
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
ResourceId metadataSystemId =
|
|
48
|
-
|
|
49
|
-
namespace.getNamespace(),
|
|
50
|
-
"MetadataSystem"
|
|
51
|
-
);
|
|
52
|
-
// TODO: add support for upgrading system and registering new function selectors
|
|
48
|
+
ResourceId metadataSystemId = metadataSystem.toResourceId();
|
|
49
|
+
|
|
53
50
|
if (!ResourceIds.getExists(metadataSystemId)) {
|
|
54
|
-
worldRegistrationSystem.callFrom(_msgSender()).registerSystem(metadataSystemId,
|
|
51
|
+
worldRegistrationSystem.callFrom(_msgSender()).registerSystem(metadataSystemId, metadataSystemAddress, true);
|
|
55
52
|
worldRegistrationSystem.callFrom(_msgSender()).registerFunctionSelector(
|
|
56
53
|
metadataSystemId,
|
|
57
54
|
"getResourceTag(bytes32,bytes32)"
|
|
@@ -64,6 +61,9 @@ contract MetadataModule is Module {
|
|
|
64
61
|
metadataSystemId,
|
|
65
62
|
"deleteResourceTag(bytes32,bytes32)"
|
|
66
63
|
);
|
|
64
|
+
} else if (metadataSystem.getAddress() != address(metadataSystemAddress)) {
|
|
65
|
+
// upgrade system
|
|
66
|
+
worldRegistrationSystem.callFrom(_msgSender()).registerSystem(metadataSystemId, metadataSystemAddress, true);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
}
|
package/src/MetadataSystem.sol
CHANGED
|
@@ -13,13 +13,11 @@ contract MetadataSystem is System {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
function setResourceTag(ResourceId resource, bytes32 tag, bytes memory value) public {
|
|
16
|
-
AccessControl.requireExistence(resource);
|
|
17
16
|
AccessControl.requireOwner(resource, _msgSender());
|
|
18
17
|
ResourceTag.set(resource, tag, value);
|
|
19
18
|
}
|
|
20
19
|
|
|
21
20
|
function deleteResourceTag(ResourceId resource, bytes32 tag) public {
|
|
22
|
-
AccessControl.requireExistence(resource);
|
|
23
21
|
AccessControl.requireOwner(resource, _msgSender());
|
|
24
22
|
ResourceTag.deleteRecord(resource, tag);
|
|
25
23
|
}
|