From 862b5dcaed215c6cc0d307db312372778795652c Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:45:56 -0700 Subject: [PATCH 1/8] Fix priority fee calculations, add priority fees to tips, challenges --- packages/libs/src/sdk/api/albums/AlbumsApi.ts | 8 +++- .../src/sdk/api/challenges/ChallengesApi.ts | 10 ++++- packages/libs/src/sdk/api/tracks/TracksApi.ts | 8 +++- packages/libs/src/sdk/api/users/UsersApi.ts | 5 ++- .../programs/BaseSolanaProgramClient.ts | 20 +++++---- .../src/sdk/services/Solana/programs/types.ts | 42 +++++++++++++++++-- .../payout-wallet-modal/PayoutWalletModal.tsx | 10 ++--- 7 files changed, 80 insertions(+), 23 deletions(-) diff --git a/packages/libs/src/sdk/api/albums/AlbumsApi.ts b/packages/libs/src/sdk/api/albums/AlbumsApi.ts index 853c4acf065..685cd2de492 100644 --- a/packages/libs/src/sdk/api/albums/AlbumsApi.ts +++ b/packages/libs/src/sdk/api/albums/AlbumsApi.ts @@ -45,6 +45,8 @@ import { UploadAlbumRequest } from './types' +const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150000 + export class AlbumsApi { private readonly playlistsApi: PlaylistsApi constructor( @@ -358,7 +360,8 @@ export class AlbumsApi { locationMemoInstruction ], priorityFee: { - microLamports: 100000 + priority: 'VERY_HIGH', + minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS } }) return transaction @@ -399,7 +402,8 @@ export class AlbumsApi { locationMemoInstruction ], priorityFee: { - microLamports: 100000 + priority: 'VERY_HIGH', + minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS } }) return transaction diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index dd1a71c904f..13b959aeea1 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -243,7 +243,10 @@ export class ChallengesApi extends BaseAPI { senderEthAddress: antiAbuseOracleEthAddress }) const submitAAOTransaction = await this.rewardManager.buildTransaction({ - instructions: [aaoSubmitSecpInstruction, aaoSubmitInstruction] + instructions: [aaoSubmitSecpInstruction, aaoSubmitInstruction], + priorityFee: { + priority: 'VERY_HIGH' + } }) return { transactionSignature: await this.rewardManager.sendTransaction( @@ -351,7 +354,10 @@ export class ChallengesApi extends BaseAPI { amount }) const transaction = await this.rewardManager.buildTransaction({ - instructions: [instruction] + instructions: [instruction], + priorityFee: { + priority: 'VERY_HIGH' + } }) // Skip preflight since we likely just submitted the attestations and // the chosen RPC's state might not yet reflect that diff --git a/packages/libs/src/sdk/api/tracks/TracksApi.ts b/packages/libs/src/sdk/api/tracks/TracksApi.ts index af1e78bde28..898b763f091 100644 --- a/packages/libs/src/sdk/api/tracks/TracksApi.ts +++ b/packages/libs/src/sdk/api/tracks/TracksApi.ts @@ -51,6 +51,8 @@ import { GetPurchaseTrackTransactionSchema } from './types' +const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150000 + // Extend that new class export class TracksApi extends GeneratedTracksApi { private readonly trackUploadHelper: TrackUploadHelper @@ -514,7 +516,8 @@ export class TracksApi extends GeneratedTracksApi { locationMemoInstruction ], priorityFee: { - microLamports: 100000 + priority: 'VERY_HIGH', + minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS } }) return transaction @@ -555,7 +558,8 @@ export class TracksApi extends GeneratedTracksApi { locationMemoInstruction ], priorityFee: { - microLamports: 100000 + priority: 'VERY_HIGH', + minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS } }) return transaction diff --git a/packages/libs/src/sdk/api/users/UsersApi.ts b/packages/libs/src/sdk/api/users/UsersApi.ts index 8348f5c6e44..d96fbad61e7 100644 --- a/packages/libs/src/sdk/api/users/UsersApi.ts +++ b/packages/libs/src/sdk/api/users/UsersApi.ts @@ -340,7 +340,10 @@ export class UsersApi extends GeneratedUsersApi { }) const transaction = await this.claimableTokens.buildTransaction({ - instructions: [secp, transfer] + instructions: [secp, transfer], + priorityFee: { + priority: 'VERY_HIGH' + } }) return await this.claimableTokens.sendTransaction(transaction) } diff --git a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts index c41ebb1e463..ff4d97bcde6 100644 --- a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts +++ b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts @@ -123,18 +123,22 @@ export class BaseSolanaProgramClient { ) } else { const res = await this.connection.getRecentPrioritizationFees() - const orderedFees = res.map((r) => r.prioritizationFee).sort() + const orderedFees = res + .map((r) => r.prioritizationFee) + .sort((a, b) => a - b) const percentile = 'percentile' in priorityFee ? priorityFee.percentile : priorityToPercentileMap[priorityFee.priority] - const microLamports = - orderedFees[ - Math.max( - Math.round((percentile / 100.0) * orderedFees.length - 1), - 0 - ) - ] + const percentileIndex = Math.max( + Math.round((percentile / 100.0) * orderedFees.length - 1), + 0 + ) + const microLamports = Math.max( + (orderedFees[percentileIndex] ?? 0) + + (priorityFee.additionalMicroLamports ?? 0), + priorityFee.minimumMicroLamports ?? 0 + ) if (microLamports !== undefined) { instructions.push( ComputeBudgetProgram.setComputeUnitPrice({ diff --git a/packages/libs/src/sdk/services/Solana/programs/types.ts b/packages/libs/src/sdk/services/Solana/programs/types.ts index 178a5a51b89..bbc00ad2fbb 100644 --- a/packages/libs/src/sdk/services/Solana/programs/types.ts +++ b/packages/libs/src/sdk/services/Solana/programs/types.ts @@ -49,16 +49,52 @@ export const BuildTransactionSchema = z .default([]) ]) .optional(), + /** + * Adds a ComputeBudget instruction to set the compute unit price for the + * transaction. Can specify a percentile or percentile enum to use recent + * prioritization fees to programatically set the price. + */ priorityFee: z .union([ z.object({ - microLamports: z.number() + /** + * The exact amount of microLamports to add per compute unit. + */ + microLamports: z.number().min(0) }), z.object({ - percentile: z.number().min(0).max(100) + /** + * Specify the precise percentile (0-100) of recent priority fees + * to use as this transactions priority fee per compute unit. + */ + percentile: z.number().min(0).max(100), + /** + * The minimum microLamports to use as the priority fee per compute + * unit, regardless of the percentiles. + */ + minimumMicroLamports: z.number().min(0).optional(), + /** + * Additional microLamports to add to the percentile-based priority + * fee per compute unit. + */ + additionalMicroLamports: z.number().min(0).optional() }), z.object({ - priority: PrioritySchema + /** + * Specify an enum-based percentile of recent priority fees to use as + * this transactions priority fee per compute unit. + */ + priority: PrioritySchema, + /** + * The minimum microLamports to use as the priority fee per compute + * unit, regardless of the percentiles. + */ + minimumMicroLamports: z.number().min(0).optional(), + /** + * Additional microLamports to add to the percentile-based priority + * fee per compute unit. + */ + additionalMicroLamports: z.number().min(0).optional() }) ]) .optional() diff --git a/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx b/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx index 06742605e44..66789ecb083 100644 --- a/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx +++ b/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx @@ -244,11 +244,11 @@ export const PayoutWalletModal = () => { ataPubkey, addressPubkey, usdcMint - ), - ComputeBudgetProgram.setComputeUnitPrice({ - microLamports: 100000 - }) - ] + ) + ], + priorityFee: { + microLamports: 100000 + } }) const { signature } = await sdk.services.solanaRelay.relay({ From f5b33708cfafe30c32c21bdfc3bec0cbaa7fd27d Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:49:04 -0700 Subject: [PATCH 2/8] Missed one --- packages/libs/src/sdk/api/challenges/ChallengesApi.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index 13b959aeea1..7a9978fa2eb 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -320,7 +320,10 @@ export class ChallengesApi extends BaseAPI { senderEthAddress }) const submitTransaction = await this.rewardManager.buildTransaction({ - instructions: [secpInstruction, submitInstruction] + instructions: [secpInstruction, submitInstruction], + priorityFee: { + priority: 'VERY_HIGH' + } }) transactions.push(submitTransaction) } From 903bad3e6892ab479704be082fa7b3c86f83e0fb Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:52:06 -0700 Subject: [PATCH 3/8] Add minimums --- .../libs/src/sdk/api/challenges/ChallengesApi.ts | 11 ++++++++--- packages/libs/src/sdk/api/users/UsersApi.ts | 3 ++- .../Solana/programs/BaseSolanaProgramClient.ts | 3 +-- .../libs/src/sdk/services/Solana/programs/types.ts | 14 ++------------ 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index 7a9978fa2eb..48db6fac93d 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -27,6 +27,8 @@ import { GenerateSpecifierSchema } from './types' +const CHALLENGES_MINIMUM_MICRO_LAMPORTS = 100000 + export class ChallengesApi extends BaseAPI { constructor( config: Configuration, @@ -245,7 +247,8 @@ export class ChallengesApi extends BaseAPI { const submitAAOTransaction = await this.rewardManager.buildTransaction({ instructions: [aaoSubmitSecpInstruction, aaoSubmitInstruction], priorityFee: { - priority: 'VERY_HIGH' + priority: 'VERY_HIGH', + minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS } }) return { @@ -322,7 +325,8 @@ export class ChallengesApi extends BaseAPI { const submitTransaction = await this.rewardManager.buildTransaction({ instructions: [secpInstruction, submitInstruction], priorityFee: { - priority: 'VERY_HIGH' + priority: 'VERY_HIGH', + minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS } }) transactions.push(submitTransaction) @@ -359,7 +363,8 @@ export class ChallengesApi extends BaseAPI { const transaction = await this.rewardManager.buildTransaction({ instructions: [instruction], priorityFee: { - priority: 'VERY_HIGH' + priority: 'VERY_HIGH', + minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS } }) // Skip preflight since we likely just submitted the attestations and diff --git a/packages/libs/src/sdk/api/users/UsersApi.ts b/packages/libs/src/sdk/api/users/UsersApi.ts index d96fbad61e7..8d9e3f4073c 100644 --- a/packages/libs/src/sdk/api/users/UsersApi.ts +++ b/packages/libs/src/sdk/api/users/UsersApi.ts @@ -342,7 +342,8 @@ export class UsersApi extends GeneratedUsersApi { const transaction = await this.claimableTokens.buildTransaction({ instructions: [secp, transfer], priorityFee: { - priority: 'VERY_HIGH' + priority: 'VERY_HIGH', + minimumMicroLamports: 100000 } }) return await this.claimableTokens.sendTransaction(transaction) diff --git a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts index ff4d97bcde6..e2495956532 100644 --- a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts +++ b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts @@ -135,8 +135,7 @@ export class BaseSolanaProgramClient { 0 ) const microLamports = Math.max( - (orderedFees[percentileIndex] ?? 0) + - (priorityFee.additionalMicroLamports ?? 0), + orderedFees[percentileIndex] ?? 0, priorityFee.minimumMicroLamports ?? 0 ) if (microLamports !== undefined) { diff --git a/packages/libs/src/sdk/services/Solana/programs/types.ts b/packages/libs/src/sdk/services/Solana/programs/types.ts index bbc00ad2fbb..6887251c286 100644 --- a/packages/libs/src/sdk/services/Solana/programs/types.ts +++ b/packages/libs/src/sdk/services/Solana/programs/types.ts @@ -72,12 +72,7 @@ export const BuildTransactionSchema = z * The minimum microLamports to use as the priority fee per compute * unit, regardless of the percentiles. */ - minimumMicroLamports: z.number().min(0).optional(), - /** - * Additional microLamports to add to the percentile-based priority - * fee per compute unit. - */ - additionalMicroLamports: z.number().min(0).optional() + minimumMicroLamports: z.number().min(0).optional() }), z.object({ /** @@ -89,12 +84,7 @@ export const BuildTransactionSchema = z * The minimum microLamports to use as the priority fee per compute * unit, regardless of the percentiles. */ - minimumMicroLamports: z.number().min(0).optional(), - /** - * Additional microLamports to add to the percentile-based priority - * fee per compute unit. - */ - additionalMicroLamports: z.number().min(0).optional() + minimumMicroLamports: z.number().min(0).optional() }) ]) .optional() From 5f51484b1bdd6b160e8188ee7dc7e879ea00eda3 Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:56:36 -0700 Subject: [PATCH 4/8] Changeset --- .changeset/dull-seahorses-kick.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/dull-seahorses-kick.md diff --git a/.changeset/dull-seahorses-kick.md b/.changeset/dull-seahorses-kick.md new file mode 100644 index 00000000000..a6d9cde97d6 --- /dev/null +++ b/.changeset/dull-seahorses-kick.md @@ -0,0 +1,5 @@ +--- +'@audius/sdk': patch +--- + +Add ComputeBudget unit price instructions (priority fees) to Solana transactions From 11e3261b66df06a08513e6a1a91226f152a02023 Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:22:56 -0700 Subject: [PATCH 5/8] add underscores and make all fees the same --- packages/libs/src/sdk/api/albums/AlbumsApi.ts | 2 +- packages/libs/src/sdk/api/challenges/ChallengesApi.ts | 2 +- packages/libs/src/sdk/api/tracks/TracksApi.ts | 2 +- packages/libs/src/sdk/api/users/UsersApi.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/libs/src/sdk/api/albums/AlbumsApi.ts b/packages/libs/src/sdk/api/albums/AlbumsApi.ts index 685cd2de492..4af8d7cea18 100644 --- a/packages/libs/src/sdk/api/albums/AlbumsApi.ts +++ b/packages/libs/src/sdk/api/albums/AlbumsApi.ts @@ -45,7 +45,7 @@ import { UploadAlbumRequest } from './types' -const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150000 +const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150_000 export class AlbumsApi { private readonly playlistsApi: PlaylistsApi diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index 48db6fac93d..333af506231 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -27,7 +27,7 @@ import { GenerateSpecifierSchema } from './types' -const CHALLENGES_MINIMUM_MICRO_LAMPORTS = 100000 +const CHALLENGES_MINIMUM_MICRO_LAMPORTS = 150_000 export class ChallengesApi extends BaseAPI { constructor( diff --git a/packages/libs/src/sdk/api/tracks/TracksApi.ts b/packages/libs/src/sdk/api/tracks/TracksApi.ts index 898b763f091..4a2a8af0d06 100644 --- a/packages/libs/src/sdk/api/tracks/TracksApi.ts +++ b/packages/libs/src/sdk/api/tracks/TracksApi.ts @@ -51,7 +51,7 @@ import { GetPurchaseTrackTransactionSchema } from './types' -const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150000 +const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150_000 // Extend that new class export class TracksApi extends GeneratedTracksApi { diff --git a/packages/libs/src/sdk/api/users/UsersApi.ts b/packages/libs/src/sdk/api/users/UsersApi.ts index 8d9e3f4073c..fe99a30b5d8 100644 --- a/packages/libs/src/sdk/api/users/UsersApi.ts +++ b/packages/libs/src/sdk/api/users/UsersApi.ts @@ -343,7 +343,7 @@ export class UsersApi extends GeneratedUsersApi { instructions: [secp, transfer], priorityFee: { priority: 'VERY_HIGH', - minimumMicroLamports: 100000 + minimumMicroLamports: 150_000 } }) return await this.claimableTokens.sendTransaction(transaction) From 0788f0d21273bebfde85351eb4eb41e14ae1c987 Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:23:14 -0700 Subject: [PATCH 6/8] just make fees the default --- packages/libs/src/sdk/api/albums/AlbumsApi.ts | 14 ++------------ .../libs/src/sdk/api/challenges/ChallengesApi.ts | 6 +----- packages/libs/src/sdk/api/tracks/TracksApi.ts | 14 ++------------ packages/libs/src/sdk/api/users/UsersApi.ts | 6 +----- .../Solana/programs/BaseSolanaProgramClient.ts | 2 +- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/packages/libs/src/sdk/api/albums/AlbumsApi.ts b/packages/libs/src/sdk/api/albums/AlbumsApi.ts index 4af8d7cea18..880e6121366 100644 --- a/packages/libs/src/sdk/api/albums/AlbumsApi.ts +++ b/packages/libs/src/sdk/api/albums/AlbumsApi.ts @@ -45,8 +45,6 @@ import { UploadAlbumRequest } from './types' -const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150_000 - export class AlbumsApi { private readonly playlistsApi: PlaylistsApi constructor( @@ -358,11 +356,7 @@ export class AlbumsApi { routeInstruction, memoInstruction, locationMemoInstruction - ], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS - } + ] }) return transaction } else { @@ -400,11 +394,7 @@ export class AlbumsApi { routeInstruction, memoInstruction, locationMemoInstruction - ], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS - } + ] }) return transaction } diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index 333af506231..649f5c657c9 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -361,11 +361,7 @@ export class ChallengesApi extends BaseAPI { amount }) const transaction = await this.rewardManager.buildTransaction({ - instructions: [instruction], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS - } + instructions: [instruction] }) // Skip preflight since we likely just submitted the attestations and // the chosen RPC's state might not yet reflect that diff --git a/packages/libs/src/sdk/api/tracks/TracksApi.ts b/packages/libs/src/sdk/api/tracks/TracksApi.ts index 4a2a8af0d06..930c6e8e4c8 100644 --- a/packages/libs/src/sdk/api/tracks/TracksApi.ts +++ b/packages/libs/src/sdk/api/tracks/TracksApi.ts @@ -51,8 +51,6 @@ import { GetPurchaseTrackTransactionSchema } from './types' -const PURCHASE_MINIMUM_MICRO_LAMPORTS = 150_000 - // Extend that new class export class TracksApi extends GeneratedTracksApi { private readonly trackUploadHelper: TrackUploadHelper @@ -514,11 +512,7 @@ export class TracksApi extends GeneratedTracksApi { routeInstruction, memoInstruction, locationMemoInstruction - ], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS - } + ] }) return transaction } else { @@ -556,11 +550,7 @@ export class TracksApi extends GeneratedTracksApi { routeInstruction, memoInstruction, locationMemoInstruction - ], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: PURCHASE_MINIMUM_MICRO_LAMPORTS - } + ] }) return transaction } diff --git a/packages/libs/src/sdk/api/users/UsersApi.ts b/packages/libs/src/sdk/api/users/UsersApi.ts index fe99a30b5d8..8348f5c6e44 100644 --- a/packages/libs/src/sdk/api/users/UsersApi.ts +++ b/packages/libs/src/sdk/api/users/UsersApi.ts @@ -340,11 +340,7 @@ export class UsersApi extends GeneratedUsersApi { }) const transaction = await this.claimableTokens.buildTransaction({ - instructions: [secp, transfer], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: 150_000 - } + instructions: [secp, transfer] }) return await this.claimableTokens.sendTransaction(transaction) } diff --git a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts index e2495956532..d59baecf8c6 100644 --- a/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts +++ b/packages/libs/src/sdk/services/Solana/programs/BaseSolanaProgramClient.ts @@ -106,7 +106,7 @@ export class BaseSolanaProgramClient { feePayer, recentBlockhash, addressLookupTables = [], - priorityFee + priorityFee = { priority: 'VERY_HIGH', minimumMicroLamports: 150_000 } } = await parseParams('buildTransaction', BuildTransactionSchema)(params) if (!recentBlockhash) { From a4f84bcad4af329f9bbd97c9bd6a18c60cce25c1 Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:27:22 -0700 Subject: [PATCH 7/8] missed one --- .../src/components/payout-wallet-modal/PayoutWalletModal.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx b/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx index 66789ecb083..152a0e7a3b5 100644 --- a/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx +++ b/packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx @@ -245,10 +245,7 @@ export const PayoutWalletModal = () => { addressPubkey, usdcMint ) - ], - priorityFee: { - microLamports: 100000 - } + ] }) const { signature } = await sdk.services.solanaRelay.relay({ From 8c7dfbf1a25b7c5de77ad8b36224e13f2778e3cf Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:28:41 -0700 Subject: [PATCH 8/8] missed another --- .../libs/src/sdk/api/challenges/ChallengesApi.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts index 649f5c657c9..dd1a71c904f 100644 --- a/packages/libs/src/sdk/api/challenges/ChallengesApi.ts +++ b/packages/libs/src/sdk/api/challenges/ChallengesApi.ts @@ -27,8 +27,6 @@ import { GenerateSpecifierSchema } from './types' -const CHALLENGES_MINIMUM_MICRO_LAMPORTS = 150_000 - export class ChallengesApi extends BaseAPI { constructor( config: Configuration, @@ -245,11 +243,7 @@ export class ChallengesApi extends BaseAPI { senderEthAddress: antiAbuseOracleEthAddress }) const submitAAOTransaction = await this.rewardManager.buildTransaction({ - instructions: [aaoSubmitSecpInstruction, aaoSubmitInstruction], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS - } + instructions: [aaoSubmitSecpInstruction, aaoSubmitInstruction] }) return { transactionSignature: await this.rewardManager.sendTransaction( @@ -323,11 +317,7 @@ export class ChallengesApi extends BaseAPI { senderEthAddress }) const submitTransaction = await this.rewardManager.buildTransaction({ - instructions: [secpInstruction, submitInstruction], - priorityFee: { - priority: 'VERY_HIGH', - minimumMicroLamports: CHALLENGES_MINIMUM_MICRO_LAMPORTS - } + instructions: [secpInstruction, submitInstruction] }) transactions.push(submitTransaction) }