@dcl/sdk-commands 7.3.3-5646145952.commit-4abe944 → 7.3.3-5656411441.commit-2022de2
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/commands/deploy/index.js +7 -8
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/deploy/linker-dapp/routes.js +1 -1
- package/dist/commands/deploy/linker-dapp/routes.js.map +1 -1
- package/dist/commands/deploy/utils.d.ts +5 -2
- package/dist/commands/deploy/utils.js +24 -3
- package/dist/commands/deploy/utils.js.map +1 -1
- package/dist/logic/catalyst-requests.d.ts +1 -1
- package/package.json +7 -6
|
@@ -8,7 +8,6 @@ const path_1 = require("path");
|
|
|
8
8
|
const schemas_1 = require("@dcl/schemas");
|
|
9
9
|
const crypto_1 = require("@dcl/crypto");
|
|
10
10
|
const dcl_catalyst_client_1 = require("dcl-catalyst-client");
|
|
11
|
-
const schemas_2 = require("dcl-catalyst-client/node_modules/@dcl/schemas");
|
|
12
11
|
const scene_validations_1 = require("../../logic/scene-validations");
|
|
13
12
|
const args_1 = require("../../logic/args");
|
|
14
13
|
const error_1 = require("../../logic/error");
|
|
@@ -93,7 +92,7 @@ async function main(options) {
|
|
|
93
92
|
(0, scene_validations_1.validateFilesSizes)(files);
|
|
94
93
|
const contentFiles = new Map(files.map((file) => [file.path, file.content]));
|
|
95
94
|
const { entityId, files: entityFiles } = await dcl_catalyst_client_1.DeploymentBuilder.buildEntity({
|
|
96
|
-
type:
|
|
95
|
+
type: schemas_1.EntityType.SCENE,
|
|
97
96
|
pointers: sceneJson.scene.parcels,
|
|
98
97
|
files: contentFiles,
|
|
99
98
|
metadata: sceneJson
|
|
@@ -120,19 +119,19 @@ async function main(options) {
|
|
|
120
119
|
const { address, signature, chainId } = linkerResponse;
|
|
121
120
|
const authChain = crypto_1.Authenticator.createSimpleAuthChain(entityId, address, signature);
|
|
122
121
|
// Uploading data
|
|
123
|
-
const
|
|
124
|
-
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, `Uploading data to: ${
|
|
122
|
+
const { client, url } = await (0, utils_1.getCatalyst)(options.args['--target'], options.args['--target-content']);
|
|
123
|
+
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, `Uploading data to: ${url}...`);
|
|
125
124
|
const deployData = { entityId, files: entityFiles, authChain };
|
|
126
125
|
const position = sceneJson.scene.base;
|
|
127
|
-
const network = chainId === schemas_1.ChainId.
|
|
126
|
+
const network = chainId === schemas_1.ChainId.ETHEREUM_SEPOLIA ? 'sepolia' : 'mainnet';
|
|
128
127
|
const worldRealm = isWorld && `realm=${sceneJson.worldConfiguration?.name}`;
|
|
129
128
|
const sceneUrl = `https://play.decentraland.org/?NETWORK=${network}&position=${position}&${worldRealm}`;
|
|
130
129
|
try {
|
|
131
130
|
options.components.logger.info(`Address: ${linkerResponse.address}`);
|
|
132
131
|
options.components.logger.info(`Signature: ${linkerResponse.signature}`);
|
|
133
132
|
options.components.logger.info(`Network: ${(0, schemas_1.getChainName)(linkerResponse.chainId)}`);
|
|
134
|
-
const response = (await
|
|
135
|
-
timeout:
|
|
133
|
+
const response = (await client.deploy(deployData, {
|
|
134
|
+
timeout: 600000
|
|
136
135
|
}));
|
|
137
136
|
if (response.message) {
|
|
138
137
|
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, response.message);
|
|
@@ -141,7 +140,7 @@ async function main(options) {
|
|
|
141
140
|
options.components.analytics.track('Scene deploy success', {
|
|
142
141
|
...trackProps,
|
|
143
142
|
sceneId: entityId,
|
|
144
|
-
targetContentServer:
|
|
143
|
+
targetContentServer: url,
|
|
145
144
|
worldName: sceneJson.worldConfiguration?.name,
|
|
146
145
|
isPortableExperience: !!sceneJson.isPortableExperience,
|
|
147
146
|
dependencies
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ function setRoutes(components, awaitResponse, files, sceneInfo, linkerCallback)
|
|
|
52
52
|
const { x, y } = (0, coordinates_1.getObject)(sceneInfo.baseParcel);
|
|
53
53
|
const pointer = `${x},${y}`;
|
|
54
54
|
const chainId = linkerResponse?.chainId || 1;
|
|
55
|
-
const network = chainId === schemas_1.ChainId.ETHEREUM_MAINNET ? 'mainnet' : '
|
|
55
|
+
const network = chainId === schemas_1.ChainId.ETHEREUM_MAINNET ? 'mainnet' : 'sepolia';
|
|
56
56
|
const value = await (0, catalyst_requests_1.getPointers)(components, pointer, network);
|
|
57
57
|
const deployedToAll = new Set(value.map((c) => c.entityId)).size === 1;
|
|
58
58
|
// Deployed to every catalyst, close the linker dapp and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/commands/deploy/linker-dapp/routes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/commands/deploy/linker-dapp/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { Scene } from '@dcl/schemas';
|
|
2
2
|
import { Lifecycle } from '@well-known-components/interfaces';
|
|
3
|
-
import {
|
|
3
|
+
import { ContentClient } from 'dcl-catalyst-client';
|
|
4
4
|
import { CliComponents } from '../../components';
|
|
5
5
|
import { IFile } from '../../logic/scene-validations';
|
|
6
6
|
import { LinkerResponse } from './linker-dapp/api';
|
|
7
7
|
import { IFuture } from 'fp-future';
|
|
8
|
-
export declare function getCatalyst(target?: string, targetContent?: string): Promise<
|
|
8
|
+
export declare function getCatalyst(target?: string, targetContent?: string): Promise<{
|
|
9
|
+
client: ContentClient;
|
|
10
|
+
url: string;
|
|
11
|
+
}>;
|
|
9
12
|
interface LinkOptions {
|
|
10
13
|
openBrowser: boolean;
|
|
11
14
|
linkerPort?: number;
|
|
@@ -2,18 +2,39 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sceneHasWorldCfg = exports.getAddressAndSignature = exports.getCatalyst = void 0;
|
|
4
4
|
const dcl_catalyst_client_1 = require("dcl-catalyst-client");
|
|
5
|
+
const contracts_snapshots_1 = require("dcl-catalyst-client/dist/contracts-snapshots");
|
|
6
|
+
const fetch_component_1 = require("@well-known-components/fetch-component");
|
|
5
7
|
const eth_connect_1 = require("eth-connect");
|
|
6
8
|
const crypto_1 = require("@dcl/crypto/dist/crypto");
|
|
7
9
|
const api_1 = require("./linker-dapp/api");
|
|
8
10
|
const account_1 = require("../../logic/account");
|
|
9
11
|
async function getCatalyst(target, targetContent) {
|
|
10
12
|
if (target) {
|
|
11
|
-
|
|
13
|
+
const catalyst = (0, dcl_catalyst_client_1.createCatalystClient)({
|
|
14
|
+
url: target.endsWith('/') ? target.slice(0, -1) : target,
|
|
15
|
+
fetcher: (0, fetch_component_1.createFetchComponent)()
|
|
16
|
+
});
|
|
17
|
+
const content = await catalyst.getContentClient();
|
|
18
|
+
const { lambdas: { publicUrl } } = await catalyst.fetchAbout();
|
|
19
|
+
return { client: content, url: publicUrl };
|
|
12
20
|
}
|
|
13
21
|
if (targetContent) {
|
|
14
|
-
return
|
|
22
|
+
return { client: (0, dcl_catalyst_client_1.createContentClient)({ url: targetContent, fetcher: (0, fetch_component_1.createFetchComponent)() }), url: targetContent };
|
|
15
23
|
}
|
|
16
|
-
|
|
24
|
+
const catalysts = (0, contracts_snapshots_1.getCatalystServersFromCache)('mainnet');
|
|
25
|
+
let catalystClient;
|
|
26
|
+
for (const catalyst of catalysts) {
|
|
27
|
+
const client = (0, dcl_catalyst_client_1.createCatalystClient)({ url: catalyst.address, fetcher: (0, fetch_component_1.createFetchComponent)() });
|
|
28
|
+
const isHealthy = (await client.fetchAbout()).healthy;
|
|
29
|
+
if (isHealthy) {
|
|
30
|
+
catalystClient = client;
|
|
31
|
+
break;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
client: await catalystClient.getContentClient(),
|
|
36
|
+
url: (await catalystClient.fetchAbout()).lambdas.publicUrl
|
|
37
|
+
};
|
|
17
38
|
}
|
|
18
39
|
exports.getCatalyst = getCatalyst;
|
|
19
40
|
async function getAddressAndSignature(components, awaitResponse, messageToSign, scene, files, linkOptions, deployCallback) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/deploy/utils.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/deploy/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ type CatalystInfo = {
|
|
|
10
10
|
timestamp: number;
|
|
11
11
|
entityId: string;
|
|
12
12
|
};
|
|
13
|
-
export type Network = 'mainnet' | '
|
|
13
|
+
export type Network = 'mainnet' | 'sepolia';
|
|
14
14
|
export declare function daoCatalysts(components: Pick<CliComponents, 'fetch' | 'config'>, network: Network): Promise<Array<DAOCatalyst>>;
|
|
15
15
|
export declare function fetchEntityByPointer({ fetch }: Pick<CliComponents, 'fetch'>, baseUrl: string, pointers: string[]): Promise<{
|
|
16
16
|
baseUrl: string;
|
package/package.json
CHANGED
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk-commands",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.3.3-
|
|
4
|
+
"version": "7.3.3-5656411441.commit-2022de2",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"bin": {
|
|
7
7
|
"sdk-commands": "./dist/index.js"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@dcl/ecs": "7.3.
|
|
10
|
+
"@dcl/ecs": "7.3.3-5656411441.commit-2022de2",
|
|
11
11
|
"@dcl/hashing": "1.1.3",
|
|
12
|
-
"@dcl/inspector": "7.3.
|
|
13
|
-
"@dcl/linker-dapp": "
|
|
12
|
+
"@dcl/inspector": "7.3.3-5656411441.commit-2022de2",
|
|
13
|
+
"@dcl/linker-dapp": "0.9.1-5654370940.commit-5142c60",
|
|
14
14
|
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
|
|
15
15
|
"@dcl/protocol": "1.0.0-5623934099.commit-07e0626",
|
|
16
16
|
"@dcl/rpc": "^1.1.1",
|
|
17
17
|
"@dcl/schemas": "^8.2.3-20230718182824.commit-356025c",
|
|
18
18
|
"@segment/analytics-node": "^1.0.0-beta.22",
|
|
19
19
|
"@well-known-components/env-config-provider": "^1.2.0",
|
|
20
|
+
"@well-known-components/fetch-component": "^2.0.2",
|
|
20
21
|
"@well-known-components/http-server": "^2.0.0-20230501134558.commit-be9a25d",
|
|
21
22
|
"@well-known-components/logger": "^3.1.2",
|
|
22
23
|
"@well-known-components/metrics": "^2.0.1",
|
|
@@ -24,7 +25,7 @@
|
|
|
24
25
|
"arg": "^5.0.2",
|
|
25
26
|
"chokidar": "^3.5.3",
|
|
26
27
|
"colorette": "^2.0.19",
|
|
27
|
-
"dcl-catalyst-client": "^
|
|
28
|
+
"dcl-catalyst-client": "^21.5.0",
|
|
28
29
|
"esbuild": "^0.17.12",
|
|
29
30
|
"extract-zip": "2.0.1",
|
|
30
31
|
"fp-future": "^1.0.1",
|
|
@@ -67,5 +68,5 @@
|
|
|
67
68
|
"displayName": "SDK",
|
|
68
69
|
"tsconfig": "./tsconfig.json"
|
|
69
70
|
},
|
|
70
|
-
"commit": "
|
|
71
|
+
"commit": "2022de2344ce89f73a888c684b11253755ad4770"
|
|
71
72
|
}
|