@latticexyz/entrykit 2.2.22-91837e36ade680787d224691c848540fea793a5a → 2.2.22-9620c3a0ffda83a61b0ec9deb65f91cc70b2d664
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/tsup/bin/deploy.js
CHANGED
|
@@ -18,9 +18,9 @@ import {
|
|
|
18
18
|
getContractAddress,
|
|
19
19
|
waitForTransactions
|
|
20
20
|
} from "@latticexyz/common/internal";
|
|
21
|
-
import entryPointArtifact from "@account-abstraction/contracts/artifacts/EntryPoint.json"
|
|
22
|
-
import simpleAccountFactoryArtifact from "@account-abstraction/contracts/artifacts/SimpleAccountFactory.json"
|
|
23
|
-
import localPaymasterArtifact from "@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json"
|
|
21
|
+
import entryPointArtifact from "@account-abstraction/contracts/artifacts/EntryPoint.json" assert { type: "json" };
|
|
22
|
+
import simpleAccountFactoryArtifact from "@account-abstraction/contracts/artifacts/SimpleAccountFactory.json" assert { type: "json" };
|
|
23
|
+
import localPaymasterArtifact from "@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json" assert { type: "json" };
|
|
24
24
|
import { getChainId } from "viem/actions";
|
|
25
25
|
import { writeContract } from "@latticexyz/common";
|
|
26
26
|
import { entryPoint07Address } from "viem/account-abstraction";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/bin/deploy.ts"],"sourcesContent":["import \"dotenv/config\";\nimport {\n Hex,\n concatHex,\n http,\n isHex,\n parseAbiParameters,\n encodeAbiParameters,\n size,\n parseEther,\n createClient,\n} from \"viem\";\nimport { privateKeyToAccount } from \"viem/accounts\";\nimport { getRpcUrl } from \"@latticexyz/common/foundry\";\nimport {\n ensureContractsDeployed,\n ensureDeployer,\n getContractAddress,\n waitForTransactions,\n} from \"@latticexyz/common/internal\";\nimport entryPointArtifact from \"@account-abstraction/contracts/artifacts/EntryPoint.json\"
|
|
1
|
+
{"version":3,"sources":["../../../src/bin/deploy.ts"],"sourcesContent":["import \"dotenv/config\";\nimport {\n Hex,\n concatHex,\n http,\n isHex,\n parseAbiParameters,\n encodeAbiParameters,\n size,\n parseEther,\n createClient,\n} from \"viem\";\nimport { privateKeyToAccount } from \"viem/accounts\";\nimport { getRpcUrl } from \"@latticexyz/common/foundry\";\nimport {\n ensureContractsDeployed,\n ensureDeployer,\n getContractAddress,\n waitForTransactions,\n} from \"@latticexyz/common/internal\";\nimport entryPointArtifact from \"@account-abstraction/contracts/artifacts/EntryPoint.json\" assert { type: \"json\" };\nimport simpleAccountFactoryArtifact from \"@account-abstraction/contracts/artifacts/SimpleAccountFactory.json\" assert { type: \"json\" };\nimport localPaymasterArtifact from \"@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json\" assert { type: \"json\" };\nimport { getChainId } from \"viem/actions\";\nimport { writeContract } from \"@latticexyz/common\";\nimport { entryPoint07Address } from \"viem/account-abstraction\";\n\n// TODO: parse env with arktype (to avoid zod dep) and throw when absent\n\nconst privateKey = process.env.PRIVATE_KEY;\nif (!isHex(privateKey)) {\n // TODO: detect anvil and automatically put this env var where it needs to go?\n throw new Error(\n `Missing \\`PRIVATE_KEY\\` environment variable. If you're using Anvil, run\n\n echo \"PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80\" > .env\n\nto use a prefunded Anvil account.`,\n );\n}\nconst account = privateKeyToAccount(privateKey);\nconst rpcUrl = await getRpcUrl();\n\nconst client = createClient({ account, transport: http(rpcUrl) });\n\nconst chainId = await getChainId(client);\n\nconsole.log(\"Deploying to chain\", chainId, \"from\", account.address, \"via\", rpcUrl);\n\n// TODO: deployer address flag/env var?\nconst deployerAddress = await ensureDeployer(client);\n\n// https://github.com/eth-infinitism/account-abstraction/blob/b3bae63bd9bc0ed394dfca8668008213127adb62/hardhat.config.ts#L11\nconst entryPointSalt = \"0x90d8084deab30c2a37c45e8d47f49f2f7965183cb6990a98943ef94940681de3\";\nconst entryPointAddress = getContractAddress({\n deployerAddress,\n bytecode: entryPointArtifact.bytecode as Hex,\n salt: entryPointSalt,\n});\nif (entryPointAddress !== entryPoint07Address) {\n throw new Error(\n `Unexpected EntryPoint v0.7 address\\n\\n Expected: ${entryPoint07Address}\\nActual: ${entryPointAddress}`,\n );\n}\n\n// Deploy entrypoint first, because following deploys need to be able to call it.\nawait ensureContractsDeployed({\n client,\n deployerAddress,\n contracts: [\n {\n bytecode: entryPointArtifact.bytecode as Hex,\n salt: entryPointSalt,\n deployedBytecodeSize: size(entryPointArtifact.deployedBytecode as Hex),\n debugLabel: \"EntryPoint v0.7\",\n },\n ],\n});\n\nawait ensureContractsDeployed({\n client,\n deployerAddress,\n contracts: [\n {\n bytecode: concatHex([\n simpleAccountFactoryArtifact.bytecode as Hex,\n encodeAbiParameters(parseAbiParameters(\"address\"), [entryPointAddress]),\n ]),\n deployedBytecodeSize: size(simpleAccountFactoryArtifact.deployedBytecode as Hex),\n debugLabel: \"SimpleAccountFactory\",\n },\n ],\n});\n\nif (chainId === 31337) {\n const localPaymasterBytecode = concatHex([\n localPaymasterArtifact.bytecode.object as Hex,\n encodeAbiParameters(parseAbiParameters(\"address\"), [entryPointAddress]),\n ]);\n const localPaymasterAddress = getContractAddress({ deployerAddress, bytecode: localPaymasterBytecode });\n\n await ensureContractsDeployed({\n client,\n deployerAddress,\n contracts: [\n {\n bytecode: localPaymasterBytecode,\n deployedBytecodeSize: size(localPaymasterArtifact.deployedBytecode.object as Hex),\n debugLabel: \"GenerousPaymaster\",\n },\n ],\n });\n\n const tx = await writeContract(client, {\n chain: null,\n address: entryPointAddress,\n abi: [\n {\n inputs: [{ name: \"account\", type: \"address\" }],\n name: \"depositTo\",\n outputs: [],\n stateMutability: \"payable\",\n type: \"function\",\n },\n ],\n functionName: \"depositTo\",\n args: [localPaymasterAddress],\n value: parseEther(\"100\"),\n });\n await waitForTransactions({ client, hashes: [tx] });\n console.log(\"\\nFunded local paymaster at:\", localPaymasterAddress, \"\\n\");\n}\n\nconsole.log(\"\\nEntryKit contracts are ready!\\n\");\nprocess.exit(0);\n"],"mappings":"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","names":[]}
|
|
@@ -139,11 +139,8 @@ var debug2 = debug.extend("quarry");
|
|
|
139
139
|
|
|
140
140
|
// src/quarry/transports/userOpExecutor.ts
|
|
141
141
|
import { setBalance } from "viem/actions";
|
|
142
|
-
function userOpExecutor({
|
|
143
|
-
|
|
144
|
-
fallbackDefaultTransport
|
|
145
|
-
}) {
|
|
146
|
-
return (opts) => {
|
|
142
|
+
function userOpExecutor({ executor }) {
|
|
143
|
+
return () => {
|
|
147
144
|
debug2("using a local user op executor", executor.account.address);
|
|
148
145
|
if (executor.chain.id === 31337) {
|
|
149
146
|
debug2("setting executor balance");
|
|
@@ -178,9 +175,7 @@ function userOpExecutor({
|
|
|
178
175
|
if (method === "eth_estimateUserOperationGas") {
|
|
179
176
|
return await estimateUserOperationGas(params);
|
|
180
177
|
}
|
|
181
|
-
|
|
182
|
-
const { request: fallbackRequest } = fallbackDefaultTransport(opts);
|
|
183
|
-
return fallbackRequest({ method, params });
|
|
178
|
+
throw new Error(`userOpExecutor: method "${method}" not supported`);
|
|
184
179
|
};
|
|
185
180
|
return createTransport({
|
|
186
181
|
key: "userOpExecutor",
|
|
@@ -192,27 +187,20 @@ function userOpExecutor({
|
|
|
192
187
|
}
|
|
193
188
|
|
|
194
189
|
// src/getBundlerTransport.ts
|
|
195
|
-
import { wiresaw } from "@latticexyz/common/internal";
|
|
196
190
|
function getBundlerTransport(chain) {
|
|
197
|
-
if ("wiresaw" in chain.rpcUrls) {
|
|
198
|
-
return wiresaw();
|
|
199
|
-
}
|
|
200
191
|
const bundlerHttpUrl = chain.rpcUrls.bundler?.http[0];
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
}).extend(transactionQueue()),
|
|
212
|
-
fallbackDefaultTransport: http()
|
|
213
|
-
});
|
|
192
|
+
const bundlerTransport = bundlerHttpUrl ? http(bundlerHttpUrl) : chain.id === 31337 ? userOpExecutor({
|
|
193
|
+
executor: createClient({
|
|
194
|
+
chain,
|
|
195
|
+
transport: fallback([webSocket(), http()]),
|
|
196
|
+
account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
|
|
197
|
+
pollingInterval: 10
|
|
198
|
+
}).extend(transactionQueue())
|
|
199
|
+
}) : null;
|
|
200
|
+
if (!bundlerTransport) {
|
|
201
|
+
throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
|
|
214
202
|
}
|
|
215
|
-
|
|
203
|
+
return bundlerTransport;
|
|
216
204
|
}
|
|
217
205
|
|
|
218
206
|
// src/EntryKitConfigProvider.tsx
|