Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions clients/js/src/cli/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import path from 'path';

import {
Account,
AccountRole,
Address,
address,
Commitment,
Expand Down Expand Up @@ -32,7 +33,7 @@ import {
import { Command } from 'commander';
import picocolors from 'picocolors';
import { parse as parseYaml } from 'yaml';
import { Buffer, DataSource, fetchBuffer, Format, Seed } from '../generated';
import { Buffer, DataSource, Encoding, fetchBuffer, Format, Seed } from '../generated';
import { createDefaultTransactionPlannerAndExecutor, getPdaDetails, PdaDetails } from '../internals';
import { decodeData, packDirectData, PackedData, packExternalData, packUrlData } from '../packData';
import { logErrorAndExit, logExports, logSuccess, logWarning } from './logs';
Expand Down Expand Up @@ -115,18 +116,43 @@ async function exportTransactionPlan(
const { value: latestBlockhash } = await client.rpc.getLatestBlockhash().send();

for (let i = 0; i < singleTransactions.length; i++) {
const transaction = pipe(
const message = pipe(
singleTransactions[i].message,
m => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, m),
m => removeComputeUnitLimitInstruction(m),
compileTransaction,
);
const transaction = compileTransaction(message);
const encodedTransaction = decodeData(transactionEncoder.encode(transaction), options.exportEncoding);
const prefix = picocolors.yellow(`[Transaction #${i + 1}]`);
console.log(`${prefix}\n${encodedTransaction}\n`);
console.log(`\n${prefix}`);
logInstructions(message);
console.log(`${picocolors.yellow('Encoded:')}\n${encodedTransaction}\n`);
}
}

function logInstructions(message: TransactionMessage): void {
message.instructions.forEach((ix, i) => {
console.log(picocolors.cyan(`\n------ IX #${i + 1} ------\n`));
console.log(`${ix.programAddress}\n`);

(ix.accounts ?? []).forEach(account => {
const isWritable =
account.role === AccountRole.WRITABLE || account.role === AccountRole.WRITABLE_SIGNER;
const isSigner =
account.role === AccountRole.READONLY_SIGNER || account.role === AccountRole.WRITABLE_SIGNER;
const writable = isWritable ? 'W' : '';
const signer = isSigner ? 'S' : '';
console.log(`${String(account.address).padEnd(44)} ${writable.padStart(2)} ${signer.padStart(1)}`);
});

console.log('');

if (ix.data && ix.data.length > 0) {
console.log(`${decodeData(ix.data, Encoding.Base58)}\n`);
}
});
}

function removeComputeUnitLimitInstruction<
TTransactionMessage extends TransactionMessage & TransactionMessageWithFeePayer,
>(message: TTransactionMessage): TTransactionMessage {
Expand Down