From 4610958316cdb294d6b2c275f1a03f513abe209f Mon Sep 17 00:00:00 2001 From: aalu1418 <50029043+aalu1418@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:16:40 -0600 Subject: [PATCH] update gauntlet --- .../gauntlet-serum-multisig/src/commands/multisig.ts | 4 ++-- .../src/commands/abstract/close.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts index 3c2c8ecea..e34a5ecb0 100644 --- a/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts +++ b/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts @@ -1,7 +1,7 @@ import { SolanaCommand, utils } from '@chainlink/gauntlet-solana' import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils' import { PublicKey, Keypair, TransactionInstruction, SystemProgram, AccountMeta } from '@solana/web3.js' -import { Program } from '@coral-xyz/anchor' +import { Program, Idl } from '@coral-xyz/anchor' import { MAX_BUFFER_SIZE } from '../lib/constants' import { isDeepEqual } from '../lib/utils' import { CONTRACT_LIST, getContract } from '../lib/contracts' @@ -35,7 +35,7 @@ type ProposalState = { export const wrapCommand = (command) => { return class Multisig extends SolanaCommand { command: SolanaCommand - program: any // TODO: typing Program doesn't validate + program: Program multisigAddress: PublicKey static id = `${command.id}:multisig` diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts index f8685b8c5..05eb50488 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts @@ -1,6 +1,6 @@ import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils' import { SolanaCommand } from '@chainlink/gauntlet-solana' -import { PublicKey, TransactionInstruction, AccountMeta } from '@solana/web3.js' +import { PublicKey, TransactionInstruction, AccountMeta, ComputeBudgetProgram } from '@solana/web3.js' import { CONTRACT_LIST, getContract } from '../../lib/contracts' export default abstract class Close extends SolanaCommand { @@ -45,6 +45,10 @@ export default abstract class Close extends SolanaCommand { ...extraAccounts, }) .remainingAccounts(remainingAccounts) + .preInstructions([ + // close seems to consume just over 200k units for some reason now + ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }) + ]) .instruction() return [ix]