fix(world): use WorldContextConsumerLib._msgSender() instead of msg.s…

…ender (#3436)
latticexyz · Jan 9, 2025 · 653f378 · 653f378
1 parent ff8a065
commit 653f378
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.changeset/heavy-eggs-smell.md b/.changeset/heavy-eggs-smell.md
@@ -0,0 +1,5 @@
+---
+"@latticexyz/world": patch
+---
+
+Use `WorldContextConsumerLib._msgSender()` instead of `msg.sender` in system libraries.
diff --git a/packages/world/ts/node/render-solidity/renderSystemLibrary.ts b/packages/world/ts/node/render-solidity/renderSystemLibrary.ts
@@ -37,6 +37,10 @@ export function renderSystemLibrary(options: RenderSystemLibraryOptions) {
       symbol: "SystemCall",
       path: `${worldImportPath}/SystemCall.sol`,
     },
+    {
+      symbol: "WorldContextConsumerLib",
+      path: `${worldImportPath}/WorldContext.sol`,
+    },
     {
       symbol: "Systems",
       path: `${worldImportPath}/codegen/tables/Systems.sol`,
@@ -96,7 +100,7 @@ export function renderSystemLibrary(options: RenderSystemLibraryOptions) {
       }
 
       function callAsRoot(${userTypeName} self) internal view returns (RootCallWrapper memory) {
-        return RootCallWrapper(self.toResourceId(), msg.sender);
+        return RootCallWrapper(self.toResourceId(), WorldContextConsumerLib._msgSender());
       }
 
       function callAsRootFrom(${userTypeName} self, address from) internal pure returns (RootCallWrapper memory) {

diff --git a/test/system-libraries/src/namespaces/a/codegen/systems/ASystemLib.sol b/test/system-libraries/src/namespaces/a/codegen/systems/ASystemLib.sol
diff --git a/test/system-libraries/src/namespaces/b/codegen/systems/BSystemLib.sol b/test/system-libraries/src/namespaces/b/codegen/systems/BSystemLib.sol
diff --git a/test/system-libraries/src/namespaces/root/codegen/systems/RootSystemLib.sol b/test/system-libraries/src/namespaces/root/codegen/systems/RootSystemLib.sol