Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/archiver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test:watch": "vitest"
},
"dependencies": {
"@audius/sdk": "10.0.0",
"@audius/sdk": "^15.3.1",
"@pedalboard/basekit": "*",
"@pedalboard/logger": "*",
"@pedalboard/storage": "*",
Expand Down
8 changes: 5 additions & 3 deletions apps/archiver/src/sdk.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { sdk } from '@audius/sdk'
import { createSdkWithServices } from '@audius/sdk'
import { readConfig, Environment } from './config'

const environmentToSdkEnvironment: Record<
Expand All @@ -9,7 +9,7 @@ const environmentToSdkEnvironment: Record<
prod: 'production'
}

let audiusSdk: ReturnType<typeof sdk> | undefined = undefined
let audiusSdk: ReturnType<typeof createSdkWithServices> | undefined = undefined

export const getAudiusSdk = () => {
if (audiusSdk === undefined) {
Expand All @@ -19,7 +19,9 @@ export const getAudiusSdk = () => {
// inspectTrack land in the configured app's rps/rpm bucket on the server's
// rate-limit middleware. The raw downloadFile fetch (which bypasses the
// SDK entirely) attaches api_key itself — see downloadFile in utils.ts.
audiusSdk = sdk({
// Use createSdkWithServices (not sdk()) so tracks.getTrackDownloadUrl is
// available — the bare sdk() factory exposes only the generated TracksApi.
audiusSdk = createSdkWithServices({
appName: 'audius-archiver',
environment: environmentToSdkEnvironment[config.environment],
apiKey: config.apiKey
Expand Down
2 changes: 1 addition & 1 deletion apps/relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"preset": "jest-presets/jest/node"
},
"dependencies": {
"@audius/sdk": "10.0.0",
"@audius/sdk": "^15.3.1",
"@bufbuild/protobuf": "2.2.3",
"@connectrpc/connect": "2.0.1",
"@connectrpc/connect-node": "2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/relay/src/coreRelay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export const coreRelay = async (
metadata,
subjectSig,
nonce: nonceBytes
} = audiusSdk.services.entityManager.decodeManageEntity(
} = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)

Expand Down
16 changes: 6 additions & 10 deletions apps/relay/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import { logger } from './logger'
import { initializeDiscoveryDb } from '@pedalboard/basekit'
import { connectWeb3 } from './web3'
import { app } from './server'
import { AudiusSdk, sdk } from '@audius/sdk'
import { AudiusSdkWithServices, createSdkWithServices } from '@audius/sdk'

export type SharedData = {
config: Config
web3: ethers.providers.JsonRpcProvider
sdk: AudiusSdk
sdk: AudiusSdkWithServices
wallets: WalletManager
audiusSdk: AudiusSdk
audiusSdk: AudiusSdkWithServices
}

export const config = readConfig()
Expand All @@ -28,17 +28,13 @@ export const discoveryDb = initializeDiscoveryDb(

export let web3: providers.JsonRpcProvider
export let wallets: WalletManager
export let audiusSdk: AudiusSdk
export let audiusSdk: AudiusSdkWithServices

const main = async () => {
audiusSdk = sdk({
audiusSdk = createSdkWithServices({
appName: 'relay',
environment:
config.environment === 'dev'
? 'development'
: config.environment === 'stage'
? 'staging'
: 'production'
config.environment === 'dev' ? 'development' : 'production'
})
try {
// async config
Expand Down
2 changes: 1 addition & 1 deletion apps/relay/src/middleware/rateLimiter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const rateLimiterMiddleware = async (
}

export const getEntityManagerActionKey = (encodedABI: string): string => {
const decodedABI = audiusSdk.services.entityManager.decodeManageEntity(
const decodedABI = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
const { action, entityType } = decodedABI
Expand Down
4 changes: 2 additions & 2 deletions apps/relay/src/middleware/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export const retrieveUser = async (
// if entitymanager transaction, recover signer
if (contractRegistryKey === 'EntityManager') {
const recoveredAddress =
await audiusSdk.services.entityManager.recoverSigner(
await audiusSdk.services.entityManager!.recoverSigner(
encodedABI as `0x${string}`
)

Expand Down Expand Up @@ -232,7 +232,7 @@ export const retrieveDeveloperApp = async (params: {
contractAddress: string
}): Promise<DeveloperApps | undefined> => {
const { encodedABI } = params
const recoveredAddress = await audiusSdk.services.entityManager.recoverSigner(
const recoveredAddress = await audiusSdk.services.entityManager!.recoverSigner(
encodedABI as `0x${string}`
)
return await discoveryDb<DeveloperApps>(Table.DeveloperApps)
Expand Down
10 changes: 6 additions & 4 deletions apps/relay/src/scripts/sandbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ export const main = async () => {

const audiusSdk = sdk({
appName: 'experimentalDiscoveryRelay',
apiKey,
apiSecret,
environment: 'staging'
apiKey: apiKey!,
apiSecret: apiSecret!,
environment: 'production',
apiEndpoint: 'https://discoveryprovider.staging.audius.co'
})
const { data } = await audiusSdk.users.getUserByHandle({
handle: 'totallynotalec'
})
const userId = data?.id!
const res = await audiusSdk.users.updateProfile({
const res = await audiusSdk.users.updateUser({
id: userId,
userId,
metadata: {
bio: `identity has no reigns on me ${new Date().getTime()}`
Expand Down
10 changes: 5 additions & 5 deletions apps/relay/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { audiusSdk } from '.'

export const isUserCreate = (encodedABI: string): boolean => {
const decodedAbi = audiusSdk.services.entityManager.decodeManageEntity(
const decodedAbi = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
return decodedAbi.action === 'Create' && decodedAbi.entityType === 'User'
Expand All @@ -11,7 +11,7 @@ export const isUserDeactivate = (
isDeactivated: boolean,
encodedABI: string
): boolean => {
const decodedAbi = audiusSdk.services.entityManager.decodeManageEntity(
const decodedAbi = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
return (
Expand All @@ -23,14 +23,14 @@ export const isUserDeactivate = (
}

export const isTrackDownload = (encodedABI: string) => {
const decodedAbi = audiusSdk.services.entityManager.decodeManageEntity(
const decodedAbi = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
return decodedAbi.action === 'Download' && decodedAbi.entityType === 'Track'
}

export const isViewNotification = (encodedABI: string): boolean => {
const decodedAbi = audiusSdk.services.entityManager.decodeManageEntity(
const decodedAbi = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
return (
Expand All @@ -39,7 +39,7 @@ export const isViewNotification = (encodedABI: string): boolean => {
}

export const isViewPlaylistNotification = (encodedABI: string): boolean => {
const decodedAbi = audiusSdk.services.entityManager.decodeManageEntity(
const decodedAbi = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
return (
Expand Down
2 changes: 1 addition & 1 deletion apps/relay/src/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { audiusSdk } from '.'

/// async in case we need to make a db call
export const validateTransactionData = async (encodedABI: string) => {
const decoded = audiusSdk.services.entityManager.decodeManageEntity(
const decoded = audiusSdk.services.entityManager!.decodeManageEntity(
encodedABI as `0x${string}`
)
// TODO: validate decoded tx with zod
Expand Down
2 changes: 1 addition & 1 deletion apps/solana-relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"web3-utils": "4.2.3"
},
"devDependencies": {
"@audius/sdk": "15.1.0",
"@audius/sdk": "^15.3.1",
"@types/bn.js": "5.2.0",
"@types/body-parser": "1.19.0",
"@types/bs58": "4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/staking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@audius/eth": "1.0.0",
"@audius/sdk": "10.0.0",
"@audius/sdk": "^15.3.1",
"@pedalboard/basekit": "*",
"@pedalboard/logger": "*",
"@pedalboard/storage": "*",
Expand Down
Loading
Loading