Skip to content

Commit

Permalink
fix: use up.storacha.network
Browse files Browse the repository at this point in the history
  • Loading branch information
alanshaw committed Feb 11, 2025
1 parent 372f839 commit 89fb5b2
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion packages/access-client/test/agent-use-cases.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ describe('authorizeWaitAndClaim', async function () {
describe('getAccountPlan', async function () {
const accountWithAPlan = 'did:mailto:example.com:i-have-a-plan'
const accountWithoutAPlan = 'did:mailto:example.com:i-have-no-plan'
const product = 'did:web:test.upload.storacha.network'
const product = 'did:web:test.up.storacha.network'
/** @type {Record<Ucanto.DID, {product: Ucanto.DID, updatedAt: string}>} */
const plans = {
[accountWithAPlan]: {
Expand Down
34 changes: 17 additions & 17 deletions packages/capabilities/test/capabilities/provider.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: await createAuthorization({ agent, service, account }),
Expand All @@ -36,7 +36,7 @@ describe('provider/add', function () {
assert.deepEqual(result.ok.audience.did(), service.did())
assert.equal(result.ok.capability.can, 'provider/add')
assert.deepEqual(result.ok.capability.nb, {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
})
}
Expand All @@ -51,7 +51,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
})
Expand Down Expand Up @@ -80,7 +80,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: [delegation],
Expand Down Expand Up @@ -110,7 +110,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: [attestation],
Expand All @@ -135,7 +135,7 @@ describe('provider/add', function () {
with: bobAccount.did(),
// @ts-ignore
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
},
})
}, /Error: Invalid 'nb' - Object contains invalid field "consumer"/)
Expand All @@ -149,7 +149,7 @@ describe('provider/add', function () {
audience: service,
with: bobAccount.did(),
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
// @ts-expect-error
consumer: 'did:mailto:storacha.network:user',
},
Expand All @@ -166,7 +166,7 @@ describe('provider/add', function () {
with: bobAccount.did(),
// @ts-expect-error - missing provider
nb: {
// provider: 'did:web:test.upload.storacha.network',
// provider: 'did:web:test.up.storacha.network',
consumer: bob.did(),
},
})
Expand Down Expand Up @@ -197,7 +197,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: [
Expand All @@ -206,7 +206,7 @@ describe('provider/add', function () {
audience: bob,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: await createAuthorization({ agent, service, account }),
Expand All @@ -233,7 +233,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: [
Expand All @@ -242,7 +242,7 @@ describe('provider/add', function () {
audience: bob,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
},
proofs: await createAuthorization({ agent, service, account }),
}),
Expand All @@ -268,7 +268,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: space.did(),
},
proofs: [
Expand Down Expand Up @@ -303,7 +303,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: bob.did(),
},
proofs: [
Expand Down Expand Up @@ -338,7 +338,7 @@ describe('provider/add', function () {
audience: service,
with: account,
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: bob.did(),
},
proofs: [
Expand Down Expand Up @@ -379,7 +379,7 @@ describe('provider/add', function () {
audience: service,
with: 'did:mailto:mallory.com:bob',
nb: {
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
consumer: bob.did(),
},
proofs: [
Expand Down Expand Up @@ -428,7 +428,7 @@ describe('provider/add', function () {
with: account.did(),
nb: {
consumer: space.did(),
provider: 'did:web:test.upload.storacha.network',
provider: 'did:web:test.up.storacha.network',
},
// NOTE: no proofs!
})
Expand Down
2 changes: 1 addition & 1 deletion packages/capabilities/test/helpers/fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const malloryAccount = Absentee.from({

export const service = Signer.parse(
'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
).withDID('did:web:test.upload.storacha.network')
).withDID('did:web:test.up.storacha.network')

export const readmeCID = parseLink(
'bafybeihqfdg2ereoijjoyrqzr2x2wsasqm2udurforw7pa3tvbnxhojao4'
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,23 @@ Default `storacha-cli`

### `STORACHA_SERVICE_URL`

`storacha` CLI will use the w3up service at https://upload.storacha.network. If you would like
`storacha` CLI will use the w3up service at https://up.storacha.network. If you would like
to use a different w3up-compatible service, set `STORACHA_SERVICE_DID` and `STORACHA_SERVICE_URL` environment variables to set the service DID and URL endpoint.

Default `https://upload.storacha.network`
Default `https://up.storacha.network`

### `STORACHA_SERVICE_DID`

`storacha` CLI will use the w3up `did:web:upload.storacha.network` as the service DID. If you would like
`storacha` CLI will use the w3up `did:web:up.storacha.network` as the service DID. If you would like
to use a different w3up-compatible service, set `STORACHA_SERVICE_DID` and `STORACHA_SERVICE_URL` environment variables to set the service DID and URL endpoint.

Default `did:web:upload.storacha.network`
Default `did:web:up.storacha.network`

### `STORACHA_RECEIPTS_URL`

The URL at which UCAN receipts issued by the service may be fetched.

Default `https://upload.storacha.network/receipt/`
Default `https://up.storacha.network/receipt/`

## FAQ

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/test/bin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ export const testSpace = {
})

/** @type {import('@storacha/client/types').DID<'web'>} */
const providerDID = 'did:web:test.upload.storacha.network'
const providerDID = 'did:web:test.up.storacha.network'

const infoWithoutProvider = await storacha
.args(['space', 'info'])
Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/test/handlers/plan.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const test = {
'an account can get plan information': async (assert, context) => {
const account = 'did:mailto:example.com:alice'
const billingID = 'stripe:abc123'
const product = 'did:web:test.upload.storacha.network'
const product = 'did:web:test.up.storacha.network'
await context.plansStorage.initialize(account, billingID, product)
const connection = connect({
id: context.id,
Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/test/helpers/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const createContext = async (
const signer = await Signer.generate()
const aggregatorSigner = await Signer.generate()
const dealTrackerSigner = await Signer.generate()
const id = signer.withDID('did:web:test.upload.storacha.network')
const id = signer.withDID('did:web:test.up.storacha.network')

const service = getMockService()
const dealTrackerConnection = getConnection(
Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/test/storage/provisions-storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class ProvisionsStorage {
*
* @param {Array<Types.ServiceDID | string>} providers
*/
constructor(providers = ['did:web:test.upload.storacha.network']) {
constructor(providers = ['did:web:test.up.storacha.network']) {
/**
* @type {Record<string, Types.Provision>}
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/test/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const service = ed25519
.parse(
'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
)
.withDID('did:web:test.upload.storacha.network')
.withDID('did:web:test.up.storacha.network')

/**
* @param {import('@ucanto/interface').Principal} audience
Expand Down
6 changes: 3 additions & 3 deletions packages/upload-client/src/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { connect } from '@ucanto/client'
import { CAR, HTTP } from '@ucanto/transport'
import * as DID from '@ipld/dag-ucan/did'

export const serviceURL = new URL('https://upload.storacha.network')
export const servicePrincipal = DID.parse('did:web:upload.storacha.network')
export const receiptsEndpoint = 'https://upload.storacha.network/receipt/'
export const serviceURL = new URL('https://up.storacha.network')
export const servicePrincipal = DID.parse('did:web:up.storacha.network')
export const receiptsEndpoint = 'https://up.storacha.network/receipt/'

/** @type {import('@ucanto/interface').ConnectionView<import('./types.js').Service>} */
export const connection = connect({
Expand Down
12 changes: 6 additions & 6 deletions packages/w3up-client/src/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { CAR, HTTP } from '@ucanto/transport'
import * as DID from '@ipld/dag-ucan/did'
import { receiptsEndpoint } from '@storacha/upload-client'

export const accessServiceURL = new URL('https://upload.storacha.network')
export const accessServiceURL = new URL('https://up.storacha.network')
export const accessServicePrincipal = DID.parse(
'did:web:upload.storacha.network'
'did:web:up.storacha.network'
)

export const accessServiceConnection = client.connect({
Expand All @@ -14,9 +14,9 @@ export const accessServiceConnection = client.connect({
channel: HTTP.open({ url: accessServiceURL, method: 'POST' }),
})

export const uploadServiceURL = new URL('https://upload.storacha.network')
export const uploadServiceURL = new URL('https://up.storacha.network')
export const uploadServicePrincipal = DID.parse(
'did:web:upload.storacha.network'
'did:web:up.storacha.network'
)

export const uploadServiceConnection = client.connect({
Expand All @@ -25,9 +25,9 @@ export const uploadServiceConnection = client.connect({
channel: HTTP.open({ url: accessServiceURL, method: 'POST' }),
})

export const filecoinServiceURL = new URL('https://upload.storacha.network')
export const filecoinServiceURL = new URL('https://up.storacha.network')
export const filecoinServicePrincipal = DID.parse(
'did:web:upload.storacha.network'
'did:web:up.storacha.network'
)

export const filecoinServiceConnection = client.connect({
Expand Down
2 changes: 1 addition & 1 deletion packages/w3up-client/test/client.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ export const testClient = {
defaultProvider: {
'should return the connection ID': async (assert) => {
const alice = new Client(await AgentData.create())
assert.equal(alice.defaultProvider(), 'did:web:upload.storacha.network')
assert.equal(alice.defaultProvider(), 'did:web:up.storacha.network')
},
},

Expand Down
4 changes: 2 additions & 2 deletions packages/w3up-client/test/coupon.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const testCoupon = Test.withContext({
// Then we setup a billing for this account
await plansStorage.set(
account.did(),
'did:web:test.upload.storacha.network'
'did:web:test.up.storacha.network'
)

// Then we use the account to issue a coupon for the workshop
Expand Down Expand Up @@ -50,7 +50,7 @@ export const testCoupon = Test.withContext({

const info = await alice.capability.space.info(space.did())
assert.deepEqual(info.did, space.did())
assert.deepEqual(info.providers, ['did:web:test.upload.storacha.network'])
assert.deepEqual(info.providers, ['did:web:test.up.storacha.network'])
},

'coupon with password': async (
Expand Down
2 changes: 1 addition & 1 deletion scripts/mkdelegate.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { base64 } from 'multiformats/bases/base64'
import * as DID from '@ipld/dag-ucan/did'

const indexingServiceDID = 'did:web:staging.indexer.storacha.network'
const uploadServiceDID = 'did:web:staging.upload.storacha.network'
const uploadServiceDID = 'did:web:staging.up.storacha.network'
const storageProviderDID = 'did:key:...'

if (!process.argv[2]) {
Expand Down

0 comments on commit 89fb5b2

Please sign in to comment.