Skip to content
Merged
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
809 changes: 320 additions & 489 deletions package-lock.json

Large diffs are not rendered by default.

42 changes: 4 additions & 38 deletions packages/libs/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,43 +1,9 @@
{
"extends": [
"standard-with-typescript",
"plugin:mocha/recommended"
],
"parserOptions": {
"project": "./tsconfig.json"
},
"plugins": [
"mocha"
],
"extends": ["audius", "plugin:mocha/recommended"],
"plugins": ["mocha"],
"rules": {
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-extraneous-class": "off",
// Conflict between ESLint + Prettier, rules disabled for now
"@typescript-eslint/space-before-function-paren": "off",
"@typescript-eslint/indent": "off",
"@typescript-eslint/quotes": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/consistent-type-definitions": "off",
"@typescript-eslint/require-array-sort-compare":"off",
"comma-dangle": "off",
"mocha/no-mocha-arrows": "off",
"mocha/max-top-level-suites": "off"
},
"ignorePatterns": [
"jest.config.ts"
],
"overrides": [
{
"files": "**/*.ts",
"extends": [
"plugin:prettier/recommended"
],
"plugins": [
"prettier"
]
}
]
}
"ignorePatterns": ["jest.config.ts"]
}
1 change: 0 additions & 1 deletion packages/libs/.prettierrc.js

This file was deleted.

10 changes: 2 additions & 8 deletions packages/libs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,10 @@
"@types/pify": "5.0.1",
"@types/proper-url-join": "2.1.1",
"@types/semver": "7.3.9",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/eslint-plugin": "6.7.2",
"commander": "9.2.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-standard-with-typescript": "21.0.1",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-mocha": "10.0.3",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-promise": "5.2.0",
"eslint": "8.19.0",
"jest": "29.4.1",
"jest-environment-jsdom": "29.4.1",
"mocha": "9.2.2",
Expand Down
69 changes: 34 additions & 35 deletions packages/libs/src/AudiusLibs.ts
Original file line number Diff line number Diff line change
@@ -1,48 +1,45 @@
import type { provider } from 'web3-core'
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { Keypair } from '@solana/web3.js'
import type { Merge } from 'type-fest'
import type { provider } from 'web3-core'

import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'

import { version } from './version'
import { Web3Config, Web3Manager } from './services/web3Manager'
import { EthContracts } from './services/ethContracts'
import {
SolanaWeb3Manager,
SolanaUtils,
SolanaWeb3Config
} from './services/solana'
import { AudiusContracts } from './services/dataContracts'
import { IdentityService } from './services/identity'
import Web3 from './LibsWeb3'
import { Account } from './api/Account'
import { File } from './api/File'
import { Notifications } from './api/Notifications'
import { Playlists } from './api/Playlist'
import { Reactions } from './api/Reactions'
import { Rewards } from './api/Rewards'
import { ServiceProvider } from './api/ServiceProvider'
import { Track } from './api/Track'
import { Users } from './api/Users'
import type { BaseConstructorArgs } from './api/base'
import { EntityManager } from './api/entityManager'
import { AudiusABIDecoder } from './services/ABIDecoder'
import { Comstock } from './services/comstock'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { CreatorNode, CreatorNodeConfig } from './services/creatorNode'
import { AudiusContracts } from './services/dataContracts'
import {
DiscoveryProvider,
DiscoveryProviderConfig
} from './services/discoveryProvider'
import { Wormhole, WormholeConfig } from './services/wormhole'
import { AudiusABIDecoder } from './services/ABIDecoder'
import { EthContracts } from './services/ethContracts'
import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import { IdentityService } from './services/identity'
import { Schemas, SchemaValidator } from './services/schemaValidator'
import {
SolanaWeb3Manager,
SolanaUtils,
SolanaWeb3Config
} from './services/solana'
import type { MonitoringCallbacks } from './services/types'
import { Web3Config, Web3Manager } from './services/web3Manager'
import { Wormhole, WormholeConfig } from './services/wormhole'
import { UserStateManager } from './userStateManager'
import { Utils, Nullable, Logger, getNStorageNodes } from './utils'
import { ServiceProvider } from './api/ServiceProvider'

import { Account } from './api/Account'
import { Users } from './api/Users'
import { Track } from './api/Track'
import { Playlists } from './api/Playlist'
import { File } from './api/File'
import { Rewards } from './api/Rewards'
import { Reactions } from './api/Reactions'
import { Notifications } from './api/Notifications'
import Web3 from './LibsWeb3'

import { Keypair } from '@solana/web3.js'
import { getPlatformLocalStorage, LocalStorage } from './utils/localStorage'
import type { BaseConstructorArgs } from './api/base'
import type { MonitoringCallbacks } from './services/types'
import { EntityManager } from './api/entityManager'
import { version } from './version'

type LibsIdentityServiceConfig = {
url: string
Expand Down Expand Up @@ -361,7 +358,7 @@ export class AudiusLibs {
preferHigherPatchForPrimary = true,
preferHigherPatchForSecondaries = true,
localStorage = getPlatformLocalStorage(),
useDiscoveryRelay = false,
useDiscoveryRelay = false
}: AudiusLibsConfig) {
// set version

Expand Down Expand Up @@ -545,7 +542,9 @@ export class AudiusLibs {
if (this.web3Config && this.useDiscoveryRelay) {
const web3Manager = this.web3Manager
if (web3Manager === undefined || web3Manager === null) {
console.info("useDiscoveryRelay is set to true but web3Manager is not configured")
console.info(
'useDiscoveryRelay is set to true but web3Manager is not configured'
)
} else {
this.web3Manager?.setDiscoveryProvider(this.discoveryProvider)
}
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/src/LibsWeb3.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Web3Type from 'web3'
import BN from 'bn.js'
import Web3Type from 'web3'
declare const Web3: typeof Web3Type & {
utils: {
BN: typeof BN
Expand Down
51 changes: 25 additions & 26 deletions packages/libs/src/NativeAudiusLibs.ts
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { Keypair } from '@solana/web3.js'
import type { provider } from 'web3-core'

import Web3 from './LibsWeb3'
import { version } from './version'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { Account } from './api/Account'
import { File } from './api/File'
import { Notifications } from './api/Notifications'
import { Playlists } from './api/Playlist'
import { Reactions } from './api/Reactions'
import { Rewards } from './api/Rewards'
import { ServiceProvider } from './api/ServiceProvider'
import { Track } from './api/Track'
import { Users } from './api/Users'
import type { BaseConstructorArgs } from './api/base'
import { EntityManager } from './api/entityManager'
import { Comstock } from './services/comstock'
import { CreatorNode, CreatorNodeConfig } from './services/creatorNode'
import { AudiusContracts } from './services/dataContracts'
import {
DiscoveryProvider,
DiscoveryProviderConfig
} from './services/discoveryProvider'
import { Schemas, SchemaValidator } from './services/schemaValidator'
import { UserStateManager } from './userStateManager'
import type { Logger, Nullable } from './utils'
import { Utils, getNStorageNodes } from './utils'

import { Keypair } from '@solana/web3.js'

import { getPlatformLocalStorage, LocalStorage } from './utils/localStorage'
import { Web3Config, Web3Manager } from './services/web3Manager'
import { EthContracts } from './services/ethContracts'
import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'
import { Comstock } from './services/comstock'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import { IdentityService } from './services/identity'
import { EthContracts } from './services/ethContracts'
import { Schemas, SchemaValidator } from './services/schemaValidator'
import {
SolanaWeb3Manager,
SolanaUtils,
SolanaWeb3Config
} from './services/solana'
import { AudiusContracts } from './services/dataContracts'
import { Account } from './api/Account'
import { Users } from './api/Users'
import { Track } from './api/Track'
import { Playlists } from './api/Playlist'
import { Rewards } from './api/Rewards'
import { Reactions } from './api/Reactions'
import { Notifications } from './api/Notifications'
import { File } from './api/File'
import { ServiceProvider } from './api/ServiceProvider'
import type { BaseConstructorArgs } from './api/base'
import type { MonitoringCallbacks } from './services/types'
import { EntityManager } from './api/entityManager'
import { Web3Config, Web3Manager } from './services/web3Manager'
import {
ProxyWormhole,
ProxyWormholeConfig
} from './services/wormhole/ProxyWormhole'
import { UserStateManager } from './userStateManager'
import { Utils, getNStorageNodes } from './utils'
import type { Logger, Nullable } from './utils'
import { getPlatformLocalStorage, LocalStorage } from './utils/localStorage'
import { version } from './version'

type LibsIdentityServiceConfig = {
url: string
Expand Down
63 changes: 30 additions & 33 deletions packages/libs/src/WebAudiusLibs.ts
Original file line number Diff line number Diff line change
@@ -1,51 +1,48 @@
import type { provider } from 'web3-core'
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { Keypair } from '@solana/web3.js'
import type { Merge } from 'type-fest'
import type { provider } from 'web3-core'

import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'

import { version } from './version'
import { Web3Config, Web3Manager } from './services/web3Manager'
import { EthContracts } from './services/ethContracts'
import {
SolanaWeb3Manager,
SolanaUtils,
SolanaWeb3Config
} from './services/solana'
import { AudiusContracts } from './services/dataContracts'
import { IdentityService } from './services/identity'
import Web3 from './LibsWeb3'
import { Account } from './api/Account'
import { File } from './api/File'
import { Notifications } from './api/Notifications'
import { Playlists } from './api/Playlist'
import { Reactions } from './api/Reactions'
import { Rewards } from './api/Rewards'
import { ServiceProvider } from './api/ServiceProvider'
import { Track } from './api/Track'
import { Users } from './api/Users'
import type { BaseConstructorArgs } from './api/base'
import { EntityManager } from './api/entityManager'
import { AudiusABIDecoder } from './services/ABIDecoder'
import { Comstock } from './services/comstock'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
import { CreatorNode, CreatorNodeConfig } from './services/creatorNode'
import { AudiusContracts } from './services/dataContracts'
import {
DiscoveryProvider,
DiscoveryProviderConfig
} from './services/discoveryProvider'
import { EthContracts } from './services/ethContracts'
import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'
import { Hedgehog, HedgehogConfig } from './services/hedgehog'
import { IdentityService } from './services/identity'
import { Schemas, SchemaValidator } from './services/schemaValidator'
import {
SolanaWeb3Manager,
SolanaUtils,
SolanaWeb3Config
} from './services/solana'
import type { MonitoringCallbacks } from './services/types'
import { Web3Config, Web3Manager } from './services/web3Manager'
import {
ProxyWormhole,
ProxyWormholeConfig
} from './services/wormhole/ProxyWormhole'
import { AudiusABIDecoder } from './services/ABIDecoder'
import { Schemas, SchemaValidator } from './services/schemaValidator'
import { UserStateManager } from './userStateManager'
import { Utils, Nullable, Logger, getNStorageNodes } from './utils'
import { ServiceProvider } from './api/ServiceProvider'

import { Account } from './api/Account'
import { Users } from './api/Users'
import { Track } from './api/Track'
import { Playlists } from './api/Playlist'
import { File } from './api/File'
import { Rewards } from './api/Rewards'
import { Reactions } from './api/Reactions'
import { Notifications } from './api/Notifications'
import Web3 from './LibsWeb3'

import { Keypair } from '@solana/web3.js'
import { getPlatformLocalStorage, LocalStorage } from './utils/localStorage'
import type { BaseConstructorArgs } from './api/base'
import type { MonitoringCallbacks } from './services/types'
import { EntityManager } from './api/entityManager'
import { version } from './version'

type LibsIdentityServiceConfig = {
url: string
Expand Down
14 changes: 8 additions & 6 deletions packages/libs/src/api/Account.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Base, BaseConstructorArgs, Services } from './base'
import { Nullable, UserMetadata, Utils } from '../utils'
import { PublicKey } from '@solana/web3.js'
import type { BN } from 'ethereumjs-util'

import { AuthHeaders } from '../constants'
import { Nullable, UserMetadata, Utils } from '../utils'
import { getPermitDigest, sign } from '../utils/signatures'
import { PublicKey } from '@solana/web3.js'
import type { Users } from './Users'

import type { ServiceProvider } from './ServiceProvider'
import type { BN } from 'ethereumjs-util'
import type { Users } from './Users'
import { Base, BaseConstructorArgs, Services } from './base'

export class Account extends Base {
User: Users
Expand Down Expand Up @@ -566,7 +568,7 @@ export class Account extends Base {
name,
tokenAddress,
chainId,
{ owner: owner, spender: relayerAddress, value: amount },
{ owner, spender: relayerAddress, value: amount },
nonce,
deadline
)
Expand Down
11 changes: 6 additions & 5 deletions packages/libs/src/api/File.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import retry from 'async-retry'
import axios, { ResponseType } from 'axios'
import urlJoin from 'proper-url-join'

import axios, { ResponseType } from 'axios'
import { Base, BaseConstructorArgs, Services } from './base'
import { raceRequests } from '../utils/network'
import retry from 'async-retry'
import type { Users } from './Users'
import type { Nullable } from '../utils'
import { raceRequests } from '../utils/network'

import type { ServiceProvider } from './ServiceProvider'
import type { Users } from './Users'
import { Base, BaseConstructorArgs, Services } from './base'

/**
* Downloads a file using an element in the DOM
Expand Down
4 changes: 3 additions & 1 deletion packages/libs/src/api/Notifications.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import type { TransactionReceipt } from 'web3-core'
import { Base, BaseConstructorArgs, Services } from './base'

import {
Action,
EntityType
} from '../services/dataContracts/EntityManagerClient'
import type { GetUserNotificationsParams } from '../services/discoveryProvider/requests'

import { Base, BaseConstructorArgs, Services } from './base'

type AnnouncementData = {}

export class Notifications extends Base {
Expand Down
Loading