thirdweb 5.119.1 → 5.119.3
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/cjs/cli/commands/stylus/builder.js +91 -51
- package/dist/cjs/cli/commands/stylus/builder.js.map +1 -1
- package/dist/cjs/cli/commands/stylus/create.js +2 -3
- package/dist/cjs/cli/commands/stylus/create.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/cli/commands/stylus/builder.js +91 -51
- package/dist/esm/cli/commands/stylus/builder.js.map +1 -1
- package/dist/esm/cli/commands/stylus/create.js +2 -3
- package/dist/esm/cli/commands/stylus/create.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/scripts/bridge-widget.js +2 -2
- package/dist/types/cli/commands/stylus/builder.d.ts.map +1 -1
- package/dist/types/cli/commands/stylus/create.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/cli/commands/stylus/builder.ts +119 -62
- package/src/cli/commands/stylus/create.ts +2 -8
- package/src/version.ts +1 -1
|
@@ -5,6 +5,7 @@ exports.deployStylus = deployStylus;
|
|
|
5
5
|
const node_child_process_1 = require("node:child_process");
|
|
6
6
|
const node_fs_1 = require("node:fs");
|
|
7
7
|
const node_path_1 = require("node:path");
|
|
8
|
+
const abitype_1 = require("abitype");
|
|
8
9
|
const open_1 = require("open");
|
|
9
10
|
const ora_1 = require("ora");
|
|
10
11
|
const prompts_1 = require("prompts");
|
|
@@ -17,7 +18,6 @@ async function publishStylus(secretKey) {
|
|
|
17
18
|
const spinner = (0, ora_1.default)("Checking if this is a Stylus project...").start();
|
|
18
19
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
19
20
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
20
|
-
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
21
21
|
const uri = await buildStylus(spinner, secretKey);
|
|
22
22
|
const url = getUrl(uri, "publish").toString();
|
|
23
23
|
spinner.succeed(`Upload complete, navigate to ${url}`);
|
|
@@ -27,7 +27,6 @@ async function deployStylus(secretKey) {
|
|
|
27
27
|
const spinner = (0, ora_1.default)("Checking if this is a Stylus project...").start();
|
|
28
28
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
29
29
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
30
|
-
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
31
30
|
const uri = await buildStylus(spinner, secretKey);
|
|
32
31
|
const url = getUrl(uri, "deploy").toString();
|
|
33
32
|
spinner.succeed(`Upload complete, navigate to ${url}`);
|
|
@@ -72,23 +71,28 @@ async function buildStylus(spinner, secretKey) {
|
|
|
72
71
|
process.exit(1);
|
|
73
72
|
}
|
|
74
73
|
spinner.succeed("Initcode generated.");
|
|
75
|
-
// Step 3: Run stylus command to generate abi
|
|
74
|
+
// Step 3: Run stylus command to generate abi (plain Solidity, no solc needed)
|
|
76
75
|
spinner.start("Generating ABI...");
|
|
77
|
-
const abiResult = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "export-abi"
|
|
76
|
+
const abiResult = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "export-abi"], {
|
|
78
77
|
encoding: "utf-8",
|
|
79
78
|
});
|
|
80
79
|
if (abiResult.status !== 0) {
|
|
81
80
|
spinner.fail("Failed to generate ABI.");
|
|
82
81
|
process.exit(1);
|
|
83
82
|
}
|
|
84
|
-
const
|
|
85
|
-
if (!
|
|
83
|
+
const solidityOutput = abiResult.stdout.trim();
|
|
84
|
+
if (!solidityOutput) {
|
|
86
85
|
spinner.fail("Failed to generate ABI.");
|
|
87
86
|
process.exit(1);
|
|
88
87
|
}
|
|
88
|
+
const interfaces = parseSolidityInterfaces(solidityOutput);
|
|
89
|
+
if (interfaces.length === 0) {
|
|
90
|
+
spinner.fail("No interfaces found in ABI output.");
|
|
91
|
+
process.exit(1);
|
|
92
|
+
}
|
|
89
93
|
spinner.succeed("ABI generated.");
|
|
90
94
|
// Step 3.5: detect the constructor
|
|
91
|
-
spinner.start("Detecting constructor
|
|
95
|
+
spinner.start("Detecting constructor\u2026");
|
|
92
96
|
const constructorResult = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "constructor"], {
|
|
93
97
|
encoding: "utf-8",
|
|
94
98
|
});
|
|
@@ -96,62 +100,39 @@ async function buildStylus(spinner, secretKey) {
|
|
|
96
100
|
spinner.fail("Failed to get constructor signature.");
|
|
97
101
|
process.exit(1);
|
|
98
102
|
}
|
|
99
|
-
const constructorSigRaw = constructorResult.stdout.trim();
|
|
103
|
+
const constructorSigRaw = constructorResult.stdout.trim();
|
|
100
104
|
spinner.succeed(`Constructor found: ${constructorSigRaw || "none"}`);
|
|
101
105
|
// Step 4: Process the output
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
let selectedContractName;
|
|
105
|
-
let selectedAbiContent;
|
|
106
|
-
if (contractNames.length === 1) {
|
|
107
|
-
selectedContractName = contractNames[0]?.replace(/^I/, "");
|
|
108
|
-
selectedAbiContent = parts[0];
|
|
109
|
-
}
|
|
110
|
-
else {
|
|
106
|
+
let selectedIndex = 0;
|
|
107
|
+
if (interfaces.length > 1) {
|
|
111
108
|
const response = await (0, prompts_1.default)({
|
|
112
|
-
choices:
|
|
113
|
-
title: name,
|
|
109
|
+
choices: interfaces.map((iface, idx) => ({
|
|
110
|
+
title: iface.name,
|
|
114
111
|
value: idx,
|
|
115
112
|
})),
|
|
116
113
|
message: "Select entrypoint:",
|
|
117
114
|
name: "contract",
|
|
118
115
|
type: "select",
|
|
119
116
|
});
|
|
120
|
-
|
|
121
|
-
if (typeof selectedIndex !== "number") {
|
|
117
|
+
if (typeof response.contract !== "number") {
|
|
122
118
|
spinner.fail("No contract selected.");
|
|
123
119
|
process.exit(1);
|
|
124
120
|
}
|
|
125
|
-
|
|
126
|
-
selectedAbiContent = parts[selectedIndex];
|
|
127
|
-
}
|
|
128
|
-
if (!selectedAbiContent) {
|
|
129
|
-
throw new Error("Entrypoint not found");
|
|
130
|
-
}
|
|
131
|
-
if (!selectedContractName) {
|
|
132
|
-
spinner.fail("Error: Could not determine contract name from ABI output.");
|
|
133
|
-
process.exit(1);
|
|
134
|
-
}
|
|
135
|
-
let cleanedAbi = "";
|
|
136
|
-
try {
|
|
137
|
-
const jsonMatch = selectedAbiContent.match(/\[.*\]/s);
|
|
138
|
-
if (jsonMatch) {
|
|
139
|
-
cleanedAbi = jsonMatch[0];
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
throw new Error("No valid JSON ABI found in the file.");
|
|
143
|
-
}
|
|
121
|
+
selectedIndex = response.contract;
|
|
144
122
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
123
|
+
const selectedInterface = interfaces[selectedIndex];
|
|
124
|
+
if (!selectedInterface) {
|
|
125
|
+
spinner.fail("No interface found.");
|
|
148
126
|
process.exit(1);
|
|
149
127
|
}
|
|
150
|
-
|
|
151
|
-
|
|
128
|
+
const selectedContractName = selectedInterface.name.replace(/^I/, "");
|
|
129
|
+
// biome-ignore lint/suspicious/noExplicitAny: ABI is untyped JSON from parseAbiItem
|
|
130
|
+
const abiArray = selectedInterface.abi;
|
|
152
131
|
const constructorAbi = constructorSigToAbi(constructorSigRaw);
|
|
153
|
-
if (constructorAbi &&
|
|
154
|
-
|
|
132
|
+
if (constructorAbi &&
|
|
133
|
+
// biome-ignore lint/suspicious/noExplicitAny: ABI entries have varying shapes
|
|
134
|
+
!abiArray.some((e) => e.type === "constructor")) {
|
|
135
|
+
abiArray.unshift(constructorAbi);
|
|
155
136
|
}
|
|
156
137
|
const metadata = {
|
|
157
138
|
compiler: {},
|
|
@@ -211,10 +192,69 @@ async function buildStylus(spinner, secretKey) {
|
|
|
211
192
|
process.exit(1);
|
|
212
193
|
}
|
|
213
194
|
}
|
|
214
|
-
function
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
195
|
+
function parseSolidityInterfaces(source) {
|
|
196
|
+
const results = [];
|
|
197
|
+
const ifaceRegex = /interface\s+(I?[A-Za-z0-9_]+)\s*\{([\s\S]*?)\n\}/g;
|
|
198
|
+
for (let ifaceMatch = ifaceRegex.exec(source); ifaceMatch !== null; ifaceMatch = ifaceRegex.exec(source)) {
|
|
199
|
+
const name = ifaceMatch[1] ?? "";
|
|
200
|
+
const body = ifaceMatch[2] ?? "";
|
|
201
|
+
const abi = [];
|
|
202
|
+
// Build struct lookup: name -> tuple type string
|
|
203
|
+
const structs = new Map();
|
|
204
|
+
const structRegex = /struct\s+(\w+)\s*\{([^}]*)\}/g;
|
|
205
|
+
for (let structMatch = structRegex.exec(body); structMatch !== null; structMatch = structRegex.exec(body)) {
|
|
206
|
+
const fields = (structMatch[2] ?? "")
|
|
207
|
+
.split(";")
|
|
208
|
+
.map((f) => f.trim())
|
|
209
|
+
.filter(Boolean)
|
|
210
|
+
.map((f) => f.split(/\s+/)[0] ?? "");
|
|
211
|
+
structs.set(structMatch[1] ?? "", `(${fields.join(",")})`);
|
|
212
|
+
}
|
|
213
|
+
// Resolve struct references in a type string (iterative for nested structs)
|
|
214
|
+
const resolveStructs = (sig) => {
|
|
215
|
+
let resolved = sig;
|
|
216
|
+
for (let i = 0; i < 10; i++) {
|
|
217
|
+
let changed = false;
|
|
218
|
+
for (const [sName, sTuple] of structs) {
|
|
219
|
+
const re = new RegExp(`\\b${sName}\\b(\\[\\])?`, "g");
|
|
220
|
+
const next = resolved.replace(re, (_, arr) => `${sTuple}${arr ?? ""}`);
|
|
221
|
+
if (next !== resolved) {
|
|
222
|
+
resolved = next;
|
|
223
|
+
changed = true;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
if (!changed)
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
return resolved;
|
|
230
|
+
};
|
|
231
|
+
// Extract each statement (function/error/event) delimited by ;
|
|
232
|
+
const statements = body
|
|
233
|
+
.split(";")
|
|
234
|
+
.map((s) => s.replace(/\n/g, " ").trim())
|
|
235
|
+
.filter((s) => s.startsWith("function ") ||
|
|
236
|
+
s.startsWith("error ") ||
|
|
237
|
+
s.startsWith("event "));
|
|
238
|
+
for (const stmt of statements) {
|
|
239
|
+
// Strip Solidity qualifiers that abitype doesn't expect
|
|
240
|
+
let cleaned = stmt
|
|
241
|
+
.replace(/\b(external|public|internal|private)\b/g, "")
|
|
242
|
+
.replace(/\b(memory|calldata|storage)\b/g, "")
|
|
243
|
+
.replace(/\s+/g, " ")
|
|
244
|
+
.trim();
|
|
245
|
+
// Resolve struct type names to tuple types
|
|
246
|
+
cleaned = resolveStructs(cleaned);
|
|
247
|
+
try {
|
|
248
|
+
const parsed = (0, abitype_1.parseAbiItem)(cleaned);
|
|
249
|
+
abi.push(parsed);
|
|
250
|
+
}
|
|
251
|
+
catch {
|
|
252
|
+
// Skip unparseable items
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
results.push({ abi, name });
|
|
256
|
+
}
|
|
257
|
+
return results;
|
|
218
258
|
}
|
|
219
259
|
function getUrl(hash, command) {
|
|
220
260
|
const url = new URL(`${THIRDWEB_URL}/contracts/${command}/${encodeURIComponent(hash.replace("ipfs://", ""))}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/builder.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ async function createStylusProject() {
|
|
|
9
9
|
const spinner = (0, ora_1.default)();
|
|
10
10
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
11
11
|
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
12
|
-
(0, check_prerequisites_js_1.checkPrerequisites)(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
13
12
|
// Step 1: Ensure cargo is installed
|
|
14
13
|
const cargoCheck = (0, node_child_process_1.spawnSync)("cargo", ["--version"]);
|
|
15
14
|
if (cargoCheck.status !== 0) {
|
|
@@ -18,7 +17,7 @@ async function createStylusProject() {
|
|
|
18
17
|
}
|
|
19
18
|
// Step 2: Install stylus etc.
|
|
20
19
|
spinner.start("Installing Stylus...");
|
|
21
|
-
const install = (0, node_child_process_1.spawnSync)("cargo", ["install", "
|
|
20
|
+
const install = (0, node_child_process_1.spawnSync)("cargo", ["install", "cargo-stylus"], {
|
|
22
21
|
stdio: "inherit",
|
|
23
22
|
});
|
|
24
23
|
if (install.status !== 0) {
|
|
@@ -26,7 +25,7 @@ async function createStylusProject() {
|
|
|
26
25
|
process.exit(1);
|
|
27
26
|
}
|
|
28
27
|
spinner.succeed("Stylus installed.");
|
|
29
|
-
(0, node_child_process_1.spawnSync)("rustup", ["default", "
|
|
28
|
+
(0, node_child_process_1.spawnSync)("rustup", ["default", "stable"], {
|
|
30
29
|
stdio: "inherit",
|
|
31
30
|
});
|
|
32
31
|
(0, node_child_process_1.spawnSync)("rustup", ["target", "add", "wasm32-unknown-unknown"], {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/create.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/create.ts"],"names":[],"mappings":";;AAKA,kDAsLC;AA3LD,2DAA+C;AAC/C,6BAAsB;AACtB,qCAA8B;AAC9B,qEAA8D;AAEvD,KAAK,UAAU,mBAAmB;IACvC,MAAM,OAAO,GAAG,IAAA,aAAG,GAAE,CAAC;IAEtB,IAAA,2CAAkB,EAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,cAAc,CAAC,CAAC;IACpE,IAAA,2CAAkB,EAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAE7E,oCAAoC;IACpC,MAAM,UAAU,GAAG,IAAA,8BAAS,EAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IACrD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,8BAA8B;IAC9B,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAA,8BAAS,EAAC,OAAO,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE;QAC9D,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAErC,IAAA,8BAAS,EAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;QACzC,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,IAAA,8BAAS,EAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,wBAAwB,CAAC,EAAE;QAC/D,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,6BAA6B;IAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,iBAAO,EAAC;QACpC,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,8BAA8B;IAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,iBAAO,EAAC;QACpC,OAAO,EAAE;YACP,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YACtC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAClC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YACpC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YACtC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE;YAC9C,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,EAAE;YAChD,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,EAAE;YAClD,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE;YAC1C,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE;YACxC,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,YAAY,EAAE;YACrD,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,gBAAgB,EAAE;YAC7D,EAAE,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,aAAa,EAAE;YACvD,EAAE,KAAK,EAAE,0BAA0B,EAAE,KAAK,EAAE,iBAAiB,EAAE;YAC/D,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,cAAc,EAAE;YACzD,EAAE,KAAK,EAAE,2BAA2B,EAAE,KAAK,EAAE,kBAAkB,EAAE;SAClE;QACD,OAAO,EAAE,oBAAoB;QAC7B,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IAEH,6BAA6B;IAC7B,oDAAoD;IACpD,IAAI,UAAU,CAAC;IACf,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,CAAC,KAAK,CAAC,gCAAgC,WAAW,KAAK,CAAC,CAAC;QAChE,UAAU,GAAG,IAAA,8BAAS,EAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE;YAC9D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,2DAA2D,CAAC;QAC5E,OAAO,CAAC,KAAK,CAAC,sCAAsC,WAAW,KAAK,CAAC,CAAC;QACtE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GACX,4DAA4D,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,uCAAuC,WAAW,KAAK,CAAC,CAAC;QACvE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,OAAO,GACX,6DAA6D,CAAC;QAChE,OAAO,CAAC,KAAK,CAAC,wCAAwC,WAAW,KAAK,CAAC,CAAC;QACxE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QACvC,MAAM,OAAO,GACX,mEAAmE,CAAC;QACtE,OAAO,CAAC,KAAK,CACX,8CAA8C,WAAW,KAAK,CAC/D,CAAC;QACF,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;QACxC,MAAM,OAAO,GACX,oEAAoE,CAAC;QACvE,OAAO,CAAC,KAAK,CACX,+CAA+C,WAAW,KAAK,CAChE,CAAC;QACF,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QACzC,MAAM,OAAO,GACX,qEAAqE,CAAC;QACxE,OAAO,CAAC,KAAK,CACX,gDAAgD,WAAW,KAAK,CACjE,CAAC;QACF,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,sDAAsD,CAAC;QACvE,OAAO,CAAC,KAAK,CAAC,0CAA0C,WAAW,KAAK,CAAC,CAAC;QAC1E,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,qDAAqD,CAAC;QACtE,OAAO,CAAC,KAAK,CAAC,yCAAyC,WAAW,KAAK,CAAC,CAAC;QACzE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,2DAA2D,CAAC;QAC5E,OAAO,CAAC,KAAK,CAAC,uCAAuC,WAAW,KAAK,CAAC,CAAC;QACvE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;QAC5C,MAAM,OAAO,GACX,+DAA+D,CAAC;QAClE,OAAO,CAAC,KAAK,CAAC,2CAA2C,WAAW,KAAK,CAAC,CAAC;QAC3E,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QACzC,MAAM,OAAO,GACX,4DAA4D,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,wCAAwC,WAAW,KAAK,CAAC,CAAC;QACxE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,iBAAiB,EAAE,CAAC;QAC7C,MAAM,OAAO,GACX,gEAAgE,CAAC;QACnE,OAAO,CAAC,KAAK,CAAC,4CAA4C,WAAW,KAAK,CAAC,CAAC;QAC5E,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QAC1C,MAAM,OAAO,GACX,6DAA6D,CAAC;QAChE,OAAO,CAAC,KAAK,CAAC,yCAAyC,WAAW,KAAK,CAAC,CAAC;QACzE,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;QAC9C,MAAM,OAAO,GACX,iEAAiE,CAAC;QACpE,OAAO,CAAC,KAAK,CACX,6CAA6C,WAAW,KAAK,CAC9D,CAAC;QACF,UAAU,GAAG,IAAA,8BAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YAC7D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
2
|
import { existsSync, readFileSync } from "node:fs";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
+
import { parseAbiItem } from "abitype";
|
|
4
5
|
import open from "open";
|
|
5
6
|
import ora, {} from "ora";
|
|
6
7
|
import prompts from "prompts";
|
|
@@ -13,7 +14,6 @@ export async function publishStylus(secretKey) {
|
|
|
13
14
|
const spinner = ora("Checking if this is a Stylus project...").start();
|
|
14
15
|
checkPrerequisites(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
15
16
|
checkPrerequisites(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
16
|
-
checkPrerequisites(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
17
17
|
const uri = await buildStylus(spinner, secretKey);
|
|
18
18
|
const url = getUrl(uri, "publish").toString();
|
|
19
19
|
spinner.succeed(`Upload complete, navigate to ${url}`);
|
|
@@ -23,7 +23,6 @@ export async function deployStylus(secretKey) {
|
|
|
23
23
|
const spinner = ora("Checking if this is a Stylus project...").start();
|
|
24
24
|
checkPrerequisites(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
25
25
|
checkPrerequisites(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
26
|
-
checkPrerequisites(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
27
26
|
const uri = await buildStylus(spinner, secretKey);
|
|
28
27
|
const url = getUrl(uri, "deploy").toString();
|
|
29
28
|
spinner.succeed(`Upload complete, navigate to ${url}`);
|
|
@@ -68,23 +67,28 @@ async function buildStylus(spinner, secretKey) {
|
|
|
68
67
|
process.exit(1);
|
|
69
68
|
}
|
|
70
69
|
spinner.succeed("Initcode generated.");
|
|
71
|
-
// Step 3: Run stylus command to generate abi
|
|
70
|
+
// Step 3: Run stylus command to generate abi (plain Solidity, no solc needed)
|
|
72
71
|
spinner.start("Generating ABI...");
|
|
73
|
-
const abiResult = spawnSync("cargo", ["stylus", "export-abi"
|
|
72
|
+
const abiResult = spawnSync("cargo", ["stylus", "export-abi"], {
|
|
74
73
|
encoding: "utf-8",
|
|
75
74
|
});
|
|
76
75
|
if (abiResult.status !== 0) {
|
|
77
76
|
spinner.fail("Failed to generate ABI.");
|
|
78
77
|
process.exit(1);
|
|
79
78
|
}
|
|
80
|
-
const
|
|
81
|
-
if (!
|
|
79
|
+
const solidityOutput = abiResult.stdout.trim();
|
|
80
|
+
if (!solidityOutput) {
|
|
82
81
|
spinner.fail("Failed to generate ABI.");
|
|
83
82
|
process.exit(1);
|
|
84
83
|
}
|
|
84
|
+
const interfaces = parseSolidityInterfaces(solidityOutput);
|
|
85
|
+
if (interfaces.length === 0) {
|
|
86
|
+
spinner.fail("No interfaces found in ABI output.");
|
|
87
|
+
process.exit(1);
|
|
88
|
+
}
|
|
85
89
|
spinner.succeed("ABI generated.");
|
|
86
90
|
// Step 3.5: detect the constructor
|
|
87
|
-
spinner.start("Detecting constructor
|
|
91
|
+
spinner.start("Detecting constructor\u2026");
|
|
88
92
|
const constructorResult = spawnSync("cargo", ["stylus", "constructor"], {
|
|
89
93
|
encoding: "utf-8",
|
|
90
94
|
});
|
|
@@ -92,62 +96,39 @@ async function buildStylus(spinner, secretKey) {
|
|
|
92
96
|
spinner.fail("Failed to get constructor signature.");
|
|
93
97
|
process.exit(1);
|
|
94
98
|
}
|
|
95
|
-
const constructorSigRaw = constructorResult.stdout.trim();
|
|
99
|
+
const constructorSigRaw = constructorResult.stdout.trim();
|
|
96
100
|
spinner.succeed(`Constructor found: ${constructorSigRaw || "none"}`);
|
|
97
101
|
// Step 4: Process the output
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
let selectedContractName;
|
|
101
|
-
let selectedAbiContent;
|
|
102
|
-
if (contractNames.length === 1) {
|
|
103
|
-
selectedContractName = contractNames[0]?.replace(/^I/, "");
|
|
104
|
-
selectedAbiContent = parts[0];
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
102
|
+
let selectedIndex = 0;
|
|
103
|
+
if (interfaces.length > 1) {
|
|
107
104
|
const response = await prompts({
|
|
108
|
-
choices:
|
|
109
|
-
title: name,
|
|
105
|
+
choices: interfaces.map((iface, idx) => ({
|
|
106
|
+
title: iface.name,
|
|
110
107
|
value: idx,
|
|
111
108
|
})),
|
|
112
109
|
message: "Select entrypoint:",
|
|
113
110
|
name: "contract",
|
|
114
111
|
type: "select",
|
|
115
112
|
});
|
|
116
|
-
|
|
117
|
-
if (typeof selectedIndex !== "number") {
|
|
113
|
+
if (typeof response.contract !== "number") {
|
|
118
114
|
spinner.fail("No contract selected.");
|
|
119
115
|
process.exit(1);
|
|
120
116
|
}
|
|
121
|
-
|
|
122
|
-
selectedAbiContent = parts[selectedIndex];
|
|
123
|
-
}
|
|
124
|
-
if (!selectedAbiContent) {
|
|
125
|
-
throw new Error("Entrypoint not found");
|
|
126
|
-
}
|
|
127
|
-
if (!selectedContractName) {
|
|
128
|
-
spinner.fail("Error: Could not determine contract name from ABI output.");
|
|
129
|
-
process.exit(1);
|
|
130
|
-
}
|
|
131
|
-
let cleanedAbi = "";
|
|
132
|
-
try {
|
|
133
|
-
const jsonMatch = selectedAbiContent.match(/\[.*\]/s);
|
|
134
|
-
if (jsonMatch) {
|
|
135
|
-
cleanedAbi = jsonMatch[0];
|
|
136
|
-
}
|
|
137
|
-
else {
|
|
138
|
-
throw new Error("No valid JSON ABI found in the file.");
|
|
139
|
-
}
|
|
117
|
+
selectedIndex = response.contract;
|
|
140
118
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
119
|
+
const selectedInterface = interfaces[selectedIndex];
|
|
120
|
+
if (!selectedInterface) {
|
|
121
|
+
spinner.fail("No interface found.");
|
|
144
122
|
process.exit(1);
|
|
145
123
|
}
|
|
146
|
-
|
|
147
|
-
|
|
124
|
+
const selectedContractName = selectedInterface.name.replace(/^I/, "");
|
|
125
|
+
// biome-ignore lint/suspicious/noExplicitAny: ABI is untyped JSON from parseAbiItem
|
|
126
|
+
const abiArray = selectedInterface.abi;
|
|
148
127
|
const constructorAbi = constructorSigToAbi(constructorSigRaw);
|
|
149
|
-
if (constructorAbi &&
|
|
150
|
-
|
|
128
|
+
if (constructorAbi &&
|
|
129
|
+
// biome-ignore lint/suspicious/noExplicitAny: ABI entries have varying shapes
|
|
130
|
+
!abiArray.some((e) => e.type === "constructor")) {
|
|
131
|
+
abiArray.unshift(constructorAbi);
|
|
151
132
|
}
|
|
152
133
|
const metadata = {
|
|
153
134
|
compiler: {},
|
|
@@ -207,10 +188,69 @@ async function buildStylus(spinner, secretKey) {
|
|
|
207
188
|
process.exit(1);
|
|
208
189
|
}
|
|
209
190
|
}
|
|
210
|
-
function
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
191
|
+
function parseSolidityInterfaces(source) {
|
|
192
|
+
const results = [];
|
|
193
|
+
const ifaceRegex = /interface\s+(I?[A-Za-z0-9_]+)\s*\{([\s\S]*?)\n\}/g;
|
|
194
|
+
for (let ifaceMatch = ifaceRegex.exec(source); ifaceMatch !== null; ifaceMatch = ifaceRegex.exec(source)) {
|
|
195
|
+
const name = ifaceMatch[1] ?? "";
|
|
196
|
+
const body = ifaceMatch[2] ?? "";
|
|
197
|
+
const abi = [];
|
|
198
|
+
// Build struct lookup: name -> tuple type string
|
|
199
|
+
const structs = new Map();
|
|
200
|
+
const structRegex = /struct\s+(\w+)\s*\{([^}]*)\}/g;
|
|
201
|
+
for (let structMatch = structRegex.exec(body); structMatch !== null; structMatch = structRegex.exec(body)) {
|
|
202
|
+
const fields = (structMatch[2] ?? "")
|
|
203
|
+
.split(";")
|
|
204
|
+
.map((f) => f.trim())
|
|
205
|
+
.filter(Boolean)
|
|
206
|
+
.map((f) => f.split(/\s+/)[0] ?? "");
|
|
207
|
+
structs.set(structMatch[1] ?? "", `(${fields.join(",")})`);
|
|
208
|
+
}
|
|
209
|
+
// Resolve struct references in a type string (iterative for nested structs)
|
|
210
|
+
const resolveStructs = (sig) => {
|
|
211
|
+
let resolved = sig;
|
|
212
|
+
for (let i = 0; i < 10; i++) {
|
|
213
|
+
let changed = false;
|
|
214
|
+
for (const [sName, sTuple] of structs) {
|
|
215
|
+
const re = new RegExp(`\\b${sName}\\b(\\[\\])?`, "g");
|
|
216
|
+
const next = resolved.replace(re, (_, arr) => `${sTuple}${arr ?? ""}`);
|
|
217
|
+
if (next !== resolved) {
|
|
218
|
+
resolved = next;
|
|
219
|
+
changed = true;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
if (!changed)
|
|
223
|
+
break;
|
|
224
|
+
}
|
|
225
|
+
return resolved;
|
|
226
|
+
};
|
|
227
|
+
// Extract each statement (function/error/event) delimited by ;
|
|
228
|
+
const statements = body
|
|
229
|
+
.split(";")
|
|
230
|
+
.map((s) => s.replace(/\n/g, " ").trim())
|
|
231
|
+
.filter((s) => s.startsWith("function ") ||
|
|
232
|
+
s.startsWith("error ") ||
|
|
233
|
+
s.startsWith("event "));
|
|
234
|
+
for (const stmt of statements) {
|
|
235
|
+
// Strip Solidity qualifiers that abitype doesn't expect
|
|
236
|
+
let cleaned = stmt
|
|
237
|
+
.replace(/\b(external|public|internal|private)\b/g, "")
|
|
238
|
+
.replace(/\b(memory|calldata|storage)\b/g, "")
|
|
239
|
+
.replace(/\s+/g, " ")
|
|
240
|
+
.trim();
|
|
241
|
+
// Resolve struct type names to tuple types
|
|
242
|
+
cleaned = resolveStructs(cleaned);
|
|
243
|
+
try {
|
|
244
|
+
const parsed = parseAbiItem(cleaned);
|
|
245
|
+
abi.push(parsed);
|
|
246
|
+
}
|
|
247
|
+
catch {
|
|
248
|
+
// Skip unparseable items
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
results.push({ abi, name });
|
|
252
|
+
}
|
|
253
|
+
return results;
|
|
214
254
|
}
|
|
215
255
|
function getUrl(hash, command) {
|
|
216
256
|
const url = new URL(`${THIRDWEB_URL}/contracts/${command}/${encodeURIComponent(hash.replace("ipfs://", ""))}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,EAAE,EAAY,MAAM,KAAK,CAAC;AACpC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,YAAY,GAAG,sBAAsB,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAkB;IACpD,MAAM,OAAO,GAAG,GAAG,CAAC,yCAAyC,CAAC,CAAC,KAAK,EAAE,CAAC;IAEvE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,cAAc,CAAC,CAAC;IACpE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC7E,kBAAkB,CAChB,OAAO,EACP,MAAM,EACN,CAAC,WAAW,CAAC,EACb,0BAA0B,CAC3B,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAElD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9C,OAAO,CAAC,OAAO,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;IACvD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,SAAkB;IACnD,MAAM,OAAO,GAAG,GAAG,CAAC,yCAAyC,CAAC,CAAC,KAAK,EAAE,CAAC;IAEvE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,cAAc,CAAC,CAAC;IACpE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC7E,kBAAkB,CAChB,OAAO,EACP,MAAM,EACN,CAAC,WAAW,CAAC,EACb,0BAA0B,CAC3B,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAElD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,OAAO,CAAC,OAAO,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;IACvD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,OAAY,EAAE,SAAkB;IACzD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,qEAAqE,CACtE,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACH,kCAAkC;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,SAAS,GAAG,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,IAAI,CACV,6DAA6D,CAC9D,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAE5C,kDAAkD;QAClD,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACxC,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE;YACpE,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,QAAQ,GAAG,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAEvC,6CAA6C;QAC7C,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE;YACvE,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElC,mCAAmC;QACnC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACxC,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;YACtE,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QAEH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,oCAAoC;QAC/F,OAAO,CAAC,OAAO,CAAC,sBAAsB,iBAAiB,IAAI,MAAM,EAAE,CAAC,CAAC;QAErE,6BAA6B;QAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,iCAAiC,CAAC,UAAU,CAAC,CAAC;QAEpE,IAAI,oBAAwC,CAAC;QAC7C,IAAI,kBAAsC,CAAC;QAE3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,oBAAoB,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3D,kBAAkB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;gBAC7B,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;oBACzC,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,GAAG;iBACX,CAAC,CAAC;gBACH,OAAO,EAAE,oBAAoB;gBAC7B,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAExC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,oBAAoB,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvE,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,SAAS,EAAE,CAAC;gBACd,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YACzD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,iDAAiD;QACjD,MAAM,QAAQ,GAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAC9D,IAAI,cAAc,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE,CAAC;YACtE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,oCAAoC;QACxE,CAAC;QAED,MAAM,QAAQ,GAAG;YACf,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE;gBACN,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,EAAE;aACZ;YACD,QAAQ,EAAE;gBACR,iBAAiB,EAAE;oBACjB,aAAa,EAAE,oBAAoB;iBACpC;aACF;YACD,OAAO,EAAE,EAAE;SACZ,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QAE1D,yBAAyB;QACzB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,oBAAoB,CAAC;YAClC,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC;YAC/B,MAAM;YACN,KAAK,EAAE,CAAC,QAAQ,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC;YAC/B,MAAM;YACN,KAAK,EAAE,CAAC,QAAQ,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC;YACvB,MAAM;YACN,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,WAAW,EAAE,EAAE;wBACf,OAAO,EAAE,gBAAgB;wBACzB,aAAa,EAAE,oBAAoB;wBACnC,YAAY,EAAE,QAAQ;qBACvB;oBACD,WAAW;oBACX,SAAS,EAAE;wBACT,MAAM,EAAE;4BACN,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE;yBAClE;qBACF;oBACD,WAAW;oBACX,IAAI,EAAE,oBAAoB;iBAC3B;aACF;SACF,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEnC,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;QAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,SAAS,iCAAiC,CAAC,YAAoB;IAC7D,OAAO,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;SAC5D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChB,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,MAAM,CAAC,IAAY,EAAE,OAAe;IAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,GAAG,YAAY,cAAc,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAC1F,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC;QAAE,OAAO,SAAS,CAAC;IAE7D,MAAM,QAAQ,GAAG,GAAG;SACjB,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC;SACjC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;IAEtE,MAAM,MAAM,GACV,QAAQ,KAAK,EAAE;QACb,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC5C,CAAC,CAAC,CAAC;IAET,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACtE,CAAC"}
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ export async function createStylusProject() {
|
|
|
6
6
|
const spinner = ora();
|
|
7
7
|
checkPrerequisites(spinner, "cargo", ["--version"], "Rust (cargo)");
|
|
8
8
|
checkPrerequisites(spinner, "rustc", ["--version"], "Rust compiler (rustc)");
|
|
9
|
-
checkPrerequisites(spinner, "solc", ["--version"], "Solidity compiler (solc)");
|
|
10
9
|
// Step 1: Ensure cargo is installed
|
|
11
10
|
const cargoCheck = spawnSync("cargo", ["--version"]);
|
|
12
11
|
if (cargoCheck.status !== 0) {
|
|
@@ -15,7 +14,7 @@ export async function createStylusProject() {
|
|
|
15
14
|
}
|
|
16
15
|
// Step 2: Install stylus etc.
|
|
17
16
|
spinner.start("Installing Stylus...");
|
|
18
|
-
const install = spawnSync("cargo", ["install", "
|
|
17
|
+
const install = spawnSync("cargo", ["install", "cargo-stylus"], {
|
|
19
18
|
stdio: "inherit",
|
|
20
19
|
});
|
|
21
20
|
if (install.status !== 0) {
|
|
@@ -23,7 +22,7 @@ export async function createStylusProject() {
|
|
|
23
22
|
process.exit(1);
|
|
24
23
|
}
|
|
25
24
|
spinner.succeed("Stylus installed.");
|
|
26
|
-
spawnSync("rustup", ["default", "
|
|
25
|
+
spawnSync("rustup", ["default", "stable"], {
|
|
27
26
|
stdio: "inherit",
|
|
28
27
|
});
|
|
29
28
|
spawnSync("rustup", ["target", "add", "wasm32-unknown-unknown"], {
|