thirdweb 5.93.6 → 5.93.7
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/bin.js +20 -0
- package/dist/cjs/cli/bin.js.map +1 -1
- package/dist/cjs/cli/commands/stylus/builder.js +179 -0
- package/dist/cjs/cli/commands/stylus/builder.js.map +1 -0
- package/dist/cjs/cli/commands/stylus/create.js +49 -0
- package/dist/cjs/cli/commands/stylus/create.js.map +1 -0
- package/dist/cjs/contract/deployment/deploy-deterministic.js +1 -1
- package/dist/cjs/contract/deployment/deploy-deterministic.js.map +1 -1
- package/dist/cjs/contract/deployment/deploy-with-abi.js +34 -11
- package/dist/cjs/contract/deployment/deploy-with-abi.js.map +1 -1
- package/dist/cjs/contract/deployment/utils/bootstrap.js +19 -0
- package/dist/cjs/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/cjs/contract/deployment/utils/infra.js +1 -1
- package/dist/cjs/contract/deployment/utils/infra.js.map +1 -1
- package/dist/cjs/exports/extensions/stylus.js +9 -0
- package/dist/cjs/exports/extensions/stylus.js.map +1 -0
- package/dist/cjs/extensions/prebuilts/deploy-published.js +10 -0
- package/dist/cjs/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/cjs/extensions/stylus/__generated__/IArbWasm/write/activateProgram.js +124 -0
- package/dist/cjs/extensions/stylus/__generated__/IArbWasm/write/activateProgram.js.map +1 -0
- package/dist/cjs/extensions/stylus/write/activateStylusContract.js +71 -0
- package/dist/cjs/extensions/stylus/write/activateStylusContract.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +12 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/cjs/utils/any-evm/compute-deployment-address.js +3 -1
- package/dist/cjs/utils/any-evm/compute-deployment-address.js.map +1 -1
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js +14 -2
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/cjs/utils/any-evm/encode-extra-data-with-uri.js +13 -0
- package/dist/cjs/utils/any-evm/encode-extra-data-with-uri.js.map +1 -0
- package/dist/cjs/version.js +1 -1
- package/dist/esm/cli/bin.js +20 -0
- package/dist/esm/cli/bin.js.map +1 -1
- package/dist/esm/cli/commands/stylus/builder.js +175 -0
- package/dist/esm/cli/commands/stylus/builder.js.map +1 -0
- package/dist/esm/cli/commands/stylus/create.js +46 -0
- package/dist/esm/cli/commands/stylus/create.js.map +1 -0
- package/dist/esm/contract/deployment/deploy-deterministic.js +1 -1
- package/dist/esm/contract/deployment/deploy-deterministic.js.map +1 -1
- package/dist/esm/contract/deployment/deploy-with-abi.js +34 -11
- package/dist/esm/contract/deployment/deploy-with-abi.js.map +1 -1
- package/dist/esm/contract/deployment/utils/bootstrap.js +19 -0
- package/dist/esm/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/esm/contract/deployment/utils/infra.js +1 -1
- package/dist/esm/contract/deployment/utils/infra.js.map +1 -1
- package/dist/esm/exports/extensions/stylus.js +5 -0
- package/dist/esm/exports/extensions/stylus.js.map +1 -0
- package/dist/esm/extensions/prebuilts/deploy-published.js +10 -0
- package/dist/esm/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/esm/extensions/stylus/__generated__/IArbWasm/write/activateProgram.js +117 -0
- package/dist/esm/extensions/stylus/__generated__/IArbWasm/write/activateProgram.js.map +1 -0
- package/dist/esm/extensions/stylus/write/activateStylusContract.js +68 -0
- package/dist/esm/extensions/stylus/write/activateStylusContract.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +12 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/esm/utils/any-evm/compute-deployment-address.js +3 -1
- package/dist/esm/utils/any-evm/compute-deployment-address.js.map +1 -1
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js +14 -2
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/esm/utils/any-evm/encode-extra-data-with-uri.js +10 -0
- package/dist/esm/utils/any-evm/encode-extra-data-with-uri.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/types/cli/commands/stylus/builder.d.ts +3 -0
- package/dist/types/cli/commands/stylus/builder.d.ts.map +1 -0
- package/dist/types/cli/commands/stylus/create.d.ts +2 -0
- package/dist/types/cli/commands/stylus/create.d.ts.map +1 -0
- package/dist/types/contract/deployment/deploy-with-abi.d.ts +3 -0
- package/dist/types/contract/deployment/deploy-with-abi.d.ts.map +1 -1
- package/dist/types/contract/deployment/utils/bootstrap.d.ts.map +1 -1
- package/dist/types/exports/extensions/stylus.d.ts +5 -0
- package/dist/types/exports/extensions/stylus.d.ts.map +1 -0
- package/dist/types/extensions/prebuilts/deploy-published.d.ts.map +1 -1
- package/dist/types/extensions/stylus/__generated__/IArbWasm/write/activateProgram.d.ts +79 -0
- package/dist/types/extensions/stylus/__generated__/IArbWasm/write/activateProgram.d.ts.map +1 -0
- package/dist/types/extensions/stylus/write/activateStylusContract.d.ts +25 -0
- package/dist/types/extensions/stylus/write/activateStylusContract.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/MediaRenderer/MediaRenderer.d.ts +1 -1
- package/dist/types/utils/any-evm/compute-deployment-address.d.ts +1 -0
- package/dist/types/utils/any-evm/compute-deployment-address.d.ts.map +1 -1
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts +7 -3
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts.map +1 -1
- package/dist/types/utils/any-evm/deploy-metadata.d.ts +1 -1
- package/dist/types/utils/any-evm/deploy-metadata.d.ts.map +1 -1
- package/dist/types/utils/any-evm/encode-extra-data-with-uri.d.ts +4 -0
- package/dist/types/utils/any-evm/encode-extra-data-with-uri.d.ts.map +1 -0
- package/dist/types/version.d.ts +1 -1
- package/package.json +6 -1
- package/src/cli/bin.ts +25 -0
- package/src/cli/commands/stylus/builder.ts +201 -0
- package/src/cli/commands/stylus/create.ts +51 -0
- package/src/contract/deployment/deploy-deterministic.ts +1 -1
- package/src/contract/deployment/deploy-with-abi.ts +39 -13
- package/src/contract/deployment/utils/bootstrap.ts +21 -0
- package/src/contract/deployment/utils/infra.ts +1 -1
- package/src/exports/extensions/stylus.ts +7 -0
- package/src/extensions/prebuilts/deploy-published.ts +12 -0
- package/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts +144 -0
- package/src/extensions/stylus/write/activateStylusContract.ts +95 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +13 -1
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx +1 -1
- package/src/utils/any-evm/compute-deployment-address.ts +7 -4
- package/src/utils/any-evm/compute-published-contract-deploy-info.ts +16 -2
- package/src/utils/any-evm/deploy-metadata.ts +1 -1
- package/src/utils/any-evm/encode-extra-data-with-uri.ts +13 -0
- package/src/version.ts +1 -1
package/dist/cjs/cli/bin.js
CHANGED
@@ -3,8 +3,16 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
4
4
|
const cross_spawn_1 = require("cross-spawn");
|
5
5
|
const generate_js_1 = require("./commands/generate/generate.js");
|
6
|
+
const builder_js_1 = require("./commands/stylus/builder.js");
|
7
|
+
const create_js_1 = require("./commands/stylus/create.js");
|
6
8
|
// skip the first two args?
|
7
9
|
const [, , command = "", ...rest] = process.argv;
|
10
|
+
let secretKey;
|
11
|
+
const keyIndex = rest.indexOf("-k");
|
12
|
+
if (keyIndex !== -1 && rest.length > keyIndex + 1) {
|
13
|
+
secretKey = rest[keyIndex + 1];
|
14
|
+
rest.splice(keyIndex, 2);
|
15
|
+
}
|
8
16
|
async function main() {
|
9
17
|
switch (command) {
|
10
18
|
case "generate": {
|
@@ -18,6 +26,18 @@ async function main() {
|
|
18
26
|
}
|
19
27
|
break;
|
20
28
|
}
|
29
|
+
case "publish-stylus": {
|
30
|
+
await (0, builder_js_1.publishStylus)(secretKey);
|
31
|
+
break;
|
32
|
+
}
|
33
|
+
case "deploy-stylus": {
|
34
|
+
await (0, builder_js_1.deployStylus)(secretKey);
|
35
|
+
break;
|
36
|
+
}
|
37
|
+
case "create-stylus": {
|
38
|
+
await (0, create_js_1.createStylusProject)();
|
39
|
+
break;
|
40
|
+
}
|
21
41
|
case "login": {
|
22
42
|
// Not implemented yet
|
23
43
|
console.info("Please instead pass a secret key to the command directly, learn more: https://support.thirdweb.com/troubleshooting-errors/7Y1BqKNvtLdBv5fZkRZZB3/issue-linking-device-on-the-authorization-page-via-thirdweb-cli/cn9LRA3ax7XCP6uxwRYdvx");
|
package/dist/cjs/cli/bin.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../../src/cli/bin.ts"],"names":[],"mappings":";;;AACA,6CAAoC;AACpC,iEAGyC;AACzC,2BAA2B;AAC3B,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;YACnC,IAAI,CAAC,IAAA,8CAAgC,EAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;gBACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAA,sBAAQ,EAAC,mBAAmB,CAAC,CAAC;YACtC,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,sBAAsB;YACtB,OAAO,CAAC,IAAI,CACV,yOAAyO,CAC1O,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM;QACR,CAAC;QAED,OAAO,CAAC,CAAC,CAAC;YACR,6CAA6C;YAC7C,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC7D,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvD,OAAO,CAAC,IAAI,CACV,gOAAgO,CACjO,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEhD,IAAI,MAAM,GAAG,KAAK,CAAC;YAEnB,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS;oBACZ,MAAM,GAAG,SAAS,CAAC;oBACnB,MAAM;YACV,CAAC;YAED,MAAM,IAAI,GAAG,OAAO;gBAClB,CAAC,CAAC,CAAC,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;gBACzD,CAAC,CAAC,CAAC,OAAO,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,CAAC;YAEnD,IAAA,mBAAK,EAAC,MAAM,EAAE,IAAI,EAAE;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC"}
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../../src/cli/bin.ts"],"names":[],"mappings":";;;AACA,6CAAoC;AACpC,iEAGyC;AACzC,6DAA2E;AAC3E,2DAAkE;AAElE,2BAA2B;AAC3B,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AAEjD,IAAI,SAA6B,CAAC;AAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpC,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,QAAQ,GAAG,CAAC,EAAE,CAAC;IAClD,SAAS,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;YACnC,IAAI,CAAC,IAAA,8CAAgC,EAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;gBACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAA,sBAAQ,EAAC,mBAAmB,CAAC,CAAC;YACtC,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACtB,MAAM,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;YAC/B,MAAM;QACR,CAAC;QAED,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,MAAM,IAAA,yBAAY,EAAC,SAAS,CAAC,CAAC;YAC9B,MAAM;QACR,CAAC;QAED,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,MAAM,IAAA,+BAAmB,GAAE,CAAC;YAC5B,MAAM;QACR,CAAC;QAED,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,sBAAsB;YACtB,OAAO,CAAC,IAAI,CACV,yOAAyO,CAC1O,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM;QACR,CAAC;QAED,OAAO,CAAC,CAAC,CAAC;YACR,6CAA6C;YAC7C,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC7D,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvD,OAAO,CAAC,IAAI,CACV,gOAAgO,CACjO,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEhD,IAAI,MAAM,GAAG,KAAK,CAAC;YAEnB,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS;oBACZ,MAAM,GAAG,SAAS,CAAC;oBACnB,MAAM;YACV,CAAC;YAED,MAAM,IAAI,GAAG,OAAO;gBAClB,CAAC,CAAC,CAAC,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;gBACzD,CAAC,CAAC,CAAC,OAAO,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,CAAC;YAEnD,IAAA,mBAAK,EAAC,MAAM,EAAE,IAAI,EAAE;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC"}
|
@@ -0,0 +1,179 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.publishStylus = publishStylus;
|
4
|
+
exports.deployStylus = deployStylus;
|
5
|
+
const node_child_process_1 = require("node:child_process");
|
6
|
+
const node_fs_1 = require("node:fs");
|
7
|
+
const node_path_1 = require("node:path");
|
8
|
+
const open_1 = require("open");
|
9
|
+
const ora_1 = require("ora");
|
10
|
+
const toml_1 = require("toml");
|
11
|
+
const client_js_1 = require("../../../client/client.js");
|
12
|
+
const upload_js_1 = require("../../../storage/upload.js");
|
13
|
+
const THIRDWEB_URL = "https://thirdweb.com";
|
14
|
+
async function publishStylus(secretKey) {
|
15
|
+
const spinner = (0, ora_1.default)("Checking if this is a Stylus project...").start();
|
16
|
+
const uri = await buildStylus(spinner, secretKey);
|
17
|
+
const url = getUrl(uri, "publish").toString();
|
18
|
+
spinner.succeed(`Upload complete, navigate to ${url}`);
|
19
|
+
await (0, open_1.default)(url);
|
20
|
+
}
|
21
|
+
async function deployStylus(secretKey) {
|
22
|
+
const spinner = (0, ora_1.default)("Checking if this is a Stylus project...").start();
|
23
|
+
const uri = await buildStylus(spinner, secretKey);
|
24
|
+
const url = getUrl(uri, "deploy").toString();
|
25
|
+
spinner.succeed(`Upload complete, navigate to ${url}`);
|
26
|
+
await (0, open_1.default)(url);
|
27
|
+
}
|
28
|
+
async function buildStylus(spinner, secretKey) {
|
29
|
+
if (!secretKey) {
|
30
|
+
spinner.fail("Error: Secret key is required.");
|
31
|
+
process.exit(1);
|
32
|
+
}
|
33
|
+
try {
|
34
|
+
// Step 1: Validate stylus project
|
35
|
+
const root = process.cwd();
|
36
|
+
if (!root) {
|
37
|
+
spinner.fail("Error: No package directory found.");
|
38
|
+
process.exit(1);
|
39
|
+
}
|
40
|
+
const cargoTomlPath = (0, node_path_1.join)(root, "Cargo.toml");
|
41
|
+
if (!(0, node_fs_1.existsSync)(cargoTomlPath)) {
|
42
|
+
spinner.fail("Error: No Cargo.toml found. Not a Stylus/Rust project.");
|
43
|
+
process.exit(1);
|
44
|
+
}
|
45
|
+
const cargoToml = (0, node_fs_1.readFileSync)(cargoTomlPath, "utf8");
|
46
|
+
const parsedCargoToml = (0, toml_1.parse)(cargoToml);
|
47
|
+
if (!parsedCargoToml.dependencies?.["stylus-sdk"]) {
|
48
|
+
spinner.fail("Error: Not a Stylus project. Missing stylus-sdk dependency.");
|
49
|
+
process.exit(1);
|
50
|
+
}
|
51
|
+
spinner.succeed("Stylus project detected.");
|
52
|
+
// Step 2: Run stylus command to generate initcode
|
53
|
+
spinner.start("Generating initcode...");
|
54
|
+
const initcodeResult = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "get-initcode"], {
|
55
|
+
encoding: "utf-8",
|
56
|
+
});
|
57
|
+
if (initcodeResult.status !== 0) {
|
58
|
+
spinner.fail("Failed to generate initcode.");
|
59
|
+
process.exit(1);
|
60
|
+
}
|
61
|
+
const initcode = extractBytecode(initcodeResult.stdout);
|
62
|
+
if (!initcode) {
|
63
|
+
spinner.fail("Failed to generate initcode.");
|
64
|
+
process.exit(1);
|
65
|
+
}
|
66
|
+
spinner.succeed("Initcode generated.");
|
67
|
+
// Step 3: Run stylus command to generate abi
|
68
|
+
spinner.start("Generating ABI...");
|
69
|
+
const abiResult = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "export-abi", "--json"], {
|
70
|
+
encoding: "utf-8",
|
71
|
+
});
|
72
|
+
if (abiResult.status !== 0) {
|
73
|
+
spinner.fail("Failed to generate ABI.");
|
74
|
+
process.exit(1);
|
75
|
+
}
|
76
|
+
const abiContent = abiResult.stdout.trim();
|
77
|
+
if (!abiContent) {
|
78
|
+
spinner.fail("Failed to generate ABI.");
|
79
|
+
process.exit(1);
|
80
|
+
}
|
81
|
+
spinner.succeed("ABI generated.");
|
82
|
+
// Step 4: Process the output
|
83
|
+
const contractName = extractContractNameFromExportAbi(abiContent);
|
84
|
+
if (!contractName) {
|
85
|
+
spinner.fail("Error: Could not determine contract name from ABI output.");
|
86
|
+
process.exit(1);
|
87
|
+
}
|
88
|
+
let cleanedAbi = "";
|
89
|
+
try {
|
90
|
+
const jsonMatch = abiContent.match(/\[.*\]/s);
|
91
|
+
if (jsonMatch) {
|
92
|
+
cleanedAbi = jsonMatch[0];
|
93
|
+
}
|
94
|
+
else {
|
95
|
+
throw new Error("No valid JSON ABI found in the file.");
|
96
|
+
}
|
97
|
+
}
|
98
|
+
catch (error) {
|
99
|
+
spinner.fail("Error: ABI file contains invalid format.");
|
100
|
+
console.error(error);
|
101
|
+
process.exit(1);
|
102
|
+
}
|
103
|
+
const metadata = {
|
104
|
+
compiler: {},
|
105
|
+
language: "rust",
|
106
|
+
output: {
|
107
|
+
abi: JSON.parse(cleanedAbi),
|
108
|
+
devdoc: {},
|
109
|
+
userdoc: {},
|
110
|
+
},
|
111
|
+
settings: {
|
112
|
+
compilationTarget: {
|
113
|
+
"src/main.rs": contractName,
|
114
|
+
},
|
115
|
+
},
|
116
|
+
sources: {},
|
117
|
+
};
|
118
|
+
spinner.succeed("Stylus contract exported successfully.");
|
119
|
+
// Step 5: Upload to IPFS
|
120
|
+
spinner.start("Uploading to IPFS...");
|
121
|
+
const client = (0, client_js_1.createThirdwebClient)({
|
122
|
+
secretKey,
|
123
|
+
});
|
124
|
+
const metadataUri = await (0, upload_js_1.upload)({
|
125
|
+
client,
|
126
|
+
files: [metadata],
|
127
|
+
});
|
128
|
+
const bytecodeUri = await (0, upload_js_1.upload)({
|
129
|
+
client,
|
130
|
+
files: [initcode],
|
131
|
+
});
|
132
|
+
const uri = await (0, upload_js_1.upload)({
|
133
|
+
client,
|
134
|
+
files: [
|
135
|
+
{
|
136
|
+
name: contractName,
|
137
|
+
metadataUri,
|
138
|
+
bytecodeUri,
|
139
|
+
analytics: {
|
140
|
+
command: "publish-stylus",
|
141
|
+
contract_name: contractName,
|
142
|
+
cli_version: "",
|
143
|
+
project_type: "stylus",
|
144
|
+
},
|
145
|
+
compilers: {
|
146
|
+
stylus: [
|
147
|
+
{ compilerVersion: "", evmVersion: "", metadataUri, bytecodeUri },
|
148
|
+
],
|
149
|
+
},
|
150
|
+
},
|
151
|
+
],
|
152
|
+
});
|
153
|
+
spinner.succeed("Upload complete");
|
154
|
+
return uri;
|
155
|
+
}
|
156
|
+
catch (error) {
|
157
|
+
spinner.fail(`Error: ${error}`);
|
158
|
+
process.exit(1);
|
159
|
+
}
|
160
|
+
}
|
161
|
+
function extractContractNameFromExportAbi(abiRawOutput) {
|
162
|
+
const match = abiRawOutput.match(/<stdin>:(I[A-Za-z0-9_]+)/);
|
163
|
+
if (match?.[1]) {
|
164
|
+
return match[1].replace(/^I/, "");
|
165
|
+
}
|
166
|
+
return null;
|
167
|
+
}
|
168
|
+
function getUrl(hash, command) {
|
169
|
+
const url = new URL(`${THIRDWEB_URL}/contracts/${command}/${encodeURIComponent(hash.replace("ipfs://", ""))}`);
|
170
|
+
return url;
|
171
|
+
}
|
172
|
+
function extractBytecode(rawOutput) {
|
173
|
+
const hexStart = rawOutput.indexOf("7f000000");
|
174
|
+
if (hexStart === -1) {
|
175
|
+
throw new Error("Could not find start of bytecode");
|
176
|
+
}
|
177
|
+
return rawOutput.slice(hexStart).trim();
|
178
|
+
}
|
179
|
+
//# sourceMappingURL=builder.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/builder.ts"],"names":[],"mappings":";;AAWA,sCAOC;AAED,oCAOC;AA3BD,2DAA+C;AAC/C,qCAAmD;AACnD,yCAAiC;AACjC,+BAAwB;AACxB,6BAAoC;AACpC,+BAA6B;AAC7B,yDAAiE;AACjE,0DAAoD;AAEpD,MAAM,YAAY,GAAG,sBAAsB,CAAC;AAErC,KAAK,UAAU,aAAa,CAAC,SAAkB;IACpD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,yCAAyC,CAAC,CAAC,KAAK,EAAE,CAAC;IACvE,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,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,SAAkB;IACnD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,yCAAyC,CAAC,CAAC,KAAK,EAAE,CAAC;IACvE,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,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,OAAY,EAAE,SAAkB;IACzD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC/C,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,IAAA,gBAAI,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAA,oBAAU,EAAC,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,IAAA,sBAAY,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,eAAe,GAAG,IAAA,YAAK,EAAC,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,IAAA,8BAAS,EAAC,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,IAAA,8BAAS,EAAC,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,6BAA6B;QAC7B,MAAM,YAAY,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;QAClE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,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,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC9C,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,MAAM,QAAQ,GAAG;YACf,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;gBAC3B,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,EAAE;aACZ;YACD,QAAQ,EAAE;gBACR,iBAAiB,EAAE;oBACjB,aAAa,EAAE,YAAY;iBAC5B;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,IAAA,gCAAoB,EAAC;YAClC,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAM,EAAC;YAC/B,MAAM;YACN,KAAK,EAAE,CAAC,QAAQ,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAM,EAAC;YAC/B,MAAM;YACN,KAAK,EAAE,CAAC,QAAQ,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,IAAA,kBAAM,EAAC;YACvB,MAAM;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,YAAY;oBAClB,WAAW;oBACX,WAAW;oBACX,SAAS,EAAE;wBACT,OAAO,EAAE,gBAAgB;wBACzB,aAAa,EAAE,YAAY;wBAC3B,WAAW,EAAE,EAAE;wBACf,YAAY,EAAE,QAAQ;qBACvB;oBACD,SAAS,EAAE;wBACT,MAAM,EAAE;4BACN,EAAE,eAAe,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE;yBAClE;qBACF;iBACF;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,gCAAgC,CAAC,YAAoB;IAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC7D,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,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"}
|
@@ -0,0 +1,49 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.createStylusProject = createStylusProject;
|
4
|
+
const node_child_process_1 = require("node:child_process");
|
5
|
+
const ora_1 = require("ora");
|
6
|
+
const prompts_1 = require("prompts");
|
7
|
+
async function createStylusProject() {
|
8
|
+
const spinner = (0, ora_1.default)();
|
9
|
+
// Step 1: Ensure cargo is installed
|
10
|
+
const cargoCheck = (0, node_child_process_1.spawnSync)("cargo", ["--version"]);
|
11
|
+
if (cargoCheck.status !== 0) {
|
12
|
+
console.error("Error: `cargo` is not installed");
|
13
|
+
process.exit(1);
|
14
|
+
}
|
15
|
+
// Step 2: Install stylus etc.
|
16
|
+
spinner.start("Installing Stylus...");
|
17
|
+
const install = (0, node_child_process_1.spawnSync)("cargo", ["install", "--force", "cargo-stylus"], {
|
18
|
+
stdio: "inherit",
|
19
|
+
});
|
20
|
+
if (install.status !== 0) {
|
21
|
+
spinner.fail("Failed to install Stylus.");
|
22
|
+
process.exit(1);
|
23
|
+
}
|
24
|
+
spinner.succeed("Stylus installed.");
|
25
|
+
(0, node_child_process_1.spawnSync)("rustup", ["default", "1.83"], {
|
26
|
+
stdio: "inherit",
|
27
|
+
});
|
28
|
+
(0, node_child_process_1.spawnSync)("rustup", ["target", "add", "wasm32-unknown-unknown"], {
|
29
|
+
stdio: "inherit",
|
30
|
+
});
|
31
|
+
// Step 3: Create the project
|
32
|
+
const { projectName } = await (0, prompts_1.default)({
|
33
|
+
type: "text",
|
34
|
+
name: "projectName",
|
35
|
+
message: "Project name:",
|
36
|
+
initial: "my-stylus-project",
|
37
|
+
});
|
38
|
+
spinner.start(`Creating new Stylus project: ${projectName}...`);
|
39
|
+
const newProject = (0, node_child_process_1.spawnSync)("cargo", ["stylus", "new", projectName], {
|
40
|
+
stdio: "inherit",
|
41
|
+
});
|
42
|
+
if (newProject.status !== 0) {
|
43
|
+
spinner.fail("Failed to create Stylus project.");
|
44
|
+
process.exit(1);
|
45
|
+
}
|
46
|
+
spinner.succeed("Project created successfully.");
|
47
|
+
console.log(`\n✅ Done! cd into your project: ${projectName}`);
|
48
|
+
}
|
49
|
+
//# sourceMappingURL=create.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/cli/commands/stylus/create.ts"],"names":[],"mappings":";;AAIA,kDA8CC;AAlDD,2DAA+C;AAC/C,6BAAsB;AACtB,qCAA8B;AAEvB,KAAK,UAAU,mBAAmB;IACvC,MAAM,OAAO,GAAG,IAAA,aAAG,GAAE,CAAC;IAEtB,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,SAAS,EAAE,cAAc,CAAC,EAAE;QACzE,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,MAAM,CAAC,EAAE;QACvC,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,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,mBAAmB;KAC7B,CAAC,CAAC;IACH,OAAO,CAAC,KAAK,CAAC,gCAAgC,WAAW,KAAK,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,IAAA,8BAAS,EAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE;QACpE,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAEjD,OAAO,CAAC,GAAG,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;AAChE,CAAC"}
|
@@ -35,7 +35,7 @@ function prepareDeterministicDeployTransaction(options) {
|
|
35
35
|
}),
|
36
36
|
data: async () => {
|
37
37
|
const infraContractInfo = await (0, compute_published_contract_deploy_info_js_1.computeDeploymentInfoFromContractId)(options);
|
38
|
-
return infraContractInfo.
|
38
|
+
return infraContractInfo.initCalldata;
|
39
39
|
},
|
40
40
|
});
|
41
41
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deploy-deterministic.js","sourceRoot":"","sources":["../../../../src/contract/deployment/deploy-deterministic.ts"],"names":[],"mappings":";;AAuCA,sFAkBC;AAzDD,qFAA8E;AAC9E,6HAAoH;AAGpH,qEAA2E;AAe3E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,qCAAqC,CACnD,OAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAClC,OAAO,IAAA,2CAAkB,EAAC;QACxB,MAAM;QACN,KAAK;QACL,EAAE,EAAE,GAAG,EAAE,CACP,IAAA,kDAA4B,EAAC;YAC3B,MAAM;YACN,KAAK;SACN,CAAC;QACJ,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,iBAAiB,GACrB,MAAM,IAAA,+EAAmC,EAAC,OAAO,CAAC,CAAC;YACrD,OAAO,iBAAiB,CAAC,
|
1
|
+
{"version":3,"file":"deploy-deterministic.js","sourceRoot":"","sources":["../../../../src/contract/deployment/deploy-deterministic.ts"],"names":[],"mappings":";;AAuCA,sFAkBC;AAzDD,qFAA8E;AAC9E,6HAAoH;AAGpH,qEAA2E;AAe3E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,qCAAqC,CACnD,OAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAClC,OAAO,IAAA,2CAAkB,EAAC;QACxB,MAAM;QACN,KAAK;QACL,EAAE,EAAE,GAAG,EAAE,CACP,IAAA,kDAA4B,EAAC;YAC3B,MAAM;YACN,KAAK;SACN,CAAC;QACJ,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,iBAAiB,GACrB,MAAM,IAAA,+EAAmC,EAAC,OAAO,CAAC,CAAC;YACrD,OAAO,iBAAiB,CAAC,YAAY,CAAC;QACxC,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
@@ -2,7 +2,9 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.prepareDirectDeployTransaction = prepareDirectDeployTransaction;
|
4
4
|
exports.deployContract = deployContract;
|
5
|
+
const activateStylusContract_js_1 = require("../../extensions/stylus/write/activateStylusContract.js");
|
5
6
|
const send_and_confirm_transaction_js_1 = require("../../transaction/actions/send-and-confirm-transaction.js");
|
7
|
+
const send_transaction_js_1 = require("../../transaction/actions/send-transaction.js");
|
6
8
|
const prepare_transaction_js_1 = require("../../transaction/prepare-transaction.js");
|
7
9
|
const encodeAbiParameters_js_1 = require("../../utils/abi/encodeAbiParameters.js");
|
8
10
|
const normalizeFunctionParams_js_1 = require("../../utils/abi/normalizeFunctionParams.js");
|
@@ -52,6 +54,7 @@ function prepareDirectDeployTransaction(options) {
|
|
52
54
|
bytecode,
|
53
55
|
(0, encodeAbiParameters_js_1.encodeAbiParameters)(constructorAbi?.inputs || [], // Leave an empty array if there's no constructor
|
54
56
|
(0, normalizeFunctionParams_js_1.normalizeFunctionParams)(constructorAbi, options.constructorParams)),
|
57
|
+
options.extraDataWithUri || "0x",
|
55
58
|
]),
|
56
59
|
});
|
57
60
|
}
|
@@ -110,14 +113,16 @@ async function deployContract(options) {
|
|
110
113
|
salt: options.salt,
|
111
114
|
});
|
112
115
|
}
|
116
|
+
let address;
|
113
117
|
if (options.salt !== undefined) {
|
114
118
|
// Deploy with CREATE2 if salt is provided
|
115
119
|
const info = await (0, compute_published_contract_deploy_info_js_1.computeDeploymentInfoFromBytecode)(options);
|
116
|
-
|
120
|
+
address = (0, compute_deployment_address_js_1.computeDeploymentAddress)({
|
117
121
|
bytecode: options.bytecode,
|
118
122
|
encodedArgs: info.encodedArgs,
|
119
123
|
create2FactoryAddress: info.create2FactoryAddress,
|
120
124
|
salt: options.salt,
|
125
|
+
extraDataWithUri: options.extraDataWithUri,
|
121
126
|
});
|
122
127
|
const isDeployed = await (0, is_contract_deployed_js_1.isContractDeployed)((0, contract_js_1.getContract)({
|
123
128
|
client: options.client,
|
@@ -133,19 +138,37 @@ async function deployContract(options) {
|
|
133
138
|
chain: options.chain,
|
134
139
|
client: options.client,
|
135
140
|
to: info.create2FactoryAddress,
|
136
|
-
data: info.
|
141
|
+
data: info.initCalldata,
|
137
142
|
}),
|
138
143
|
});
|
139
|
-
return address;
|
140
144
|
}
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
145
|
+
else {
|
146
|
+
const deployTx = prepareDirectDeployTransaction(options);
|
147
|
+
const receipt = await (0, send_and_confirm_transaction_js_1.sendAndConfirmTransaction)({
|
148
|
+
account: options.account,
|
149
|
+
transaction: deployTx,
|
150
|
+
});
|
151
|
+
address = receipt.contractAddress;
|
152
|
+
if (!address) {
|
153
|
+
throw new Error(`Could not find deployed contract address in transaction: ${receipt.transactionHash}`);
|
154
|
+
}
|
155
|
+
}
|
156
|
+
if (options.isStylus) {
|
157
|
+
try {
|
158
|
+
const activationTransaction = await (0, activateStylusContract_js_1.activateStylusContract)({
|
159
|
+
chain: options.chain,
|
160
|
+
client: options.client,
|
161
|
+
contractAddress: address,
|
162
|
+
});
|
163
|
+
await (0, send_transaction_js_1.sendTransaction)({
|
164
|
+
transaction: activationTransaction,
|
165
|
+
account: options.account,
|
166
|
+
});
|
167
|
+
}
|
168
|
+
catch {
|
169
|
+
console.error("Error: Contract could not be activated.");
|
170
|
+
}
|
148
171
|
}
|
149
|
-
return
|
172
|
+
return address;
|
150
173
|
}
|
151
174
|
//# sourceMappingURL=deploy-with-abi.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deploy-with-abi.js","sourceRoot":"","sources":["../../../../src/contract/deployment/deploy-with-abi.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"deploy-with-abi.js","sourceRoot":"","sources":["../../../../src/contract/deployment/deploy-with-abi.ts"],"names":[],"mappings":"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"}
|
@@ -5,7 +5,9 @@ exports.deployCloneFactory = deployCloneFactory;
|
|
5
5
|
exports.deployImplementation = deployImplementation;
|
6
6
|
exports.getOrDeployInfraContract = getOrDeployInfraContract;
|
7
7
|
exports.getOrDeployInfraContractFromMetadata = getOrDeployInfraContractFromMetadata;
|
8
|
+
const activateStylusContract_js_1 = require("../../../extensions/stylus/write/activateStylusContract.js");
|
8
9
|
const send_and_confirm_transaction_js_1 = require("../../../transaction/actions/send-and-confirm-transaction.js");
|
10
|
+
const send_transaction_js_1 = require("../../../transaction/actions/send-transaction.js");
|
9
11
|
const deploy_metadata_js_1 = require("../../../utils/any-evm/deploy-metadata.js");
|
10
12
|
const isZkSyncChain_js_1 = require("../../../utils/any-evm/zksync/isZkSyncChain.js");
|
11
13
|
const contract_js_1 = require("../../contract.js");
|
@@ -191,6 +193,23 @@ async function getOrDeployInfraContractFromMetadata(options) {
|
|
191
193
|
if (!deployedInfraContract) {
|
192
194
|
throw new Error(`Failed to deploy ${options.contractMetadata.name}`);
|
193
195
|
}
|
196
|
+
const isStylus = options.contractMetadata.metadata.language === "rust";
|
197
|
+
if (isStylus) {
|
198
|
+
try {
|
199
|
+
const activationTransaction = await (0, activateStylusContract_js_1.activateStylusContract)({
|
200
|
+
chain: options.chain,
|
201
|
+
client: options.client,
|
202
|
+
contractAddress: deployedInfraContract.address,
|
203
|
+
});
|
204
|
+
await (0, send_transaction_js_1.sendTransaction)({
|
205
|
+
transaction: activationTransaction,
|
206
|
+
account: options.account,
|
207
|
+
});
|
208
|
+
}
|
209
|
+
catch {
|
210
|
+
console.error("Error: Contract could not be activated.");
|
211
|
+
}
|
212
|
+
}
|
194
213
|
return deployedInfraContract;
|
195
214
|
}
|
196
215
|
//# sourceMappingURL=bootstrap.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":";;AA4CA,oFA2GC;AAMD,gDAmBC;AAMD,oDAeC;AAMD,4DAiCC;AAED,oFAyCC;AAvRD,0GAAoG;AACpG,kHAAyG;AACzG,0FAAmF;AACnF,kFAGmD;AACnD,qFAA+E;AAE/E,mDAAuE;AACvE,kDAAiE;AACjE,qEAGsC;AACtC,mFAA6E;AAC7E,iFAAmF;AACnF,yDAAqE;AACrE,+DAG+B;AAC/B,yCAKoB;AAEpB;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,oCAAoC,CACxD,IAKC;IAKD,MAAM,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,UAAU,EACV,iBAAiB,EACjB,SAAS,EACT,OAAO,GACR,GAAG,IAAI,CAAC;IAET,IAAI,MAAM,IAAA,gCAAa,EAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,oBAAoB,GAAG,MAAM,IAAA,kDAAsB,EAAC;YACxD,KAAK;YACL,MAAM;YACN,OAAO;SACR,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;YAC5D,MAAM;YACN,UAAU;YACV,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,2CAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/D,IAAI,sBAA0C,CAAC;QAE/C,IAAI,qBAAqB,EAAE,CAAC;YAC1B,sBAAsB,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,sBAAsB,GAAG,MAAM,IAAA,wDAA6B,EAAC;gBAC3D,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,GAAG,EAAE,gBAAgB,CAAC,GAAG;gBACzB,QAAQ,EAAE,MAAM,IAAA,sDAAiC,EAAC;oBAChD,gBAAgB;oBAChB,MAAM;oBACN,KAAK;iBACN,CAAC;gBACF,MAAM,EAAE,iBAAiB;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,oBAAoB,EAAE,IAAA,yBAAW,EAAC;gBAChC,OAAO,EAAE,oBAAoB;gBAC7B,KAAK;gBACL,MAAM;aACP,CAAC;YACF,sBAAsB,EAAE,IAAA,yBAAW,EAAC;gBAClC,OAAO,EAAE,sBAAsB;gBAC/B,KAAK;gBACL,MAAM;aACP,CAAC;SACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrE,IAAA,kDAA+B,EAAC;YAC9B,KAAK;YACL,MAAM;SACP,CAAC;QACF,IAAA,mCAAwB,EAAC;YACvB,KAAK;YACL,MAAM;YACN,UAAU;YACV,iBAAiB;YACjB,SAAS;YACT,OAAO;SACR,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,sBAAsB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACrD,6DAA6D;QAC7D,oBAAoB,GAAG,MAAM,kBAAkB,CAAC;YAC9C,MAAM;YACN,KAAK;YACL,OAAO;SACR,CAAC,CAAC;QACH,sBAAsB,GAAG,MAAM,oBAAoB,CAAC;YAClD,MAAM;YACN,KAAK;YACL,OAAO;YACP,UAAU;YACV,iBAAiB;YACjB,SAAS;YACT,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,oBAAoB;QACpB,sBAAsB;KACvB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAiC;IACxE,kBAAkB;IAClB,MAAM,cAAc,GAAG,MAAM,IAAA,+CAAyB,EAAC,OAAO,CAAC,CAAC;IAChE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAA,0CAAoB,EAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,YAAY;IACZ,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC;QAC/C,GAAG,OAAO;QACV,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,gBAAgB;IAChB,OAAO,wBAAwB,CAAC;QAC9B,GAAG,OAAO;QACV,UAAU,EAAE,gBAAgB;QAC5B,iBAAiB,EAAE,EAAE,iBAAiB,EAAE,SAAS,CAAC,OAAO,EAAE;KAC5D,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB,CACxC,OAKC;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,OAAO;QACV,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAC5C,OAKC;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,IAAI,CAAC,MAAM,IAAA,gCAAa,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG,gCAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE3C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAA,yBAAW,EAAC;gBACjB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,oCAAoC,CAAC;QAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,oCAAoC,CACxD,OAGC;IAED,MAAM,aAAa,GAAG,MAAM,IAAA,+CAAoC,EAAC,OAAO,CAAC,CAAC;IAC1E,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,MAAM,WAAW,GACf,IAAA,4DAAiD,EAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,IAAA,2DAAyB,EAAC;QAC9B,WAAW;QACX,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,MAAM,qBAAqB,GACzB,MAAM,IAAA,+CAAoC,EAAC,OAAO,CAAC,CAAC;IACtD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,KAAK,MAAM,CAAC;IACvE,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC;YACH,MAAM,qBAAqB,GAAG,MAAM,IAAA,kDAAsB,EAAC;gBACzD,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe,EAAE,qBAAqB,CAAC,OAAO;aAC/C,CAAC,CAAC;YAEH,MAAM,IAAA,qCAAe,EAAC;gBACpB,WAAW,EAAE,qBAAqB;gBAClC,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC"}
|
@@ -65,7 +65,7 @@ function prepareInfraContractDeployTransactionFromMetadata(options) {
|
|
65
65
|
}),
|
66
66
|
data: async () => {
|
67
67
|
const infraContractInfo = await (0, compute_published_contract_deploy_info_js_1.computeDeploymentInfoFromMetadata)(options);
|
68
|
-
return infraContractInfo.
|
68
|
+
return infraContractInfo.initCalldata;
|
69
69
|
},
|
70
70
|
});
|
71
71
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"infra.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/infra.ts"],"names":[],"mappings":";;AA0CA,4DAeC;AAKD,oFAgBC;AAKD,8GAsBC;AAvGD,wFAAiF;AACjF,wHAAsG;AACtG,gIAAqH;AAErH,6FAAqF;AAGrF,mDAAuE;AACvE,kDAAiE;AACjE,+DAAqE;AAkBrE;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,wBAAwB,CAC5C,OAA+B;IAE/B,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,oCAAoC,CAAC;QAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,gBAAgB;QAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,oCAAoC,CAAC,OAM1D;IACC,MAAM,OAAO,GAAG,MAAM,IAAA,8DAAsB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC;QAC1B,GAAG,OAAO;QACV,OAAO;KACR,CAAC,CAAC;IACH,IAAI,MAAM,IAAA,4CAAkB,EAAC,OAAO,CAAC,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,iDAAiD,CAAC,OAMjE;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAClC,OAAO,IAAA,2CAAkB,EAAC;QACxB,MAAM;QACN,KAAK;QACL,EAAE,EAAE,GAAG,EAAE,CACP,IAAA,kDAA4B,EAAC;YAC3B,MAAM;YACN,KAAK;SACN,CAAC;QACJ,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,iBAAiB,GACrB,MAAM,IAAA,6EAAiC,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,iBAAiB,CAAC,
|
1
|
+
{"version":3,"file":"infra.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/infra.ts"],"names":[],"mappings":";;AA0CA,4DAeC;AAKD,oFAgBC;AAKD,8GAsBC;AAvGD,wFAAiF;AACjF,wHAAsG;AACtG,gIAAqH;AAErH,6FAAqF;AAGrF,mDAAuE;AACvE,kDAAiE;AACjE,+DAAqE;AAkBrE;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,wBAAwB,CAC5C,OAA+B;IAE/B,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,oCAAoC,CAAC;QAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,gBAAgB;QAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,oCAAoC,CAAC,OAM1D;IACC,MAAM,OAAO,GAAG,MAAM,IAAA,8DAAsB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC;QAC1B,GAAG,OAAO;QACV,OAAO;KACR,CAAC,CAAC;IACH,IAAI,MAAM,IAAA,4CAAkB,EAAC,OAAO,CAAC,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,iDAAiD,CAAC,OAMjE;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAClC,OAAO,IAAA,2CAAkB,EAAC;QACxB,MAAM;QACN,KAAK;QACL,EAAE,EAAE,GAAG,EAAE,CACP,IAAA,kDAA4B,EAAC;YAC3B,MAAM;YACN,KAAK;SACN,CAAC;QACJ,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,iBAAiB,GACrB,MAAM,IAAA,6EAAiC,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,iBAAiB,CAAC,YAAY,CAAC;QACxC,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.activateStylusContract = void 0;
|
4
|
+
/**
|
5
|
+
* Write
|
6
|
+
*/
|
7
|
+
var activateStylusContract_js_1 = require("../../extensions/stylus/write/activateStylusContract.js");
|
8
|
+
Object.defineProperty(exports, "activateStylusContract", { enumerable: true, get: function () { return activateStylusContract_js_1.activateStylusContract; } });
|
9
|
+
//# sourceMappingURL=stylus.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"stylus.js","sourceRoot":"","sources":["../../../../src/exports/extensions/stylus.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,qGAGiE;AAF/D,mIAAA,sBAAsB,OAAA"}
|
@@ -14,6 +14,7 @@ const encodeAbiParameters_js_1 = require("../../utils/abi/encodeAbiParameters.js
|
|
14
14
|
const normalizeFunctionParams_js_1 = require("../../utils/abi/normalizeFunctionParams.js");
|
15
15
|
const address_js_1 = require("../../utils/address.js");
|
16
16
|
const deploy_metadata_js_1 = require("../../utils/any-evm/deploy-metadata.js");
|
17
|
+
const encode_extra_data_with_uri_js_1 = require("../../utils/any-evm/encode-extra-data-with-uri.js");
|
17
18
|
const get_required_transactions_js_1 = require("./get-required-transactions.js");
|
18
19
|
const process_ref_deployments_js_1 = require("./process-ref-deployments.js");
|
19
20
|
/**
|
@@ -116,6 +117,7 @@ async function deployContractfromDeployMetadata(options) {
|
|
116
117
|
compilerMetadata: deployMetadata,
|
117
118
|
contractParams: processedInitializeParams,
|
118
119
|
salt,
|
120
|
+
metadataUri: deployMetadata.metadataUri,
|
119
121
|
});
|
120
122
|
}
|
121
123
|
case "autoFactory": {
|
@@ -227,6 +229,7 @@ async function deployContractfromDeployMetadata(options) {
|
|
227
229
|
compilerMetadata: deployMetadata,
|
228
230
|
contractParams: processedInitializeParams,
|
229
231
|
salt,
|
232
|
+
metadataUri: deployMetadata.metadataUri,
|
230
233
|
});
|
231
234
|
}
|
232
235
|
default:
|
@@ -237,6 +240,7 @@ async function deployContractfromDeployMetadata(options) {
|
|
237
240
|
async function directDeploy(options) {
|
238
241
|
const { account, client, chain, compilerMetadata, contractParams, salt } = options;
|
239
242
|
const { deployContract } = await Promise.resolve().then(() => require("../../contract/deployment/deploy-with-abi.js"));
|
243
|
+
const isStylus = options.compilerMetadata.metadata.language === "rust";
|
240
244
|
return deployContract({
|
241
245
|
account,
|
242
246
|
client,
|
@@ -249,6 +253,12 @@ async function directDeploy(options) {
|
|
249
253
|
abi: compilerMetadata.abi,
|
250
254
|
constructorParams: contractParams,
|
251
255
|
salt,
|
256
|
+
extraDataWithUri: isStylus && options.metadataUri
|
257
|
+
? (0, encode_extra_data_with_uri_js_1.encodeExtraDataWithUri)({
|
258
|
+
metadataUri: options.metadataUri,
|
259
|
+
})
|
260
|
+
: undefined,
|
261
|
+
isStylus,
|
252
262
|
});
|
253
263
|
}
|
254
264
|
/**
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":"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"}
|