@latticexyz/world 2.2.22-f7aa4c5722bf24103f4cd4ab01b5d9c55f9b2995 → 2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db
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/dist/internal.js +1 -1
- package/dist/internal.js.map +1 -1
- package/package.json +10 -10
package/dist/internal.js
CHANGED
|
@@ -262,7 +262,7 @@ function sendUserOperationFrom(params) {
|
|
|
262
262
|
return call;
|
|
263
263
|
}
|
|
264
264
|
if (call.functionName === "batchCall") {
|
|
265
|
-
const batchCallArgs = call
|
|
265
|
+
const batchCallArgs = call;
|
|
266
266
|
const [systemCalls] = batchCallArgs.args;
|
|
267
267
|
if (!systemCalls.length) {
|
|
268
268
|
throw new Error("`batchCall` should have at least one system call.");
|
package/dist/internal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../ts/encodeSystemCall.ts","../ts/normalizeSystemFunctionName.ts","../ts/encodeSystemCallFrom.ts","../ts/encodeSystemCalls.ts","../ts/encodeSystemCallsFrom.ts","../ts/actions/callFrom.ts","../ts/worldFunctionToSystemFunction.ts","../ts/actions/sendUserOperationFrom.ts","../ts/config/v2/dynamicResolution.ts"],"sourcesContent":["import { Abi, EncodeFunctionDataParameters, Hex, encodeFunctionData, type ContractFunctionName } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCall<abi extends Abi, functionName extends ContractFunctionName<abi>> = {\n [k in ContractFunctionName<abi>]: {\n /**\n * System's resource ID\n */\n readonly systemId: Hex;\n /**\n * System ABI\n */\n readonly abi: abi;\n /**\n * System function name to call\n */\n readonly functionName: k;\n } & Pick<EncodeFunctionDataParameters<abi, k>, \"args\">;\n}[functionName];\n\n/** Encode a system call to be passed as arguments into `World.call` */\nexport function encodeSystemCall<abi extends Abi, functionName extends ContractFunctionName<abi>>({\n abi,\n systemId,\n functionName,\n args,\n}: SystemCall<abi, functionName>): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"call\">[\"inputs\"]> {\n return [\n systemId,\n encodeFunctionData<abi, functionName>({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n } as EncodeFunctionDataParameters<abi, functionName>),\n ];\n}\n","import { hexToResource, resourceToLabel } from \"@latticexyz/common\";\nimport { Hex } from \"viem\";\n\n/** @internal */\nexport function internal_normalizeSystemFunctionName(systemId: Hex, functionName: string) {\n const resource = hexToResource(systemId);\n const worldFunctionPrefix = resource.namespace !== \"\" ? `${resource.namespace}__` : null;\n if (worldFunctionPrefix != null && functionName.startsWith(worldFunctionPrefix)) {\n console.warn(\n // eslint-disable-next-line max-len\n `Detected world function name \"${functionName}\" used in call to system \"${resourceToLabel(resource)}\".\\n\\nIt's recommended to use a system ABI and system function name with these methods instead.`,\n );\n return functionName.slice(worldFunctionPrefix.length);\n }\n return functionName;\n}\n","import { Abi, EncodeFunctionDataParameters, encodeFunctionData, Address, type ContractFunctionName } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { SystemCall } from \"./encodeSystemCall\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCallFrom<abi extends Abi, functionName extends ContractFunctionName<abi>> = SystemCall<\n abi,\n functionName\n> & {\n readonly from: Address;\n};\n\n/** Encode a system call to be passed as arguments into `World.callFrom` */\nexport function encodeSystemCallFrom<abi extends Abi, functionName extends ContractFunctionName<abi>>({\n abi,\n from,\n systemId,\n functionName,\n args,\n}: SystemCallFrom<abi, functionName>): AbiParametersToPrimitiveTypes<\n ExtractAbiFunction<worldCallAbi, \"callFrom\">[\"inputs\"]\n> {\n return [\n from,\n systemId,\n encodeFunctionData<abi, functionName>({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n } as EncodeFunctionDataParameters<abi, functionName>),\n ];\n}\n","import { Abi, encodeFunctionData, type ContractFunctionName } from \"viem\";\nimport { SystemCall } from \"./encodeSystemCall\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCalls<abis extends readonly Abi[]> = {\n [k in keyof abis]: SystemCall<abis[k], ContractFunctionName<abis[k]>>;\n};\n\n/** Encode system calls to be passed as arguments into `World.batchCall` */\nexport function encodeSystemCalls<abis extends readonly Abi[]>(\n systemCalls: SystemCalls<abis>,\n): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"batchCall\">[\"inputs\"]> {\n return [\n systemCalls.map(({ abi, systemId, functionName, args }) => ({\n systemId,\n callData: encodeFunctionData({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n }),\n })),\n ];\n}\n","import { Abi, Address, encodeFunctionData } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\nimport { SystemCalls } from \"./encodeSystemCalls\";\n\n/** Encode system calls to be passed as arguments into `World.batchCallFrom` */\nexport function encodeSystemCallsFrom<abis extends readonly Abi[]>(\n from: Address,\n systemCalls: SystemCalls<abis>,\n): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"batchCallFrom\">[\"inputs\"]> {\n return [\n systemCalls.map(({ abi, systemId, functionName, args }) => ({\n from,\n systemId,\n callData: encodeFunctionData({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n }),\n })),\n ];\n}\n","import {\n slice,\n concat,\n type Transport,\n type Chain,\n type Account,\n type Hex,\n type WalletActions,\n type Client,\n type WriteContractParameters,\n type EncodeFunctionDataParameters,\n} from \"viem\";\nimport { getAction, encodeFunctionData } from \"viem/utils\";\nimport { writeContract as viem_writeContract } from \"viem/actions\";\nimport { readHex } from \"@latticexyz/common\";\nimport { worldCallAbi } from \"../worldCallAbi\";\nimport { SystemFunction, worldFunctionToSystemFunction } from \"../worldFunctionToSystemFunction\";\n\ntype CallFromParameters = {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient?: Client;\n};\n\n// By extending viem clients with this function after delegation, the delegation is automatically applied to World contract writes.\n// This means that these writes are made on behalf of the delegator.\n// Internally, it transforms the write arguments to use `callFrom`.\n//\n// Accepts either `worldFunctionToSystemFunction` or `publicClient` as an argument.\n// `worldFunctionToSystemFunction` allows manually providing the mapping function, thus users can utilize their client store for the lookup.\n// If `publicClient` is provided instead, this function retrieves the corresponding system function from the World contract.\n//\n// The function mapping is cached to avoid redundant retrievals for the same World function.\nexport function callFrom(\n params: CallFromParameters,\n): <chain extends Chain, account extends Account | undefined>(\n client: Client<Transport, chain, account>,\n) => Pick<WalletActions<chain, account>, \"writeContract\"> {\n return (client) => ({\n async writeContract(writeArgs) {\n const _writeContract = getAction(client, viem_writeContract, \"writeContract\");\n\n // Skip if the contract isn't the World or the function called should not be redirected through `callFrom`.\n if (\n writeArgs.address !== params.worldAddress ||\n writeArgs.functionName === \"call\" ||\n writeArgs.functionName === \"callFrom\" ||\n writeArgs.functionName === \"batchCallFrom\" ||\n writeArgs.functionName === \"callWithSignature\"\n ) {\n return _writeContract(writeArgs);\n }\n\n // Wrap system calls from `batchCall` with delegator for a `batchCallFrom`\n // TODO: remove this specific workaround once https://github.com/latticexyz/mud/pull/3506 lands\n if (writeArgs.functionName === \"batchCall\") {\n const batchCallArgs = writeArgs as unknown as WriteContractParameters<worldCallAbi, \"batchCall\">;\n const [systemCalls] = batchCallArgs.args;\n if (!systemCalls.length) {\n throw new Error(\"`batchCall` should have at least one system call.\");\n }\n\n return _writeContract({\n ...batchCallArgs,\n functionName: \"batchCallFrom\",\n args: [systemCalls.map((systemCall) => ({ from: params.delegatorAddress, ...systemCall }))],\n });\n }\n\n // Encode the World's calldata (which includes the World's function selector).\n const worldCalldata = encodeFunctionData({\n abi: writeArgs.abi,\n functionName: writeArgs.functionName,\n args: writeArgs.args,\n } as unknown as EncodeFunctionDataParameters);\n\n // The first 4 bytes of calldata represent the function selector.\n const worldFunctionSelector = slice(worldCalldata, 0, 4);\n\n // Get the systemId and System's function selector.\n const { systemId, systemFunctionSelector } = await worldFunctionToSystemFunction({\n ...params,\n publicClient: params.publicClient ?? client,\n worldFunctionSelector,\n });\n\n // Construct the System's calldata by replacing the World's function selector with the System's.\n // Use `readHex` instead of `slice` to prevent out-of-bounds errors with calldata that has no args.\n const systemCalldata = concat([systemFunctionSelector, readHex(worldCalldata, 4)]);\n\n // Call `writeContract` with the new args.\n return _writeContract({\n ...(writeArgs as unknown as WriteContractParameters<worldCallAbi, \"callFrom\">),\n functionName: \"callFrom\",\n args: [params.delegatorAddress, systemId, systemCalldata],\n });\n },\n });\n}\n","import {\n getSchemaTypes,\n getKeySchema,\n getValueSchema,\n encodeKey,\n decodeValueArgs,\n} from \"@latticexyz/protocol-parser/internal\";\nimport { Client, concat, Hex, PublicActions } from \"viem\";\nimport { readContract } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport worldConfig from \"../mud.config\";\n\nexport type SystemFunction = { systemId: Hex; systemFunctionSelector: Hex };\n\nconst systemFunctionCache = new Map<Hex, SystemFunction>();\n\nexport async function worldFunctionToSystemFunction(params: {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionSelector: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient: Client;\n}): Promise<SystemFunction> {\n const cacheKey = concat([params.worldAddress, params.worldFunctionSelector]);\n\n // Use cache if the function has been called previously.\n const cached = systemFunctionCache.get(cacheKey);\n if (cached) return cached;\n\n // If a mapping function is provided, use it. Otherwise, call the World contract.\n const systemFunction = params.worldFunctionToSystemFunction\n ? await params.worldFunctionToSystemFunction(params.worldFunctionSelector)\n : await retrieveSystemFunctionFromContract(params.publicClient, params.worldAddress, params.worldFunctionSelector);\n\n systemFunctionCache.set(cacheKey, systemFunction);\n\n return systemFunction;\n}\n\nasync function retrieveSystemFunctionFromContract(\n publicClient: Client,\n worldAddress: Hex,\n worldFunctionSelector: Hex,\n): Promise<SystemFunction> {\n const table = worldConfig.tables.world__FunctionSelectors;\n\n const keySchema = getSchemaTypes(getKeySchema(table));\n const valueSchema = getSchemaTypes(getValueSchema(table));\n\n const _readContract = getAction(publicClient, readContract, \"readContract\") as PublicActions[\"readContract\"];\n\n const [staticData, encodedLengths, dynamicData] = await _readContract({\n address: worldAddress,\n abi: [\n {\n type: \"function\",\n name: \"getRecord\",\n inputs: [\n {\n name: \"tableId\",\n type: \"bytes32\",\n internalType: \"ResourceId\",\n },\n {\n name: \"keyTuple\",\n type: \"bytes32[]\",\n internalType: \"bytes32[]\",\n },\n ],\n outputs: [\n {\n name: \"staticData\",\n type: \"bytes\",\n internalType: \"bytes\",\n },\n {\n name: \"encodedLengths\",\n type: \"bytes32\",\n internalType: \"EncodedLengths\",\n },\n {\n name: \"dynamicData\",\n type: \"bytes\",\n internalType: \"bytes\",\n },\n ],\n stateMutability: \"view\",\n },\n ],\n functionName: \"getRecord\",\n args: [table.tableId, encodeKey(keySchema, { worldFunctionSelector })],\n });\n\n const decoded = decodeValueArgs(valueSchema, { staticData, encodedLengths, dynamicData });\n\n const systemFunction: SystemFunction = {\n systemId: decoded.systemId,\n systemFunctionSelector: decoded.systemFunctionSelector,\n };\n\n return systemFunction;\n}\n","import {\n slice,\n concat,\n type Transport,\n type Chain,\n type Hex,\n type Client,\n type EncodeFunctionDataParameters,\n Abi,\n WriteContractParameters,\n} from \"viem\";\nimport { getAction, encodeFunctionData } from \"viem/utils\";\nimport { readHex } from \"@latticexyz/common\";\nimport { BundlerActions, sendUserOperation as viem_sendUserOperation, SmartAccount } from \"viem/account-abstraction\";\nimport { worldFunctionToSystemFunction } from \"../worldFunctionToSystemFunction\";\nimport { worldCallAbi } from \"../worldCallAbi\";\n\ntype CallFromParameters = {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient?: Client;\n};\n\ntype SystemFunction = { systemId: Hex; systemFunctionSelector: Hex };\n\n// By extending viem clients with this function after delegation, the delegation is automatically applied to World contract writes.\n// This means that these writes are made on behalf of the delegator.\n// Internally, it transforms the write arguments to use `callFrom`.\n//\n// Accepts either `worldFunctionToSystemFunction` or `publicClient` as an argument.\n// `worldFunctionToSystemFunction` allows manually providing the mapping function, thus users can utilize their client store for the lookup.\n// If `publicClient` is provided instead, this function retrieves the corresponding system function from the World contract.\n//\n// The function mapping is cached to avoid redundant retrievals for the same World function.\nexport function sendUserOperationFrom(\n params: CallFromParameters,\n): <chain extends Chain, account extends SmartAccount | undefined>(\n client: Client<Transport, chain, account>,\n) => Pick<BundlerActions<account>, \"sendUserOperation\"> {\n return (client) => ({\n async sendUserOperation(args) {\n const _sendUserOperation = getAction(client, viem_sendUserOperation, \"sendUserOperation\");\n\n if (args.callData) {\n return _sendUserOperation(args as never); // TODO: fix type issue\n }\n\n const calls = await Promise.all(\n args.calls.map(async (call) => {\n // Skip if the call doesn't match the decoded format (`functionName`, `args`, `to`)\n if (!isDecodedCall(call)) return call;\n\n // Skip if the contract isn't the World or the function called should not be redirected through `callFrom`.\n if (\n call.to !== params.worldAddress ||\n call.functionName === \"call\" ||\n call.functionName === \"callFrom\" ||\n call.functionName === \"batchCallFrom\" ||\n call.functionName === \"callWithSignature\"\n ) {\n return call;\n }\n\n // Wrap system calls from `batchCall` with delegator for a `batchCallFrom`\n // TODO: remove this specific workaround once https://github.com/latticexyz/mud/pull/3506 lands\n if (call.functionName === \"batchCall\") {\n const batchCallArgs = call.args as unknown as WriteContractParameters<worldCallAbi, \"batchCall\">;\n const [systemCalls] = batchCallArgs.args;\n if (!systemCalls.length) {\n throw new Error(\"`batchCall` should have at least one system call.\");\n }\n\n return {\n ...call,\n functionName: \"batchCallFrom\",\n args: [systemCalls.map((systemCall) => ({ from: params.delegatorAddress, ...systemCall }))],\n };\n }\n\n // Encode the World's calldata (which includes the World's function selector).\n const worldCalldata = encodeFunctionData({\n abi: call.abi,\n functionName: call.functionName,\n args: call.args,\n } as unknown as EncodeFunctionDataParameters);\n\n // The first 4 bytes of calldata represent the function selector.\n const worldFunctionSelector = slice(worldCalldata, 0, 4);\n\n // Get the systemId and System's function selector.\n const { systemId, systemFunctionSelector } = await worldFunctionToSystemFunction({\n ...params,\n publicClient: params.publicClient ?? client,\n worldFunctionSelector,\n });\n\n // Construct the System's calldata by replacing the World's function selector with the System's.\n // Use `readHex` instead of `slice` to prevent out-of-bounds errors with calldata that has no args.\n const systemCalldata = concat([systemFunctionSelector, readHex(worldCalldata, 4)]);\n\n return {\n ...call,\n functionName: \"callFrom\",\n args: [params.delegatorAddress, systemId, systemCalldata],\n };\n }),\n );\n\n // Call `sendUserOperation` with the new args.\n return _sendUserOperation({ ...args, calls } as never); // TODO: fix type issue\n },\n });\n}\n\n// Matching https://github.com/wevm/viem/blob/26e4bcafb3be976510b4d8170ef29bb69e014263/src/types/calls.ts#L6-L23 (not exported)\ntype DecodedCall = {\n abi: Abi;\n functionName: string;\n args: unknown[];\n to: Hex;\n};\n\nfunction isDecodedCall(call: unknown): call is DecodedCall {\n return typeof call === \"object\" && call != null && \"functionName\" in call && \"args\" in call && \"to\" in call;\n}\n","import { World } from \"./output\";\n\nexport type DynamicResolution = {\n // TODO: add systemAddress support\n type: \"tableId\";\n input: string;\n};\n\nexport type ValueWithType = {\n value: string | number | Uint8Array;\n type: string;\n};\n\n/**\n * Dynamically resolve a table name to a table id at deploy time\n */\nexport function resolveTableId(tableName: string) {\n return {\n type: \"tableId\",\n input: tableName,\n } as const;\n}\n\n/** Type guard for DynamicResolution */\nexport function isDynamicResolution(value: unknown): value is DynamicResolution {\n return typeof value === \"object\" && value !== null && \"type\" in value && \"input\" in value;\n}\n\n/** Type guard for ValueWithType */\nexport function isValueWithType(value: unknown): value is ValueWithType {\n return typeof value === \"object\" && value !== null && \"type\" in value && \"value\" in value;\n}\n\n/**\n * Turn a DynamicResolution object into a ValueWithType based on the provided context\n */\nexport function resolveWithContext(\n input: unknown,\n context: { config: World; systemAddresses?: Record<string, Promise<string>> },\n): ValueWithType {\n if (isValueWithType(input)) return input;\n\n if (isDynamicResolution(input)) {\n if (input.type === \"tableId\") {\n const tableEntries = Object.entries(context.config.tables).filter(\n ([tableName, table]) => tableName === input.input || table.name === input.input,\n );\n\n if (tableEntries.length > 1) {\n throw new Error(\n `Found more than one table with name \"${input.input}\". Try using one of the following table names instead: ${tableEntries.map(([tableName]) => tableName).join(\", \")}`,\n );\n }\n\n if (tableEntries.length === 1) {\n const [entry] = tableEntries;\n const [, table] = entry;\n return { type: \"bytes32\", value: table.tableId };\n }\n }\n }\n\n throw new Error(`Could not resolve dynamic resolution:\\n${JSON.stringify(input, null, 2)}`);\n}\n"],"mappings":"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","names":["encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","concat","getAction","encodeFunctionData","getAction","encodeFunctionData","concat","slice","concat","getAction","encodeFunctionData","readHex","getAction","encodeFunctionData","slice","concat","readHex"]}
|
|
1
|
+
{"version":3,"sources":["../ts/encodeSystemCall.ts","../ts/normalizeSystemFunctionName.ts","../ts/encodeSystemCallFrom.ts","../ts/encodeSystemCalls.ts","../ts/encodeSystemCallsFrom.ts","../ts/actions/callFrom.ts","../ts/worldFunctionToSystemFunction.ts","../ts/actions/sendUserOperationFrom.ts","../ts/config/v2/dynamicResolution.ts"],"sourcesContent":["import { Abi, EncodeFunctionDataParameters, Hex, encodeFunctionData, type ContractFunctionName } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCall<abi extends Abi, functionName extends ContractFunctionName<abi>> = {\n [k in ContractFunctionName<abi>]: {\n /**\n * System's resource ID\n */\n readonly systemId: Hex;\n /**\n * System ABI\n */\n readonly abi: abi;\n /**\n * System function name to call\n */\n readonly functionName: k;\n } & Pick<EncodeFunctionDataParameters<abi, k>, \"args\">;\n}[functionName];\n\n/** Encode a system call to be passed as arguments into `World.call` */\nexport function encodeSystemCall<abi extends Abi, functionName extends ContractFunctionName<abi>>({\n abi,\n systemId,\n functionName,\n args,\n}: SystemCall<abi, functionName>): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"call\">[\"inputs\"]> {\n return [\n systemId,\n encodeFunctionData<abi, functionName>({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n } as EncodeFunctionDataParameters<abi, functionName>),\n ];\n}\n","import { hexToResource, resourceToLabel } from \"@latticexyz/common\";\nimport { Hex } from \"viem\";\n\n/** @internal */\nexport function internal_normalizeSystemFunctionName(systemId: Hex, functionName: string) {\n const resource = hexToResource(systemId);\n const worldFunctionPrefix = resource.namespace !== \"\" ? `${resource.namespace}__` : null;\n if (worldFunctionPrefix != null && functionName.startsWith(worldFunctionPrefix)) {\n console.warn(\n // eslint-disable-next-line max-len\n `Detected world function name \"${functionName}\" used in call to system \"${resourceToLabel(resource)}\".\\n\\nIt's recommended to use a system ABI and system function name with these methods instead.`,\n );\n return functionName.slice(worldFunctionPrefix.length);\n }\n return functionName;\n}\n","import { Abi, EncodeFunctionDataParameters, encodeFunctionData, Address, type ContractFunctionName } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { SystemCall } from \"./encodeSystemCall\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCallFrom<abi extends Abi, functionName extends ContractFunctionName<abi>> = SystemCall<\n abi,\n functionName\n> & {\n readonly from: Address;\n};\n\n/** Encode a system call to be passed as arguments into `World.callFrom` */\nexport function encodeSystemCallFrom<abi extends Abi, functionName extends ContractFunctionName<abi>>({\n abi,\n from,\n systemId,\n functionName,\n args,\n}: SystemCallFrom<abi, functionName>): AbiParametersToPrimitiveTypes<\n ExtractAbiFunction<worldCallAbi, \"callFrom\">[\"inputs\"]\n> {\n return [\n from,\n systemId,\n encodeFunctionData<abi, functionName>({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n } as EncodeFunctionDataParameters<abi, functionName>),\n ];\n}\n","import { Abi, encodeFunctionData, type ContractFunctionName } from \"viem\";\nimport { SystemCall } from \"./encodeSystemCall\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\n\nexport type SystemCalls<abis extends readonly Abi[]> = {\n [k in keyof abis]: SystemCall<abis[k], ContractFunctionName<abis[k]>>;\n};\n\n/** Encode system calls to be passed as arguments into `World.batchCall` */\nexport function encodeSystemCalls<abis extends readonly Abi[]>(\n systemCalls: SystemCalls<abis>,\n): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"batchCall\">[\"inputs\"]> {\n return [\n systemCalls.map(({ abi, systemId, functionName, args }) => ({\n systemId,\n callData: encodeFunctionData({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n }),\n })),\n ];\n}\n","import { Abi, Address, encodeFunctionData } from \"viem\";\nimport type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from \"abitype\";\nimport { worldCallAbi } from \"./worldCallAbi\";\nimport { internal_normalizeSystemFunctionName } from \"./normalizeSystemFunctionName\";\nimport { SystemCalls } from \"./encodeSystemCalls\";\n\n/** Encode system calls to be passed as arguments into `World.batchCallFrom` */\nexport function encodeSystemCallsFrom<abis extends readonly Abi[]>(\n from: Address,\n systemCalls: SystemCalls<abis>,\n): AbiParametersToPrimitiveTypes<ExtractAbiFunction<worldCallAbi, \"batchCallFrom\">[\"inputs\"]> {\n return [\n systemCalls.map(({ abi, systemId, functionName, args }) => ({\n from,\n systemId,\n callData: encodeFunctionData({\n abi,\n functionName: internal_normalizeSystemFunctionName(systemId, functionName),\n args,\n }),\n })),\n ];\n}\n","import {\n slice,\n concat,\n type Transport,\n type Chain,\n type Account,\n type Hex,\n type WalletActions,\n type Client,\n type WriteContractParameters,\n type EncodeFunctionDataParameters,\n} from \"viem\";\nimport { getAction, encodeFunctionData } from \"viem/utils\";\nimport { writeContract as viem_writeContract } from \"viem/actions\";\nimport { readHex } from \"@latticexyz/common\";\nimport { worldCallAbi } from \"../worldCallAbi\";\nimport { SystemFunction, worldFunctionToSystemFunction } from \"../worldFunctionToSystemFunction\";\n\ntype CallFromParameters = {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient?: Client;\n};\n\n// By extending viem clients with this function after delegation, the delegation is automatically applied to World contract writes.\n// This means that these writes are made on behalf of the delegator.\n// Internally, it transforms the write arguments to use `callFrom`.\n//\n// Accepts either `worldFunctionToSystemFunction` or `publicClient` as an argument.\n// `worldFunctionToSystemFunction` allows manually providing the mapping function, thus users can utilize their client store for the lookup.\n// If `publicClient` is provided instead, this function retrieves the corresponding system function from the World contract.\n//\n// The function mapping is cached to avoid redundant retrievals for the same World function.\nexport function callFrom(\n params: CallFromParameters,\n): <chain extends Chain, account extends Account | undefined>(\n client: Client<Transport, chain, account>,\n) => Pick<WalletActions<chain, account>, \"writeContract\"> {\n return (client) => ({\n async writeContract(writeArgs) {\n const _writeContract = getAction(client, viem_writeContract, \"writeContract\");\n\n // Skip if the contract isn't the World or the function called should not be redirected through `callFrom`.\n if (\n writeArgs.address !== params.worldAddress ||\n writeArgs.functionName === \"call\" ||\n writeArgs.functionName === \"callFrom\" ||\n writeArgs.functionName === \"batchCallFrom\" ||\n writeArgs.functionName === \"callWithSignature\"\n ) {\n return _writeContract(writeArgs);\n }\n\n // Wrap system calls from `batchCall` with delegator for a `batchCallFrom`\n // TODO: remove this specific workaround once https://github.com/latticexyz/mud/pull/3506 lands\n if (writeArgs.functionName === \"batchCall\") {\n const batchCallArgs = writeArgs as unknown as WriteContractParameters<worldCallAbi, \"batchCall\">;\n const [systemCalls] = batchCallArgs.args;\n if (!systemCalls.length) {\n throw new Error(\"`batchCall` should have at least one system call.\");\n }\n\n return _writeContract({\n ...batchCallArgs,\n functionName: \"batchCallFrom\",\n args: [systemCalls.map((systemCall) => ({ from: params.delegatorAddress, ...systemCall }))],\n });\n }\n\n // Encode the World's calldata (which includes the World's function selector).\n const worldCalldata = encodeFunctionData({\n abi: writeArgs.abi,\n functionName: writeArgs.functionName,\n args: writeArgs.args,\n } as unknown as EncodeFunctionDataParameters);\n\n // The first 4 bytes of calldata represent the function selector.\n const worldFunctionSelector = slice(worldCalldata, 0, 4);\n\n // Get the systemId and System's function selector.\n const { systemId, systemFunctionSelector } = await worldFunctionToSystemFunction({\n ...params,\n publicClient: params.publicClient ?? client,\n worldFunctionSelector,\n });\n\n // Construct the System's calldata by replacing the World's function selector with the System's.\n // Use `readHex` instead of `slice` to prevent out-of-bounds errors with calldata that has no args.\n const systemCalldata = concat([systemFunctionSelector, readHex(worldCalldata, 4)]);\n\n // Call `writeContract` with the new args.\n return _writeContract({\n ...(writeArgs as unknown as WriteContractParameters<worldCallAbi, \"callFrom\">),\n functionName: \"callFrom\",\n args: [params.delegatorAddress, systemId, systemCalldata],\n });\n },\n });\n}\n","import {\n getSchemaTypes,\n getKeySchema,\n getValueSchema,\n encodeKey,\n decodeValueArgs,\n} from \"@latticexyz/protocol-parser/internal\";\nimport { Client, concat, Hex, PublicActions } from \"viem\";\nimport { readContract } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport worldConfig from \"../mud.config\";\n\nexport type SystemFunction = { systemId: Hex; systemFunctionSelector: Hex };\n\nconst systemFunctionCache = new Map<Hex, SystemFunction>();\n\nexport async function worldFunctionToSystemFunction(params: {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionSelector: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient: Client;\n}): Promise<SystemFunction> {\n const cacheKey = concat([params.worldAddress, params.worldFunctionSelector]);\n\n // Use cache if the function has been called previously.\n const cached = systemFunctionCache.get(cacheKey);\n if (cached) return cached;\n\n // If a mapping function is provided, use it. Otherwise, call the World contract.\n const systemFunction = params.worldFunctionToSystemFunction\n ? await params.worldFunctionToSystemFunction(params.worldFunctionSelector)\n : await retrieveSystemFunctionFromContract(params.publicClient, params.worldAddress, params.worldFunctionSelector);\n\n systemFunctionCache.set(cacheKey, systemFunction);\n\n return systemFunction;\n}\n\nasync function retrieveSystemFunctionFromContract(\n publicClient: Client,\n worldAddress: Hex,\n worldFunctionSelector: Hex,\n): Promise<SystemFunction> {\n const table = worldConfig.tables.world__FunctionSelectors;\n\n const keySchema = getSchemaTypes(getKeySchema(table));\n const valueSchema = getSchemaTypes(getValueSchema(table));\n\n const _readContract = getAction(publicClient, readContract, \"readContract\") as PublicActions[\"readContract\"];\n\n const [staticData, encodedLengths, dynamicData] = await _readContract({\n address: worldAddress,\n abi: [\n {\n type: \"function\",\n name: \"getRecord\",\n inputs: [\n {\n name: \"tableId\",\n type: \"bytes32\",\n internalType: \"ResourceId\",\n },\n {\n name: \"keyTuple\",\n type: \"bytes32[]\",\n internalType: \"bytes32[]\",\n },\n ],\n outputs: [\n {\n name: \"staticData\",\n type: \"bytes\",\n internalType: \"bytes\",\n },\n {\n name: \"encodedLengths\",\n type: \"bytes32\",\n internalType: \"EncodedLengths\",\n },\n {\n name: \"dynamicData\",\n type: \"bytes\",\n internalType: \"bytes\",\n },\n ],\n stateMutability: \"view\",\n },\n ],\n functionName: \"getRecord\",\n args: [table.tableId, encodeKey(keySchema, { worldFunctionSelector })],\n });\n\n const decoded = decodeValueArgs(valueSchema, { staticData, encodedLengths, dynamicData });\n\n const systemFunction: SystemFunction = {\n systemId: decoded.systemId,\n systemFunctionSelector: decoded.systemFunctionSelector,\n };\n\n return systemFunction;\n}\n","import {\n slice,\n concat,\n type Transport,\n type Chain,\n type Hex,\n type Client,\n type EncodeFunctionDataParameters,\n Abi,\n WriteContractParameters,\n} from \"viem\";\nimport { getAction, encodeFunctionData } from \"viem/utils\";\nimport { readHex } from \"@latticexyz/common\";\nimport { BundlerActions, sendUserOperation as viem_sendUserOperation, SmartAccount } from \"viem/account-abstraction\";\nimport { worldFunctionToSystemFunction } from \"../worldFunctionToSystemFunction\";\nimport { worldCallAbi } from \"../worldCallAbi\";\n\ntype CallFromParameters = {\n worldAddress: Hex;\n delegatorAddress: Hex;\n worldFunctionToSystemFunction?: (worldFunctionSelector: Hex) => Promise<SystemFunction>;\n publicClient?: Client;\n};\n\ntype SystemFunction = { systemId: Hex; systemFunctionSelector: Hex };\n\n// By extending viem clients with this function after delegation, the delegation is automatically applied to World contract writes.\n// This means that these writes are made on behalf of the delegator.\n// Internally, it transforms the write arguments to use `callFrom`.\n//\n// Accepts either `worldFunctionToSystemFunction` or `publicClient` as an argument.\n// `worldFunctionToSystemFunction` allows manually providing the mapping function, thus users can utilize their client store for the lookup.\n// If `publicClient` is provided instead, this function retrieves the corresponding system function from the World contract.\n//\n// The function mapping is cached to avoid redundant retrievals for the same World function.\nexport function sendUserOperationFrom(\n params: CallFromParameters,\n): <chain extends Chain, account extends SmartAccount | undefined>(\n client: Client<Transport, chain, account>,\n) => Pick<BundlerActions<account>, \"sendUserOperation\"> {\n return (client) => ({\n async sendUserOperation(args) {\n const _sendUserOperation = getAction(client, viem_sendUserOperation, \"sendUserOperation\");\n\n if (args.callData) {\n return _sendUserOperation(args as never); // TODO: fix type issue\n }\n\n const calls = await Promise.all(\n args.calls.map(async (call) => {\n // Skip if the call doesn't match the decoded format (`functionName`, `args`, `to`)\n if (!isDecodedCall(call)) return call;\n\n // Skip if the contract isn't the World or the function called should not be redirected through `callFrom`.\n if (\n call.to !== params.worldAddress ||\n call.functionName === \"call\" ||\n call.functionName === \"callFrom\" ||\n call.functionName === \"batchCallFrom\" ||\n call.functionName === \"callWithSignature\"\n ) {\n return call;\n }\n\n // Wrap system calls from `batchCall` with delegator for a `batchCallFrom`\n // TODO: remove this specific workaround once https://github.com/latticexyz/mud/pull/3506 lands\n if (call.functionName === \"batchCall\") {\n const batchCallArgs = call as unknown as WriteContractParameters<worldCallAbi, \"batchCall\">;\n const [systemCalls] = batchCallArgs.args;\n if (!systemCalls.length) {\n throw new Error(\"`batchCall` should have at least one system call.\");\n }\n\n return {\n ...call,\n functionName: \"batchCallFrom\",\n args: [systemCalls.map((systemCall) => ({ from: params.delegatorAddress, ...systemCall }))],\n };\n }\n\n // Encode the World's calldata (which includes the World's function selector).\n const worldCalldata = encodeFunctionData({\n abi: call.abi,\n functionName: call.functionName,\n args: call.args,\n } as unknown as EncodeFunctionDataParameters);\n\n // The first 4 bytes of calldata represent the function selector.\n const worldFunctionSelector = slice(worldCalldata, 0, 4);\n\n // Get the systemId and System's function selector.\n const { systemId, systemFunctionSelector } = await worldFunctionToSystemFunction({\n ...params,\n publicClient: params.publicClient ?? client,\n worldFunctionSelector,\n });\n\n // Construct the System's calldata by replacing the World's function selector with the System's.\n // Use `readHex` instead of `slice` to prevent out-of-bounds errors with calldata that has no args.\n const systemCalldata = concat([systemFunctionSelector, readHex(worldCalldata, 4)]);\n\n return {\n ...call,\n functionName: \"callFrom\",\n args: [params.delegatorAddress, systemId, systemCalldata],\n };\n }),\n );\n\n // Call `sendUserOperation` with the new args.\n return _sendUserOperation({ ...args, calls } as never); // TODO: fix type issue\n },\n });\n}\n\n// Matching https://github.com/wevm/viem/blob/26e4bcafb3be976510b4d8170ef29bb69e014263/src/types/calls.ts#L6-L23 (not exported)\ntype DecodedCall = {\n abi: Abi;\n functionName: string;\n args: unknown[];\n to: Hex;\n};\n\nfunction isDecodedCall(call: unknown): call is DecodedCall {\n return typeof call === \"object\" && call != null && \"functionName\" in call && \"args\" in call && \"to\" in call;\n}\n","import { World } from \"./output\";\n\nexport type DynamicResolution = {\n // TODO: add systemAddress support\n type: \"tableId\";\n input: string;\n};\n\nexport type ValueWithType = {\n value: string | number | Uint8Array;\n type: string;\n};\n\n/**\n * Dynamically resolve a table name to a table id at deploy time\n */\nexport function resolveTableId(tableName: string) {\n return {\n type: \"tableId\",\n input: tableName,\n } as const;\n}\n\n/** Type guard for DynamicResolution */\nexport function isDynamicResolution(value: unknown): value is DynamicResolution {\n return typeof value === \"object\" && value !== null && \"type\" in value && \"input\" in value;\n}\n\n/** Type guard for ValueWithType */\nexport function isValueWithType(value: unknown): value is ValueWithType {\n return typeof value === \"object\" && value !== null && \"type\" in value && \"value\" in value;\n}\n\n/**\n * Turn a DynamicResolution object into a ValueWithType based on the provided context\n */\nexport function resolveWithContext(\n input: unknown,\n context: { config: World; systemAddresses?: Record<string, Promise<string>> },\n): ValueWithType {\n if (isValueWithType(input)) return input;\n\n if (isDynamicResolution(input)) {\n if (input.type === \"tableId\") {\n const tableEntries = Object.entries(context.config.tables).filter(\n ([tableName, table]) => tableName === input.input || table.name === input.input,\n );\n\n if (tableEntries.length > 1) {\n throw new Error(\n `Found more than one table with name \"${input.input}\". Try using one of the following table names instead: ${tableEntries.map(([tableName]) => tableName).join(\", \")}`,\n );\n }\n\n if (tableEntries.length === 1) {\n const [entry] = tableEntries;\n const [, table] = entry;\n return { type: \"bytes32\", value: table.tableId };\n }\n }\n }\n\n throw new Error(`Could not resolve dynamic resolution:\\n${JSON.stringify(input, null, 2)}`);\n}\n"],"mappings":"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","names":["encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","encodeFunctionData","concat","getAction","encodeFunctionData","getAction","encodeFunctionData","concat","slice","concat","getAction","encodeFunctionData","readHex","getAction","encodeFunctionData","slice","concat","readHex"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@latticexyz/world",
|
|
3
|
-
"version": "2.2.22-
|
|
3
|
+
"version": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
4
4
|
"description": "World framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -43,12 +43,12 @@
|
|
|
43
43
|
"abitype": "1.0.6",
|
|
44
44
|
"arktype": "2.0.0-beta.6",
|
|
45
45
|
"debug": "^4.3.4",
|
|
46
|
-
"@latticexyz/block-logs-stream": "2.2.22-
|
|
47
|
-
"@latticexyz/common": "2.2.22-
|
|
48
|
-
"@latticexyz/config": "2.2.22-
|
|
49
|
-
"@latticexyz/protocol-parser": "2.2.22-
|
|
50
|
-
"@latticexyz/schema-type": "2.2.22-
|
|
51
|
-
"@latticexyz/store": "2.2.22-
|
|
46
|
+
"@latticexyz/block-logs-stream": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
47
|
+
"@latticexyz/common": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
48
|
+
"@latticexyz/config": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
49
|
+
"@latticexyz/protocol-parser": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
50
|
+
"@latticexyz/schema-type": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
51
|
+
"@latticexyz/store": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@types/debug": "^4.1.7",
|
|
@@ -58,9 +58,9 @@
|
|
|
58
58
|
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
|
|
59
59
|
"glob": "^10.4.2",
|
|
60
60
|
"solhint": "^3.3.7",
|
|
61
|
-
"viem": "2.
|
|
62
|
-
"@latticexyz/abi-ts": "2.2.22-
|
|
63
|
-
"@latticexyz/gas-report": "2.2.22-
|
|
61
|
+
"viem": "2.30.6",
|
|
62
|
+
"@latticexyz/abi-ts": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db",
|
|
63
|
+
"@latticexyz/gas-report": "2.2.22-f85d1a78840761a3ffa61645d75ddd1a7d2352db"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
66
|
"viem": "2.x"
|