Skip to content

Commit 91ccaee

Browse files
authored
[message-buffer] improve logging for setup message buffer script (#872)
* chore: better loggging for init script * fix: change init-buffer script to use npx
1 parent c1ccef2 commit 91ccaee

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

pythnet/message_buffer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": "true",
55
"scripts": {
6-
"init-buffer": "yarn ts-node scripts/setup_message_buffer.ts"
6+
"init-buffer": "npx ts-node scripts/setup_message_buffer.ts"
77
},
88
"dependencies": {
99
"@coral-xyz/anchor": "^0.27.0",

pythnet/message_buffer/scripts/.env.pythtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ CLUSTER=pythtest-crosschain
44
# Whitelist admin will be initialized to same as payer
55
# then a separate txn will be used to set it to the following address
66
# after the message buffers have been initialized
7-
# WHITELIST_ADMIN=D8y6qTbQeYQdyrgKUvZbsveQkfnUThRKZvewddr4SKNt # Pythtest Multisig authority address (PDA of executor)
7+
# WHITELIST_ADMIN=AmqEnGN76cdRYqNUFg44hX47iXwxRqoGsmNZR29UEGJB # Price feed multisig authority
88
# 522 + 85(PriceFeedMessage) + 101(TwapMessage) + extra buffer
99
INITIAL_SIZE=2048

pythnet/message_buffer/scripts/setup_message_buffer.ts

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -271,17 +271,17 @@ async function main() {
271271

272272
const messageBufferKeys = priceIds.map((priceId) => {
273273
return {
274-
messageBufferKey: getMessageBufferPubkey(
274+
messageBuffer: getMessageBufferPubkey(
275275
pythOracleCpiAuth,
276276
priceId,
277277
messageBufferPid
278278
),
279-
priceAccountKey: priceId,
279+
priceAccount: priceId,
280280
};
281281
});
282282

283283
let accounts = await messageBufferProgram.account.messageBuffer.fetchMultiple(
284-
messageBufferKeys.map((k) => k.messageBufferKey)
284+
messageBufferKeys.map((k) => k.messageBuffer)
285285
);
286286

287287
const msgBufferKeysAndData = messageBufferKeys.map((k, i) => {
@@ -291,31 +291,35 @@ async function main() {
291291
};
292292
});
293293

294-
alreadyInitializedAccounts = msgBufferKeysAndData.filter((idAndAccount) => {
295-
return idAndAccount.messageBufferData !== null;
296-
});
294+
alreadyInitializedAccounts = msgBufferKeysAndData
295+
.filter((idAndAccount) => {
296+
return idAndAccount.messageBufferData !== null;
297+
})
298+
.map((v) => {
299+
return {
300+
priceAccount: v.priceAccount.toString(),
301+
messageBuffer: v.messageBuffer.toString(),
302+
};
303+
});
297304

298305
console.log(`
299-
${
300-
alreadyInitializedAccounts.length
301-
} message buffer accounts already initialized.
302-
alreadyInitializedAccounts: ${JSON.stringify(alreadyInitializedAccounts)}`);
306+
${alreadyInitializedAccounts.length} message buffer accounts already initialized`);
307+
console.table(alreadyInitializedAccounts);
303308

304309
const priceAccountPubkeysForNewlyInitializedMessageBuffers =
305310
msgBufferKeysAndData.filter((idAndAccount) => {
306311
return idAndAccount.messageBufferData === null;
307312
});
308313

309314
if (priceAccountPubkeysForNewlyInitializedMessageBuffers.length === 0) {
310-
console.info(`no new message buffers to initialize. exiting...`);
311-
process.exit(1);
315+
console.info(`no new message buffers to initialize`);
312316
}
313317
// TODO: optimize with batching
314318
await Promise.all(
315319
priceAccountPubkeysForNewlyInitializedMessageBuffers.map(
316320
async (idAndAccount) => {
317-
const priceId = idAndAccount.priceAccountKey;
318-
const messageBufferPda = idAndAccount.messageBufferKey;
321+
const priceId = idAndAccount.priceAccount;
322+
const messageBufferPda = idAndAccount.messageBuffer;
319323
const msgBufferPdaMetas = [
320324
{
321325
pubkey: messageBufferPda,
@@ -360,6 +364,7 @@ async function main() {
360364
console.info(`Accounts with errors: ${JSON.stringify(errorAccounts)}`);
361365
}
362366
console.log(`Initialized ${newlyInitializedAccounts.length} accounts`);
367+
console.table(newlyInitializedAccounts);
363368

364369
// Update whitelist admin at the end otherwise all the message buffer PDAs
365370
// will have to be initialized by the whitelist admin (which could be the multisig)

0 commit comments

Comments
 (0)