diff --git a/clients/js/pnpm-workspace.yaml b/clients/js/pnpm-workspace.yaml new file mode 100644 index 0000000..49c0ad7 --- /dev/null +++ b/clients/js/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +allowBuilds: + esbuild: false diff --git a/clients/js/src/cli/utils.ts b/clients/js/src/cli/utils.ts index 04fe533..f540501 100644 --- a/clients/js/src/cli/utils.ts +++ b/clients/js/src/cli/utils.ts @@ -9,6 +9,7 @@ import { address, ClientWithRpc, ClientWithTransactionPlanning, + ClientWithTransactionSending, Commitment, compileTransaction, createClient, @@ -32,7 +33,6 @@ import { SolanaRpcSubscriptionsApi, TransactionMessage, TransactionPlan, - TransactionPlanExecutor, TransactionSigner, } from '@solana/kit'; import { solanaRpc, TransactionPlannerConfig } from '@solana/kit-plugin-rpc'; @@ -131,10 +131,7 @@ function cliConfigs(configs: SolanaConfigs) { */ function cliRunOrExport(options: ExportOption & ExportEncodingOption) { return < - T extends ClientWithRpc & - ClientWithTransactionPlanning & { - transactionPlanExecutor: TransactionPlanExecutor; - }, + T extends ClientWithRpc & ClientWithTransactionPlanning & ClientWithTransactionSending, >( client: T, ) => @@ -144,8 +141,8 @@ function cliRunOrExport(options: ExportOption & ExportEncodingOption) { if (options.export) { await exportTransactionPlan(transactionPlan, client, options); } else { - // TODO: progress + error handling. - await client.transactionPlanExecutor(transactionPlan); + // TODO: progress reporting. + await client.sendTransactions(transactionPlan); logSuccess('Operation executed successfully'); } },