From ed883f35d1828c33401938065d419ced8fbe38b6 Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 14 Mar 2023 17:23:53 +0200 Subject: [PATCH] Update Pinata SDK (#9170) --- package.json | 2 +- scripts/ipfsUpload.mjs | 10 ++++++--- yarn.lock | 51 +++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 0cde978208..029a81628a 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ }, "devDependencies": { "@crustio/crust-pin": "^1.0.0", - "@pinata/sdk": "^1.2.1", + "@pinata/sdk": "^2.1.0", "@polkadot/dev": "^0.71.9", "@types/chart.js": "^2.9.37", "@types/file-saver": "^2.0.5", diff --git a/scripts/ipfsUpload.mjs b/scripts/ipfsUpload.mjs index b56f8a04a2..fb89a09258 100644 --- a/scripts/ipfsUpload.mjs +++ b/scripts/ipfsUpload.mjs @@ -2,12 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 import CrustPinner from '@crustio/crust-pin'; -import pinataSDK from '@pinata/sdk'; +import PinataSDK from '@pinata/sdk'; import cloudflare from 'dnslink-cloudflare'; import fs from 'fs'; import { execSync } from '@polkadot/dev/scripts/util.mjs'; +// @ts-ignore import { createWsEndpoints } from '../packages/apps-config/build/endpoints/index.js'; console.log('$ scripts/ipfsUpload.mjs', process.argv.slice(2).join(' ')); @@ -24,13 +25,16 @@ const repo = `https://${process.env.GH_PAT}@github.com/${process.env.GITHUB_REPO async function wait (delay = 2500) { return new Promise((resolve) => { - setTimeout(() => resolve(), delay); + setTimeout(() => resolve(undefined), delay); }); } function createPinata () { try { - return pinataSDK(process.env.PINATA_API_KEY, process.env.PINATA_SECRET_KEY); + return new PinataSDK({ + pinataApiKey: process.env.PINATA_API_KEY, + pinataSecretApiKey: process.env.PINATA_SECRET_KEY + }); } catch { console.error('Unable to create Pinata'); } diff --git a/yarn.lock b/yarn.lock index 107c30b531..3c8e5a4200 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1259,16 +1259,15 @@ __metadata: languageName: node linkType: hard -"@pinata/sdk@npm:^1.2.1": - version: 1.2.1 - resolution: "@pinata/sdk@npm:1.2.1" +"@pinata/sdk@npm:^2.1.0": + version: 2.1.0 + resolution: "@pinata/sdk@npm:2.1.0" dependencies: axios: ^0.21.1 - base-path-converter: ^1.0.2 form-data: ^2.3.3 is-ipfs: ^0.6.0 - recursive-fs: ^1.1.2 - checksum: df39457c62e9032e5e414f5ab786d5deb84196c529024d52cdb12d589258ee94990aa064528f7d8d57a72be1a44d86fb1a31548df56f79e454884f261a167238 + path: ^0.12.7 + checksum: 70f7ac667f663010f419a299593eb893cbbbb9de006a8f192cdc9d5fac8a45fbf1c123e46a36c17b7063f296528f602e55ee2edc65e20ee06219b4cf0f807ce8 languageName: node linkType: hard @@ -4838,13 +4837,6 @@ __metadata: languageName: node linkType: hard -"base-path-converter@npm:^1.0.2": - version: 1.0.2 - resolution: "base-path-converter@npm:1.0.2" - checksum: 9fca25198e4588ab46389426ee51b81d296000dbb132fe9228b90f93d0f89dead66468f63da37519e972c634c1ccfe136442c300b9762fb83265532cf2ac32e0 - languageName: node - linkType: hard - "base-x@npm:^3.0.2, base-x@npm:^3.0.8": version: 3.0.9 resolution: "base-x@npm:3.0.9" @@ -13594,6 +13586,16 @@ fsevents@~2.3.2: languageName: node linkType: hard +"path@npm:^0.12.7": + version: 0.12.7 + resolution: "path@npm:0.12.7" + dependencies: + process: ^0.11.1 + util: ^0.10.3 + checksum: 5dedb71e78fc008fcba797defc0b4e1cf06c1f18e0a631e03ba5bb505136f587ff017afc14f9a3d481cbe77aeedff7dc0c1d2ce4d820c1ebf3c4281ca49423a1 + languageName: node + linkType: hard + "pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.0.9": version: 3.1.2 resolution: "pbkdf2@npm:3.1.2" @@ -13710,7 +13712,7 @@ fsevents@~2.3.2: resolution: "polkadot-apps@workspace:." dependencies: "@crustio/crust-pin": ^1.0.0 - "@pinata/sdk": ^1.2.1 + "@pinata/sdk": ^2.1.0 "@polkadot/dev": ^0.71.9 "@types/chart.js": ^2.9.37 "@types/file-saver": ^2.0.5 @@ -14021,7 +14023,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"process@npm:^0.11.10": +"process@npm:^0.11.1, process@npm:^0.11.10": version: 0.11.10 resolution: "process@npm:0.11.10" checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 @@ -14688,16 +14690,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"recursive-fs@npm:^1.1.2": - version: 1.1.2 - resolution: "recursive-fs@npm:1.1.2" - bin: - recursive-copy: ./bin/recursive-copy - recursive-delete: ./bin/recursive-delete - checksum: 6b330d2e6b1359b179736c77ecdf64cc98e778fde676ca7b39b3ea6045dbab4d659d625ffb45e1c31871e8ee2c9bc73f9cf72f661baecf1053677614ceef0989 - languageName: node - linkType: hard - "redent@npm:^3.0.0": version: 3.0.0 resolution: "redent@npm:3.0.0" @@ -17449,6 +17441,15 @@ fsevents@~2.3.2: languageName: node linkType: hard +"util@npm:^0.10.3": + version: 0.10.4 + resolution: "util@npm:0.10.4" + dependencies: + inherits: 2.0.3 + checksum: 913f9a90d05a60e91f91af01b8bd37e06bca4cc02d7b49e01089f9d5b78be2fffd61fb1a41b517de7238c5fc7337fa939c62d1fb4eb82e014894c7bee6637aaf + languageName: node + linkType: hard + "util@npm:^0.12.0, util@npm:^0.12.5": version: 0.12.5 resolution: "util@npm:0.12.5"