blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ts: if more ixs then more cu (#728) 

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2023-09-21 08:02:23 +02:00 committed by GitHub
parent f44b356826
commit f3431917b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ts/client/src/constants/index.ts
View File

@ -11,6 +11,10 @@ export const RUST_I64_MIN = (): BN => {
return new BN('-9223372036854775807'); return new BN('-9223372036854775807');
}; };
export const COMPUTE_BUDGET_PROGRAM_ID = new PublicKey(
'ComputeBudget111111111111111111111111111111',
);
export const OPENBOOK_PROGRAM_ID = { export const OPENBOOK_PROGRAM_ID = {
devnet: new PublicKey('EoTcMgcDRTJVZDMZWBoU6rhYHZfkNTVEAfz3uUJRcYGj'), devnet: new PublicKey('EoTcMgcDRTJVZDMZWBoU6rhYHZfkNTVEAfz3uUJRcYGj'),
'mainnet-beta': new PublicKey('srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX'), 'mainnet-beta': new PublicKey('srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX'),

13
ts/client/src/utils/rpc.ts
View File

@ -5,7 +5,6 @@ import {
AddressLookupTableAccount, AddressLookupTableAccount,
ComputeBudgetProgram, ComputeBudgetProgram,
MessageV0, MessageV0,
PublicKey,
Signer, Signer,
TransactionConfirmationStatus, TransactionConfirmationStatus,
TransactionError, TransactionError,
@ -13,6 +12,7 @@ import {
TransactionSignature, TransactionSignature,
VersionedTransaction, VersionedTransaction,
} from '@solana/web3.js'; } from '@solana/web3.js';
import { COMPUTE_BUDGET_PROGRAM_ID } from '../constants';
export interface MangoSignatureStatus { export interface MangoSignatureStatus {
slot: number; slot: number;
@ -45,15 +45,18 @@ export async function sendTransaction(
// https://github.com/solana-labs/solana-web3.js/blob/master/packages/library-legacy/src/programs/compute-budget.ts#L202 // https://github.com/solana-labs/solana-web3.js/blob/master/packages/library-legacy/src/programs/compute-budget.ts#L202
const computeUnitLimitIxFound = ixs.some( const computeUnitLimitIxFound = ixs.some(
(ix) => (ix) =>
ix.programId.equals( ix.programId.equals(COMPUTE_BUDGET_PROGRAM_ID) &&
new PublicKey('ComputeBudget111111111111111111111111111111'), u8().decode(ix.data.subarray(0, 1)) == 2,
) && u8().decode(ix.data.subarray(0, 1)) == 2,
); );
if (!computeUnitLimitIxFound) { if (!computeUnitLimitIxFound) {
const totalUserIntendedIxs = ixs.filter(
(ix) => !ix.programId.equals(COMPUTE_BUDGET_PROGRAM_ID),
).length;
const requestCu = Math.min(totalUserIntendedIxs * 250_000, 1_600_000);
ixs = [ ixs = [
ComputeBudgetProgram.setComputeUnitLimit({ ComputeBudgetProgram.setComputeUnitLimit({
units: 250_000, units: requestCu,
}), }),
...ixs, ...ixs,
]; ];