From c22436f34135cd8681af10845813e3cb550ad162 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 29 Nov 2023 11:50:48 +0000 Subject: [PATCH] fix: update w3up-client --- packages/core/package.json | 4 +-- packages/core/src/service.ts | 7 +--- pnpm-lock.yaml | 65 ++++++++++++++++++++++++++++-------- 3 files changed, 54 insertions(+), 22 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 431bc601..134766cc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -37,9 +37,7 @@ "@ucanto/transport": "^9.0.0", "@web3-storage/access": "^18.0.3", "@web3-storage/did-mailto": "^2.0.2", - "@web3-storage/filecoin-client": "^3.1.0", - "@web3-storage/upload-client": "^12.0.2", - "@web3-storage/w3up-client": "^11.1.3" + "@web3-storage/w3up-client": "^11.2.0" }, "eslintConfig": { "extends": [ diff --git a/packages/core/src/service.ts b/packages/core/src/service.ts index 545a1249..cdebb745 100644 --- a/packages/core/src/service.ts +++ b/packages/core/src/service.ts @@ -1,6 +1,4 @@ -import type { Service as AccessService } from '@web3-storage/access/types' -import type { Service as UploadService } from '@web3-storage/upload-client/types' -import type { StorefrontService } from '@web3-storage/filecoin-client/storefront' +import type { ServiceConf, Service } from '@web3-storage/w3up-client/types' import { connect } from '@ucanto/client' import { CAR, HTTP } from '@ucanto/transport' import type { @@ -8,9 +6,6 @@ import type { Principal } from '@ucanto/interface' import * as DID from '@ipld/dag-ucan/did' -import { ServiceConf } from '@web3-storage/w3up-client/dist/src/types' - -type Service = AccessService & UploadService & StorefrontService export interface ServiceConfig { servicePrincipal?: Principal diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5862c37..6292cd8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -555,15 +555,9 @@ importers: '@web3-storage/did-mailto': specifier: ^2.0.2 version: 2.1.0 - '@web3-storage/filecoin-client': - specifier: ^3.1.0 - version: 3.1.2 - '@web3-storage/upload-client': - specifier: ^12.0.2 - version: 12.1.0 '@web3-storage/w3up-client': - specifier: ^11.1.3 - version: 11.1.3 + specifier: ^11.2.0 + version: 11.2.0 packages/keyring-core: dependencies: @@ -3488,6 +3482,29 @@ packages: uint8arrays: 4.0.9 dev: false + /@web3-storage/access@18.0.5: + resolution: {integrity: sha512-dTojMu7UWb7esbnX3F18eTC+hwlYkDhxBZAogmHX7legRGRK5MwwoRMpk8qz6zI6ImUmkApWFYrF2U8OaGC0bQ==} + dependencies: + '@ipld/car': 5.2.4 + '@ipld/dag-ucan': 3.4.0 + '@scure/bip39': 1.2.1 + '@ucanto/client': 9.0.0 + '@ucanto/core': 9.0.1 + '@ucanto/interface': 9.0.0 + '@ucanto/principal': 9.0.0 + '@ucanto/transport': 9.0.0 + '@ucanto/validator': 9.0.1 + '@web3-storage/capabilities': 12.1.0 + '@web3-storage/did-mailto': 2.1.0 + bigint-mod-arith: 3.3.1 + conf: 11.0.2 + multiformats: 12.1.3 + one-webcrypto: github.com/web3-storage/one-webcrypto/5148cd14d5489a8ac4cd38223870e02db15a2382 + p-defer: 4.0.0 + type-fest: 3.13.1 + uint8arrays: 4.0.9 + dev: false + /@web3-storage/capabilities@11.4.1: resolution: {integrity: sha512-PjIewEg/T3wfNavxzsZZ5MpH2WBldNz94qOQOKg5iH/4UrS8SPWWGsJx/Tu760O+PFhpTFwvi5cHCtkb08OdAA==} dependencies: @@ -3509,6 +3526,17 @@ packages: '@web3-storage/data-segment': 3.2.0 dev: false + /@web3-storage/capabilities@12.1.0: + resolution: {integrity: sha512-SlYdPqCokDHb55zlZOvh+n8uEMOrEU413Z1MzQ8HvULpbzfcEtGyOiDgrAhdNEZtPnWHqaUEtU7o829Yw2Ra5w==} + dependencies: + '@ucanto/core': 9.0.1 + '@ucanto/interface': 9.0.0 + '@ucanto/principal': 9.0.0 + '@ucanto/transport': 9.0.0 + '@ucanto/validator': 9.0.1 + '@web3-storage/data-segment': 3.2.0 + dev: false + /@web3-storage/data-segment@3.2.0: resolution: {integrity: sha512-SM6eNumXzrXiQE2/J59+eEgCRZNYPxKhRoHX2QvV3/scD4qgcf4g+paWBc3UriLEY1rCboygGoPsnqYJNyZyfA==} dependencies: @@ -3532,6 +3560,17 @@ packages: '@web3-storage/capabilities': 12.0.3 dev: false + /@web3-storage/filecoin-client@3.2.0: + resolution: {integrity: sha512-4kSyXcN7jPAnpO2U8afheYBRJ4E/8aRJvCvPgHF+HZEtEaLHYuuQzU72Aro94qV0bm5ZRxXPNh6wRSlz/XZLlg==} + dependencies: + '@ipld/dag-ucan': 3.4.0 + '@ucanto/client': 9.0.0 + '@ucanto/core': 9.0.1 + '@ucanto/interface': 9.0.0 + '@ucanto/transport': 9.0.0 + '@web3-storage/capabilities': 12.1.0 + dev: false + /@web3-storage/upload-client@12.1.0: resolution: {integrity: sha512-olVpvfDnEHiTCZuBKmKuizPR4oSUyEbWPS/AzHElKca/ivDoXI5S8ycoILn26KSM7wttQuPdVz/FugCCCI6czw==} dependencies: @@ -3571,8 +3610,8 @@ packages: - encoding dev: false - /@web3-storage/w3up-client@11.1.3: - resolution: {integrity: sha512-PXmRXSbLyAGgOgFmwkSGhvuYd1uQXE3UkMUG1h141b5RocgIaOcOWnmaWxH5vyPj7G7ovg01qOVhN9yKNoNV+g==} + /@web3-storage/w3up-client@11.2.0: + resolution: {integrity: sha512-ZHXoca1mj32Q2SbNzRtjG/YRIYaA5q6si7PQfv1/5cUgZx60XqD9uBpSB88fCJhzIPHWwPBvDNVFQPL0ASy4cA==} dependencies: '@ipld/dag-ucan': 3.4.0 '@ucanto/client': 9.0.0 @@ -3580,10 +3619,10 @@ packages: '@ucanto/interface': 9.0.0 '@ucanto/principal': 9.0.0 '@ucanto/transport': 9.0.0 - '@web3-storage/access': 18.0.3 - '@web3-storage/capabilities': 12.0.3 + '@web3-storage/access': 18.0.5 + '@web3-storage/capabilities': 12.1.0 '@web3-storage/did-mailto': 2.1.0 - '@web3-storage/filecoin-client': 3.1.2 + '@web3-storage/filecoin-client': 3.2.0 '@web3-storage/upload-client': 12.1.0 transitivePeerDependencies: - encoding