Merge branch 'main' into as/proto-1775-rm-tcr-env

.changeset/lucky-otters-look.md

@@ -0,0 +1,5 @@
+---
+'@audius/sdk': major
+---
+
+Change type filter on getUSDCTransactions to be an array rather than a single enum, to allow for multiple filters.

.circleci/config.yml

@@ -72,6 +72,7 @@ jobs:
           key: cache-{{ checksum "package-lock.json" }}-{{ checksum "combined-patch-file.txt" }}
           paths:
             - ./node_modules
+            - ./protocol-dashboard/node_modules
             - ./packages/web/node_modules
             - ./packages/mobile/node_modules
             - ./packages/embed/node_modules
@@ -106,8 +107,6 @@ jobs:
       - run:
           name: Create + push branch
           command: |
-            git checkout main
-
             OLD_VERSION=$(jq -r .version packages/discovery-provider/.version.json)
             NEW_VERSION=$(echo ${OLD_VERSION} | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g')
 
@@ -121,8 +120,17 @@ jobs:
             mv /tmp/.version.json packages/discovery-provider/.version.json
             git add packages/discovery-provider/.version.json
 
+            PROTOCOL_DIRS=$(bash ./scripts/get-release-dirs.sh protocol)
+            CHANGELOG=$(git log --pretty=format:"[%h] %s %an" --date=short protocol-v${OLD_VERSION}..HEAD -- ${PROTOCOL_DIRS})
+            MESSAGE="Audius Protocol v${NEW_VERSION}
+
+            ${CHANGELOG}"
+            git commit -m "${MESSAGE}"
+
+            git tag protocol-v${NEW_VERSION}
+            git push origin protocol-v${NEW_VERSION}
+
             # Weird way to push both to main and the new release branch
-            git commit -m "Bump version to $NEW_VERSION"
             git branch "release-v$NEW_VERSION"
             git checkout "release-v$NEW_VERSION"
             git push --set-upstream origin main "release-v$NEW_VERSION"

.circleci/src/jobs/@protocol-dashboard-jobs.yml

@@ -28,6 +28,7 @@ protocol-dashboard-init:
         root: ./
         paths:
           - node_modules
+          - protocol-dashboard/node_modules
           - packages/harmony/node_modules
           - packages/common/node_modules
           - packages/libs/node_modules

.circleci/src/jobs/@root-jobs.yml

@@ -1,8 +1,7 @@
-# Publish github release for the current tag
-root-publish-github-release:
+root-publish-github-release-client:
   working_directory: ~/audius-protocol
   docker:
-    - image: cibuilds/github:0.10
+    - image: cibuilds/github:0.13
   steps:
     - checkout
     - attach_workspace:
@@ -13,3 +12,18 @@ root-publish-github-release:
           VERSION=$(jq -r .version ./package.json)
           CHANGELOG=$(git log --format=%B -n 1)
           ghr -t ${GHI_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -b "${CHANGELOG}" -soft client-v${VERSION} ./
+
+root-publish-github-release-protocol:
+  working_directory: ~/audius-protocol
+  docker:
+    - image: cibuilds/github:0.13
+  steps:
+    - checkout
+    - attach_workspace:
+        at: ./
+    - run:
+        name: 'Publish Release on GitHub'
+        command: |
+          VERSION=$(jq -r .version ./packages/discovery-provider/.version.json)
+          CHANGELOG=$(git log --format=%B -n 1)
+          ghr -t ${GHI_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -b "${CHANGELOG}" -soft protocol-v${VERSION} ./

.circleci/src/workflows/root.yml

@@ -1,6 +1,12 @@
 jobs:
-  - root-publish-github-release:
+  - root-publish-github-release-client:
       context: Audius Client
       filters:
         branches:
-          only: /(^release.*)$/
+          only: /(^release-client-v.*)$/
+  - root-publish-github-release-protocol:
+      # Audius Client context contains the GHI token
+      context: Audius Client
+      filters:
+        branches:
+          only: /(^release-v.*)$/

.github/workflows/publish-packages.yml

@@ -40,15 +40,14 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'npm'
-          cache-dependency-path: |
-            package-lock.json
-            packages/*/patches/*.patch
 
       - uses: actions/cache@v3
         with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-${{ matrix.node-version }}-npmcache-${{ hashFiles('package-lock.json') }}-${{ hashFiles('packages/*/patches/*.patch') }}
+          path: '**/node_modules'
+          key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('packages/*/patches/*.patch') }}
+
+      - name: Install Dependencies
+        run: npm i
 
       - name: Update .npmrc
         run: |

.vscode/settings.json

@@ -26,7 +26,10 @@
     "editor.defaultFormatter": "ms-python.black-formatter"
   },
   "editor.find.addExtraSpaceOnTop": false,
-  "eslint.workingDirectories": [{ "pattern": "./packages/*/" }],
+  "eslint.workingDirectories": [
+    { "pattern": "./packages/*/" },
+    { "pattern": "./protocol-dashboard" }
+  ],
   "editor.codeActionsOnSave": {
     "source.fixAll": "explicit"
   },

dev-tools/setup.sh

@@ -54,22 +54,22 @@ debian | ubuntu)
     ;;
 *)
     if ! command -v docker &>/dev/null; then
-        echo "Docker is not installed. Please install docker and try again."
+        echo "Docker is not installed. Please install docker and try again." >&2
         exit 1
     fi
 
     if ! command -v python3 &>/dev/null; then
-        echo "Python3 is not installed. Please install python3 and try again."
+        echo "Python3 is not installed. Please install python3 and try again." >&2
         exit 1
     fi
 
     if ! command -v pip3 &>/dev/null; then
-        echo "pip3 is not installed. Please install pip3 and try again."
+        echo "pip3 is not installed. Please install pip3 and try again." >&2
         exit 1
     fi
 
     if ! docker compose version &>/dev/null; then
-        echo "Docker compose v2 is not installed. Please install docker compose v2 and try again."
+        echo "Docker compose v2 is not installed. Please install docker compose v2 and try again." >&2
         exit 1
     fi
     ;;

docs/docs/distributors/specification/metadata.mdx

@@ -36,9 +36,20 @@ The `coverArtFile` maps to two DDEX Fields
 
 #### releaseDate
 
-1. `/DealList/ReleaseDeal/Deal/ValidityPeriod/StartDate`
-2. `/ReleaseList/Release/ReleaseDetailsByTerritory[TerritoryCode="Worldwide"]/ReleaseDate`
-3. `/ReleaseList/Release/GlobalOriginalReleaseDate`
+:::note
+
+The resource will not be published on the Audius platform until the following condition is met:
+
+`current date ≥ max(releaseDate, validity start date from the corresponding deal)`
+
+However the date displayed in the Audius interface will be this `releaseDate` value (determined by
+the hierarchy below).
+
+:::
+
+1. `/ReleaseList/Release/ReleaseDetailsByTerritory[TerritoryCode="Worldwide"]/ReleaseDate`
+2. `/ReleaseList/Release/GlobalOriginalReleaseDate`
+3. `/DealList/ReleaseDeal/Deal/ValidityPeriod/StartDate`
 
 #### userId
 

mediorum/.version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.6.84",
+  "version": "0.6.86",
   "service": "content-node"
 }

monitoring/healthz/src/pages/Nodes.tsx

@@ -193,8 +193,8 @@ function HealthRow({ isContent, sp, isStaging }: { isContent: boolean; sp: SP, i
   const chainDescription: string =
     health.chain_health?.entries['node-health'].description
 
-  const StorageProgressBar = ({ progress }: { progress: number }) => {
-    const progressPercent = (progress / Math.max(progress, MAX_STORAGE_SIZE)) * 100
+  const StorageProgressBar = ({ progress, max }: { progress: number, max: number }) => {
+    const progressPercent = (progress / Math.max(progress, max)) * 100
 
     return (
       <div className="min-w-[200px] relative">
@@ -281,6 +281,7 @@ function HealthRow({ isContent, sp, isStaging }: { isContent: boolean; sp: SP, i
           >
             <StorageProgressBar
               progress={totalMediorumUsed === '?' ? 0 : totalMediorumUsed}
+              max={totalMediorumSize}
             />
             <div className="mt-3 flex">
               {getStorageBackendIcon(health.blobStorePrefix)} <span className="w-[10px]" /> {totalMediorumUsed} / {totalMediorumUsed === '?' ? '?' : Math.max(totalMediorumSize, totalMediorumUsed)} GB