@latticexyz/world 2.2.23-2ade90f493b15b4dbe56c08e97e4f8e97b716c3f → 2.2.23-7cd553a4588f2ddaeb4047393381cdd6ac91430f

package/dist/node.js

@@ -275,7 +275,8 @@ function renderSystemLibrary(options) {
   const functions = functionsInput.map((func) => ({
     ...func,
     // Format parameters (add auxiliary argument names, replace calldata location)
-    parameters: formatParams(func.parameters),
+    parameters: formatParams("__auxArg", func.parameters),
+    returnParameters: formatParams("__auxRet", func.returnParameters),
     // Remove `payable` from stateMutability for library functions
     stateMutability: func.stateMutability.replace("payable", "")
   }));
@@ -513,19 +514,22 @@ function renderAbiDecode(expression, returnParameters) {
   const returnTypes = returnParameters.map((param) => param.split(" ")[0]).join(", ");
   return `
     bytes memory result = ${expression};
-    return abi.decode(result, (${returnTypes}));
+    // skip decoding an empty result, which can happen after expectRevert
+    if (result.length != 0) {
+      return abi.decode(result, (${returnTypes}));
+    }
   `;
 }
 function renderReturnParameters2(returnParameters) {
   if (returnParameters.length == 0) return "";
   return `returns (${renderArguments2(returnParameters)})`;
 }
-function formatParams(params) {
+function formatParams(auxPrefix, params) {
   let auxCount = 0;
-  return params.map((arg) => arg.replace(/ calldata /, " memory ")).map((arg) => {
+  return params.map((arg) => arg.replace(/ calldata( |$)/, " memory$1")).map((arg) => {
     const items = arg.split(" ");
-    const needsAux = items.length === 1 || items.length === 2 && items[1] === "memory";
-    return needsAux ? `${arg} __aux${auxCount++}` : arg;
+    const needsAux = items.length === 1 || items.length === 2 && ["memory", "payable"].includes(items[1]);
+    return needsAux ? `${arg} ${auxPrefix}${auxCount++}` : arg;
   });
 }