Skip to content

Commit da3a0b4

Browse files
authored
Merge pull request #29 from GenesysGo/tracy/edit-file-refactor
edit-file refactor
2 parents 5f2eea6 + 7a880a7 commit da3a0b4

File tree

4 files changed

+49
-131
lines changed

4 files changed

+49
-131
lines changed

package-lock.json

Lines changed: 37 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shadow-drive/cli",
3-
"version": "0.7.2",
3+
"version": "1.0.0",
44
"main": "shdw-drive.js",
55
"bin": {
66
"shdw-drive": "./dist/src/shdw-drive.js"
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@coral-xyz/anchor": "^0.27.0",
19-
"@shadow-drive/sdk": "^5.1.1",
19+
"@shadow-drive/sdk": "^6.0.0",
2020
"@solana/spl-token": "^0.2.0",
2121
"@solana/web3.js": "^1.41.0",
2222
"bigint-conversion": "^2.2.1",

src/shdw-drive.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,18 +278,14 @@ programCommand("edit-file")
278278
`Sending file edit request to the cluster.`
279279
).start();
280280
try {
281-
const uploadResponse = await drive.editFile(
282-
storageAccount,
283-
options.url,
284-
{
285-
name: fileName,
286-
file: fileData,
287-
}
288-
);
281+
const uploadResponse = await drive.editFile(storageAccount, {
282+
name: fileName,
283+
file: fileData,
284+
});
289285
txnSpinner.succeed(`File account updated: ${fileName}`);
290286
log.info(
291287
"Your finalized file location:",
292-
uploadResponse.finalized_location
288+
uploadResponse.finalized_locations
293289
);
294290
log.info("Your updated file is immediately accessible.");
295291
return process.exit(0);
@@ -513,6 +509,7 @@ async function handleUpload(
513509
storageAccount,
514510
fileDataChunk,
515511
concurrent,
512+
false,
516513
(items: number) => progress.increment(items)
517514
);
518515
return uploadResponse;

yarn.lock

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@
7171
bn.js "^5.1.2"
7272
buffer-layout "^1.2.0"
7373

74-
"@coral-xyz/borsh@^0.28.0":
75-
version "0.28.0"
76-
resolved "https://registry.npmjs.org/@coral-xyz/borsh/-/borsh-0.28.0.tgz"
77-
integrity sha512-/u1VTzw7XooK7rqeD7JLUSwOyRSesPUk0U37BV9zK0axJc1q0nRbKFGFLYCQ16OtdOJTTwGfGp11Lx9B45bRCQ==
78-
dependencies:
79-
bn.js "^5.1.2"
80-
buffer-layout "^1.2.0"
81-
8274
"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
8375
version "9.3.0"
8476
resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"
@@ -178,10 +170,9 @@
178170
resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
179171
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
180172

181-
"@shadow-drive/sdk@^5.1.1":
182-
version "5.1.1"
183-
resolved "https://registry.npmjs.org/@shadow-drive/sdk/-/sdk-5.1.1.tgz"
184-
integrity sha512-wCUlJHiL+tjJvSKImGdfMAsDYrDIKs0Ysxm6o3+DoUzSP42cfc493QTfl38mETjD5IrxjjjqdN6fJhnegPpFGA==
173+
"@shadow-drive/sdk@^6.0.0":
174+
version "6.0.0"
175+
resolved "file:../shadow-drive"
185176
dependencies:
186177
"@coral-xyz/anchor" "^0.27.0"
187178
"@coral-xyz/borsh" "^0.28.0"
@@ -258,13 +249,6 @@
258249
rpc-websockets "^7.5.1"
259250
superstruct "^0.14.2"
260251

261-
"@types/bn.js@^5.1.1":
262-
version "5.1.5"
263-
resolved "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz"
264-
integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==
265-
dependencies:
266-
"@types/node" "*"
267-
268252
"@types/cli-progress@^3.11.0":
269253
version "3.11.0"
270254
resolved "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.0.tgz"
@@ -1106,11 +1090,6 @@ js-sha256@^0.9.0:
11061090
resolved "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz"
11071091
integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
11081092

1109-
"js-tokens@^3.0.0 || ^4.0.0":
1110-
version "4.0.0"
1111-
resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
1112-
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
1113-
11141093
jsesc@^2.5.1:
11151094
version "2.5.2"
11161095
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
@@ -1171,13 +1150,6 @@ loglevel@^1.8.0:
11711150
resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz"
11721151
integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==
11731152

1174-
loose-envify@^1.1.0:
1175-
version "1.4.0"
1176-
resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
1177-
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
1178-
dependencies:
1179-
js-tokens "^3.0.0 || ^4.0.0"
1180-
11811153
lower-case@^2.0.2:
11821154
version "2.0.2"
11831155
resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"
@@ -1295,7 +1267,7 @@ node-abi@^3.3.0:
12951267
dependencies:
12961268
semver "^7.3.5"
12971269

1298-
node-fetch@^2.6.12, node-fetch@^2.6.6, node-fetch@^2.6.7, node-fetch@2:
1270+
node-fetch@^2.6.12, node-fetch@^2.6.6, node-fetch@^2.6.7:
12991271
version "2.7.0"
13001272
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
13011273
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -1488,13 +1460,6 @@ rc@^1.2.7:
14881460
minimist "^1.2.0"
14891461
strip-json-comments "~2.0.1"
14901462

1491-
"react@^17.0.0 || ^18":
1492-
version "18.3.1"
1493-
resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz"
1494-
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
1495-
dependencies:
1496-
loose-envify "^1.1.0"
1497-
14981463
readable-stream@^2.0.0:
14991464
version "2.3.8"
15001465
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"

0 commit comments

Comments
 (0)