Skip to content

Commit

Permalink
Update userbank function usage to pass config object (#3823)
Browse files Browse the repository at this point in the history
  • Loading branch information
schottra committed Aug 1, 2023
1 parent 8a5419d commit 5da8e8f
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 226 deletions.
6 changes: 3 additions & 3 deletions packages/common/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"url": "https://github.com/AudiusProject/audius-client/issues"
},
"dependencies": {
"@audius/sdk": "3.0.3-beta.97",
"@audius/sdk": "3.0.3-beta.99",
"@fingerprintjs/fingerprintjs-pro": "3.5.6",
"@metaplex-foundation/mpl-token-metadata": "2.5.2",
"@optimizely/optimizely-sdk": "4.0.0",
Expand Down
21 changes: 9 additions & 12 deletions packages/common/src/services/audius-backend/waudio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,17 @@ import { AudiusBackend } from './AudiusBackend'

export const deriveUserBankPubkey = async (
audiusBackendInstance: AudiusBackend,
sourceEthAddress?: string
ethAddress?: string
) => {
const audiusLibs: AudiusLibs = await audiusBackendInstance.getAudiusLibs()
return await audiusLibs.solanaWeb3Manager!.deriveUserBank(sourceEthAddress)
return await audiusLibs.solanaWeb3Manager!.deriveUserBank({ ethAddress })
}

export const deriveUserBankAddress = async (
audiusBackendInstance: AudiusBackend,
sourceEthAddress?: string
ethAddress?: string
) => {
const pubkey = await deriveUserBankPubkey(
audiusBackendInstance,
sourceEthAddress
)
const pubkey = await deriveUserBankPubkey(audiusBackendInstance, ethAddress)
return pubkey.toString() as SolanaWalletAddress
}

Expand All @@ -31,12 +28,12 @@ export const createUserBankIfNeeded = async (
recordAnalytics: (event: AnalyticsEvent, callback?: () => void) => void,
audiusBackendInstance: AudiusBackend,
feePayerOverride: string,
sourceEthAddress?: string
ethAddress?: string
) => {
const audiusLibs: AudiusLibs = await audiusBackendInstance.getAudiusLibs()

const recipientEthAddress =
sourceEthAddress ?? audiusLibs.Account!.getCurrentUser()?.wallet
ethAddress ?? audiusLibs.Account!.getCurrentUser()?.wallet

if (!recipientEthAddress) {
console.error(
Expand All @@ -46,10 +43,10 @@ export const createUserBankIfNeeded = async (
}

try {
const res = await audiusLibs.solanaWeb3Manager!.createUserBankIfNeeded(
const res = await audiusLibs.solanaWeb3Manager!.createUserBankIfNeeded({
feePayerOverride,
sourceEthAddress
)
ethAddress
})

// If it already existed, return early
if ('didExist' in res && res.didExist) {
Expand Down
6 changes: 3 additions & 3 deletions packages/embed/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/embed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"webpack-cli": "4.5.0"
},
"dependencies": {
"@audius/sdk": "3.0.3-beta.97",
"@audius/sdk": "3.0.3-beta.99",
"@audius/stems": "1.5.35",
"amplitude-js": "8.11.1",
"axios": "0.19.2",
Expand Down
62 changes: 31 additions & 31 deletions packages/mobile/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"@amplitude/react-native": "2.6.0",
"@audius/common": "1.5.35",
"@audius/sdk": "3.0.3-beta.97",
"@audius/sdk": "3.0.3-beta.99",
"@fingerprintjs/fingerprintjs-pro-react-native": "2.0.0-test.2",
"@gorhom/portal": "1.0.9",
"@hcaptcha/react-native-hcaptcha": "1.3.4",
Expand Down
5 changes: 4 additions & 1 deletion packages/mobile/src/services/buyCrypto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { audiusLibs, waitForLibsInit } from './libs'

export const getUSDCUserBank = async (ethWallet: string) => {
await waitForLibsInit()
return await audiusLibs?.solanaWeb3Manager?.deriveUserBank(ethWallet, 'usdc')
return await audiusLibs?.solanaWeb3Manager?.deriveUserBank({
ethAddress: ethWallet,
mint: 'usdc'
})
}

export const createStripeSession = async ({
Expand Down

0 comments on commit 5da8e8f

Please sign in to comment.