[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[PE-6742] Make swaps work for low liquidity AUDIO pair coins - #12786

Merged
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap
Aug 26, 2025
Merged

[PE-6742] Make swaps work for low liquidity AUDIO pair coins #12786
faridsalau merged 17 commits into
mainfrom
fs-ac-double-swap

Conversation

@faridsalau

@faridsalaufaridsalau commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Description

This PR implements a double swap functionality for Jupiter token swaps, allowing tokens to be swapped through an intermediary token (AUDIO) when direct swaps are not available or optimal. This enhances the token swap capabilities by providing an alternative routing mechanism.

Changes

Package Updates

  • Upgraded @jup-ag/api from version 6.0.6 to 6.0.44 across both packages/common and packages/web
  • Updated package-lock.json to reflect the new dependency versions

New Files Added

packages/common/src/api/tan-query/jupiter/directSwap.ts

  • Implements direct token swap functionality using Jupiter
  • Handles single-hop swaps between input and output tokens
  • Includes proper cleanup of temporary ATAs (Associated Token Accounts)
  • Returns swap results with transaction signatures and amount information

packages/common/src/api/tan-query/jupiter/doubleSwap.ts

  • Implements double swap functionality using AUDIO as intermediary token
  • Performs two sequential swaps: InputToken → AUDIO → OutputToken
  • Handles creation and cleanup of intermediate ATAs
  • Manages two separate transactions for the swap chain
  • Returns both transaction signatures for debugging purposes

Technical Details

Double Swap Flow

  1. First Transaction: InputToken → AUDIO

    • Transfer input tokens from user bank to temporary ATA
    • Execute Jupiter swap to AUDIO
    • Store AUDIO in intermediate ATA
    • Clean up input token ATA
  2. Second Transaction: AUDIO → OutputToken

    • Use AUDIO from intermediate ATA
    • Execute Jupiter swap to output token
    • Transfer output tokens to user bank
    • Clean up intermediate AUDIO ATA

How Has This Been Tested?

npm run web:prod and perform a swap between TCONE and TCONE2

@changeset-bot

changeset-botBot commented Aug 21, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 7694f4b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

DiffPackageSupply Chain
Security
VulnerabilityQualityMaintenanceLicense
Addednpm/​@​apollo/​utils.removealiases@​2.0.11001006680100
Addednpm/​@​babel/​plugin-proposal-class-static-block@​7.21.01001006981100
Updatednpm/​@​babel/​helper-plugin-utils@​7.25.9 ⏵ 7.26.51001006989100
Addednpm/​@​apollo/​utils.printwithreducedwhitespace@​2.0.11001006980100
Updatednpm/​@​babel/​helper-validator-option@​7.22.15 ⏵ 7.27.11001006989100
Updatednpm/​@​babel/​highlight@​7.22.20 ⏵ 7.23.41001007083100
Addednpm/​@​apollo/​utils.sortast@​2.0.11001007080100
Addednpm/​@​babel/​preset-typescript@​7.22.151001007089100
Updatednpm/​@​babel/​helper-validator-identifier@​7.25.9 ⏵ 7.27.11001007189100
Updatednpm/​@​babel/​helper-function-name@​7.22.5 ⏵ 7.23.01001007181100
Addednpm/​@​babel/​register@​7.7.0991007194100
Updatednpm/​@​babel/​code-frame@​7.22.13 ⏵ 7.27.110010072+189100
Addednpm/​@​babel/​plugin-transform-runtime@​7.18.2991007291100
Updatednpm/​@​babel/​helper-compilation-targets@​7.22.15 ⏵ 7.27.110010073+193+4100
Addednpm/​@​apollo/​utils.stripsensitiveliterals@​2.0.11001007380100
Updatednpm/​@​babel/​helper-module-imports@​7.22.15 ⏵ 7.27.110010073+189100
Addednpm/​@​babel/​plugin-transform-react-jsx@​7.21.01001007489100
Addednpm/​@​apollo/​utils.dropunuseddefinitions@​2.0.11001007480100
Updatednpm/​@​babel/​template@​7.22.15 ⏵ 7.27.1100+110074+190100
Addednpm/​@​babel/​helper-define-polyfill-provider@​0.3.3991007486100
Addednpm/​@​apollo/​utils.usagereporting@​2.1.01001007480100
Addednpm/​@​babel/​cli@​7.7.0991007595100
Addednpm/​@​babel/​preset-env@​7.22.15961007594100
Addednpm/​@​audius/​fetch-nft@​0.2.8751009985100
Updatednpm/​@​babel/​helper-module-transforms@​7.22.20 ⏵ 7.27.1100+110075+194+5100
Updatednpm/​@​babel/​parser@​7.22.16 ⏵ 7.27.110010076-397100
Updatednpm/​@​babel/​compat-data@​7.22.20 ⏵ 7.27.1100+110076+196+4100
Updatednpm/​@​audius/​hedgehog@​2.1.0 ⏵ 3.0.0-alpha.177+21009484100
Addednpm/​@​apollo/​utils.logger@​2.0.11001007780100
Addednpm/​@​audius/​stems@​0.3.10771009384100
Updatednpm/​@​babel/​generator@​7.22.15 ⏵ 7.27.110010078+196+2100
Updatednpm/​@​babel/​traverse@​7.22.20 ⏵ 7.27.1100+1100+7578+196100
See 16 more rows in the dashboard

View full report

@socket-security

socket-securityBot commented Aug 21, 2025

Copy link
Copy Markdown

Caution

Review the following alerts detected in dependencies.

According to your organization's Security Policy, you must resolve all "Block" alerts before proceeding. Learn more about Socket for GitHub.

ActionSeverityAlert (click "▶" to expand/collapse)
BlockCritical
npm/form-data@4.0.1 has a Critical CVE.

CVE:GHSA-fjxv-7rqg-78g4 form-data uses unsafe random function in form-data for choosing boundary (CRITICAL)

Affected versions: < 2.5.4; >= 3.0.0 < 3.0.4; >= 4.0.0 < 4.0.4

Patched version: 4.0.4

From:package-lock.jsonnpm/form-data@4.0.1

ℹ Read more on: This package | This alert | What is a critical CVE?

Next steps: Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support@socket.dev.

Suggestion: Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Mark the package as acceptable risk. To ignore this alert only in this pull request, reply with the comment @SocketSecurity ignore npm/form-data@4.0.1. You can also ignore all packages with @SocketSecurity ignore-all. To ignore an alert for all future pull requests, use Socket's Dashboard to change the triage state of this alert.

View full report

Comment threadpackages/common/src/api/tan-query/jupiter/useSwapTokens.ts Outdated
@faridsalaufaridsalau changed the title Fs ac double swap[PE-6742] Make swaps work for low liquidity AUDIO pair coins Aug 22, 2025
"@audius/sdk": "*",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@jup-ag/api": "6.0.6",
"@jup-ag/api": "6.0.44",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most recent version. had to update to get dynamicSlippage

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@faridsalau
faridsalau marked this pull request as ready for review August 22, 2025 16:56

@raymondjacobsonraymondjacobson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the slow review here, thought I submitted friday!

@@ -0,0 +1,239 @@
import { SwapRequest } from '@jup-ag/api'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i think this would be more self evident if it was named indirectSwap or indirectSwapThroughAudio

* Attempts to get a direct quote from Jupiter for the given token pair.
* Returns true if a direct quote is available, false otherwise.
*/
const isDirectRouteAvailable = async (

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good helper

}

const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
'2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this address?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address lookup table that we setup for swaps

@faridsalau
faridsalau merged commit 31710a0 into mainAug 26, 2025
8 of 12 checks passed
@faridsalau
faridsalau deleted the fs-ac-double-swap branch August 26, 2025 15:18
audius-infra pushed a commit that referenced this pull request Aug 30, 2025
[2ea203a] Finalize send audio flow (#12824) Dylan Jeffers
[538bbb2] [PE-6773] Make indirect swaps use userbanks for all interactions and use confirmed for commitment level (#12825) Farid Salau
[2a7161a] [QA-2313] Fix receive button on audio page (#12823) Dylan Jeffers
[cb15e5e] Hide tier for official Audius account (#12819) Reed
[84c191e] [PE-6710] Fix optimistic updates after token swaps (#12818) Reed
[4a3cff0] [PE-6752][PE-6697] Swap flow QA updates (#12811) Farid Salau
[30bb833] [QA-2295] Fix web chat messages getting cut off (#12817) Reed
[c1a9683] [PE-6737] Connect the buy/sell flow to the mobile coin details balance card (#12808) KJ
[5b3b909] Fix audio matching copy that got missed (#12816) Randy Schott
[ca80e02] Fix explore screen feature flags (#12815) Dylan Jeffers
[0b26b53] [QA-2255] Fix mobile lineup & playback bugs (continues playing same track after playing a new lineup page) (#12814) JD Francis
[9f8b7dc] [QA-2299] "View Profile" instead of "Artist Page" (#12813) Reed
[365d66f] [QA-2296|QA-2298] RC QA Fixes (#12812) JD Francis
[07378e7] [PE-6691] Show AUDIO card if user doesn't have any other assets (#12807) Farid Salau
[143e376] [PE-6722] Only show badge that user created if they have one (#12806) Farid Salau
[4828631] [PE-6641|PE-6642] Artist coin popover fixes (#12804) JD Francis
[cdaa316] Fix connected wallet copying wrong address (#12805) JD Francis
[4cf1222] [QA-2287] Use X handles in x shares (#12803) Reed
[80ec4c6] [PE-6540] Fix artist coin blast logos (#12798) Reed
[d6e82d5] Fix flakey ampm test (#12778) Ray Jacobson
[9726cb7] [PE-6716] Fix AssetDetailsPage wrong bottom padding (#12802) Reed
[c0b6b6a] [PE-6745] Change 'likes' to 'favorites' on remix sort dropdown (#12796) Reed
[a70db6e] [PE-6706] Fix userbadge gap (#12801) Reed
[dd249a7] Several QA fixes and UI updates (#12795) Farid Salau
[31710a0] [PE-6742] Make swaps work for low liquidity AUDIO pair coins (#12786) Farid Salau
[ac41903] [PE-6731] Update discord oauth url (#12799) JD Francis
[6e2df32] [PE-6681] Fix DMs Header right padding issue (#12800) KJ
[84ae6cb] [QA-2255] Fix android playback issue (#12797) JD Francis
[6faaad9] [PE-6708][PE-6713] Fixes to artist coin members leaderboard (#12794) JD Francis
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@faridsalau@raymondjacobson