From bb3c1083842a5845d5499e1754da28318c66bb8d Mon Sep 17 00:00:00 2001 From: aalu1418 Date: Mon, 7 Nov 2022 07:49:46 -0700 Subject: [PATCH 1/2] solana payouts more explicit log --- .../src/commands/contracts/ocr2/close.ts | 2 +- .../src/commands/contracts/ocr2/proposal/acceptProposal.ts | 2 +- .../src/commands/contracts/ocr2/setBilling.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts index 31119bf58..ad0682992 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts @@ -24,7 +24,7 @@ export default class extends Close { const address = new PublicKey(this.args[0]) const linkPublicKey = new PublicKey(this.flags.link || process.env.LINK) const tokenReceiver = await getAssociatedTokenAddress(linkPublicKey, signer, true) - logger.info(`This command involves a token payout. The receiver will be: ${tokenReceiver}`) + logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) const { config, oracles } = (await program.account.state.fetch(address)) as any const [vaultAuthority] = await PublicKey.findProgramAddress( diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts index f71a3e609..2a1101240 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts @@ -214,7 +214,7 @@ export default class AcceptProposal extends SolanaCommand { makeRawTransaction = async (signer: PublicKey) => { const linkPublicKey = new PublicKey(this.flags.link || process.env.LINK) const tokenReceiver = await getAssociatedTokenAddress(linkPublicKey, signer, true) - logger.info(`This command involves a token payout. The receiver will be: ${tokenReceiver}`) + logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) const tx = await this.program.methods .acceptProposal(this.contractInput.offchainDigest) diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts index 9cf3ac905..b7bbdc4d0 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts @@ -74,7 +74,7 @@ export default class SetBilling extends SolanaCommand { .map((oracle) => ({ pubkey: oracle.payee, isWritable: true, isSigner: false })) const billingAC = new PublicKey(info.config.billingAccessController) - logger.info(`This command involves a token payout. The receiver will be: ${tokenReceiver}`) + logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) const data = await this.program.methods .setBilling(new BN(this.input.observationPaymentGjuels), new BN(this.input.transmissionPaymentGjuels)) .accounts({ From ae1e20f78350d5240c572263f682dc5c0b9ce0b5 Mon Sep 17 00:00:00 2001 From: aalu1418 Date: Mon, 7 Nov 2022 07:52:08 -0700 Subject: [PATCH 2/2] fmt --- .../src/commands/contracts/ocr2/close.ts | 4 +++- .../src/commands/contracts/ocr2/proposal/acceptProposal.ts | 4 +++- .../src/commands/contracts/ocr2/setBilling.ts | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts index ad0682992..2a03b287e 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/close.ts @@ -24,7 +24,9 @@ export default class extends Close { const address = new PublicKey(this.args[0]) const linkPublicKey = new PublicKey(this.flags.link || process.env.LINK) const tokenReceiver = await getAssociatedTokenAddress(linkPublicKey, signer, true) - logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) + logger.info( + `This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`, + ) const { config, oracles } = (await program.account.state.fetch(address)) as any const [vaultAuthority] = await PublicKey.findProgramAddress( diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts index 2a1101240..2b3eefca9 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts @@ -214,7 +214,9 @@ export default class AcceptProposal extends SolanaCommand { makeRawTransaction = async (signer: PublicKey) => { const linkPublicKey = new PublicKey(this.flags.link || process.env.LINK) const tokenReceiver = await getAssociatedTokenAddress(linkPublicKey, signer, true) - logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) + logger.info( + `This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`, + ) const tx = await this.program.methods .acceptProposal(this.contractInput.offchainDigest) diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts index b7bbdc4d0..3d88c5eb3 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts +++ b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts @@ -74,7 +74,9 @@ export default class SetBilling extends SolanaCommand { .map((oracle) => ({ pubkey: oracle.payee, isWritable: true, isSigner: false })) const billingAC = new PublicKey(info.config.billingAccessController) - logger.info(`This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`) + logger.info( + `This command involves a token payout. If owed tokens are unable to be paid to node operators, they will be sent to: ${tokenReceiver}`, + ) const data = await this.program.methods .setBilling(new BN(this.input.observationPaymentGjuels), new BN(this.input.transmissionPaymentGjuels)) .accounts({