From 90403762eb2ff4e164c02fcffaf3de84211e3ac2 Mon Sep 17 00:00:00 2001 From: Jonas Daniels Date: Tue, 20 Sep 2022 10:30:16 -0700 Subject: [PATCH] fix cli by reverting storage --- .changeset/clever-beds-prove.md | 5 +++++ packages/cli/package.json | 3 ++- packages/cli/src/common/ci-installer.ts | 6 +++--- packages/cli/src/common/processor.ts | 26 ++++++++++++------------- yarn.lock | 9 +++++++++ 5 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 .changeset/clever-beds-prove.md diff --git a/.changeset/clever-beds-prove.md b/.changeset/clever-beds-prove.md new file mode 100644 index 00000000000..94bf87a4b2c --- /dev/null +++ b/.changeset/clever-beds-prove.md @@ -0,0 +1,5 @@ +--- +"thirdweb": patch +--- + +revert storage package on cli diff --git a/packages/cli/package.json b/packages/cli/package.json index fe955e3738e..109f60c61c4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -31,6 +31,7 @@ }, "dependencies": { "@thirdweb-dev/sdk": "*", + "@thirdweb-dev/storage": "0.2.8", "async-retry": "^1.3.3", "cbor": "^8.1.0", "commander": "^9.1.0", @@ -81,4 +82,4 @@ "sourcemap": true, "clean": true } -} \ No newline at end of file +} diff --git a/packages/cli/src/common/ci-installer.ts b/packages/cli/src/common/ci-installer.ts index a8c10e3a724..0313de166ed 100644 --- a/packages/cli/src/common/ci-installer.ts +++ b/packages/cli/src/common/ci-installer.ts @@ -1,5 +1,5 @@ import { spinner } from "../core/helpers/logger"; -import { ThirdwebStorage } from "@thirdweb-dev/storage"; +import { IpfsStorage } from "@thirdweb-dev/storage"; import { existsSync, mkdirSync, writeFileSync } from "fs"; import path, { join } from "path"; @@ -13,10 +13,10 @@ export async function installGithubAction(options: any) { : path.resolve(`${projectPath}/${options.path}`); projectPath = resolvedPath; } - const storage = new ThirdwebStorage(); + const storage = new IpfsStorage(); const log = spinner("Installing thirdweb Github Action..."); try { - const ghActionData = await (await storage.download(ghActionHash)).text(); + const ghActionData = await storage.getRaw(ghActionHash); const dir = join(projectPath, ".github/workflows"); if (!existsSync(dir)) { mkdirSync(dir, { recursive: true }); diff --git a/packages/cli/src/common/processor.ts b/packages/cli/src/common/processor.ts index 776b82233f6..168f308d0a4 100644 --- a/packages/cli/src/common/processor.ts +++ b/packages/cli/src/common/processor.ts @@ -1,11 +1,11 @@ -import { cliVersion, THIRDWEB_URL } from "../constants/urls"; +import { THIRDWEB_URL, cliVersion } from "../constants/urls"; import build from "../core/builder/build"; import detect from "../core/detection/detect"; import { execute } from "../core/helpers/exec"; import { error, info, logger, spinner } from "../core/helpers/logger"; import { createContractsPrompt } from "../core/helpers/selector"; import { ContractPayload } from "../core/interfaces/ContractPayload"; -import { ThirdwebStorage } from "@thirdweb-dev/storage"; +import { IpfsStorage } from "@thirdweb-dev/storage"; import chalk from "chalk"; import { readFileSync } from "fs"; import path from "path"; @@ -15,7 +15,7 @@ export async function processProject( command: "deploy" | "release", ) { // TODO: allow overriding the default storage - const storage = new ThirdwebStorage(); + const storage = new IpfsStorage(); logger.setSettings({ minLevel: options.debug ? "debug" : "info", @@ -129,9 +129,7 @@ export async function processProject( if (file.includes(soliditySDKPackage)) { usesSoliditySDK = true; } - return await storage.upload(file, { - uploadWithoutDirectory: true, - }); + return await storage.uploadSingle(file); }), ); } @@ -142,15 +140,14 @@ export async function processProject( const metadataURIs = await Promise.all( selectedContracts.map(async (c) => { logger.debug(`Uploading ${c.name}...`); - return await storage.upload(JSON.parse(c.metadata), { - uploadWithoutDirectory: true, - }); + const hash = await storage.uploadSingle(c.metadata); + return `ipfs://${hash}`; }), ); // Upload batch all bytecodes const bytecodes = selectedContracts.map((c) => c.bytecode); - const bytecodeURIs = await storage.uploadBatch(bytecodes); + const { uris: bytecodeURIs } = await storage.uploadBatch(bytecodes); const combinedContents = selectedContracts.map((c, i) => { // attach analytics blob to metadata @@ -172,13 +169,14 @@ export async function processProject( let combinedURIs: string[] = []; if (combinedContents.length === 1) { // use upload single if only one contract to get a clean IPFS hash - const metadataUri = await storage.upload(combinedContents[0], { - uploadWithoutDirectory: true, - }); + const metadataUri = await storage.uploadSingle( + JSON.stringify(combinedContents[0]), + ); combinedURIs.push(metadataUri); } else { // otherwise upload batch - combinedURIs = await storage.uploadBatch(combinedContents); + const { uris } = await storage.uploadMetadataBatch(combinedContents); + combinedURIs = uris; } loader.succeed("Upload successful"); diff --git a/yarn.lock b/yarn.lock index f397e17917e..9dd593e897f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3645,6 +3645,15 @@ resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.1.8-0.tgz#847af3fe9a53368e7be04b7b6e6afe076d3d1676" integrity sha512-PiQjdRcAUBlu3poc4g6dN9KvjTgYsA1Vi+B/IgryptCgcJeMY4cldMabKCgPaCg9dPVpUq4O+SOM00P6mBNvGw== +"@thirdweb-dev/storage@0.2.8": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-0.2.8.tgz#7c19b41dab363737e0015733a98e8f5252925db9" + integrity sha512-XM3wBlpUVWnMwBnHveWP1NgIsJDtvpzDsORO+DP8CQAsYizILKbiBC3n2w+eW/sLOGLuEYEUZk2zPFD/xpPM3Q== + dependencies: + cross-fetch "^3.1.5" + form-data "^4.0.0" + zod "^3.11.6" + "@trivago/prettier-plugin-sort-imports@^3.3.0": version "3.3.0" resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-3.3.0.tgz#ee4e9ec1d8e3076b95fcb94311f42f7a61eecd37"