Provider -> AnchorProvider

smartcontractkit · Jul 27, 2022 · 61d0677 · 61d0677
1 parent 6c2b1f4
commit 61d0677
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/gauntlet/packages/gauntlet-solana/src/commands/internal/solana.ts b/gauntlet/packages/gauntlet-solana/src/commands/internal/solana.ts
@@ -12,14 +12,14 @@ import {
 } from '@solana/web3.js'
 import { withProvider, withWallet, withNetwork } from '../middlewares'
 import { TransactionResponse } from '../types'
-import { ProgramError, parseIdlErrors, Idl, Program, Provider } from '@project-serum/anchor'
+import { ProgramError, parseIdlErrors, Idl, Program, AnchorProvider } from '@project-serum/anchor'
 import { SolanaWallet } from '../wallet'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'
 import { makeTx } from '../../lib/utils'
 
 export default abstract class SolanaCommand extends WriteCommand<TransactionResponse> {
   wallet: SolanaWallet
-  provider: Provider
+  provider: AnchorProvider
   program: Program
 
   abstract execute: () => Promise<Result<TransactionResponse>>
@@ -139,7 +139,7 @@ export default abstract class SolanaCommand extends WriteCommand<TransactionResp
 
   sendTx = async (tx: Transaction, signers: Keypair[], idl: Idl): Promise<TransactionSignature> => {
     try {
-      return await this.provider.send(tx, signers)
+      return await this.provider.sendAndConfirm(tx, signers)
     } catch (err) {
       // Translate IDL error
       const idlErrors = parseIdlErrors(idl)

diff --git a/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts b/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts
@@ -1,7 +1,7 @@
 import { Middleware, Next } from '@chainlink/gauntlet-core'
 import { boolean } from '@chainlink/gauntlet-core/dist/lib/args'
 import { assertions, logger } from '@chainlink/gauntlet-core/dist/utils'
-import { Provider } from '@project-serum/anchor'
+import { AnchorProvider } from '@project-serum/anchor'
 import { Connection, Keypair } from '@solana/web3.js'
 import { DEFAULT_DERIVATION_PATH } from '../lib/constants'
 import SolanaCommand from './internal/solana'
@@ -18,7 +18,7 @@ export const withProvider: Middleware = (c: SolanaCommand, next: Next) => {
     `Invalid NODE_URL (${nodeURL}), please add an http:// or https:// prefix`,
   )
 
-  c.provider = new Provider(new Connection(nodeURL), c.wallet, {})
+  c.provider = new AnchorProvider(new Connection(nodeURL), c.wallet, {})
   return next()
 }
 

diff --git a/gauntlet/packages/gauntlet-solana/src/lib/provider.ts b/gauntlet/packages/gauntlet-solana/src/lib/provider.ts
@@ -28,7 +28,9 @@ const parseTxLog = (parser: EventParser, tx: ParsedTransactionWithMeta | null):
   const addToList = (event: Event) => eventList.push(event)
 
   if (tx?.meta?.logMessages) {
-    parser.parseLogs(tx.meta.logMessages, addToList)
+    for (const event of parser.parseLogs(tx.meta.logMessages)) {
+      addToList(event)
+    }
   }
 
   return eventList