Skip to content

Commit 1cd1da1

Browse files
committed
Apply yarn format
1 parent 300336f commit 1cd1da1

File tree

7 files changed

+78
-60
lines changed

7 files changed

+78
-60
lines changed

solana/app/deploy/devnet/vesting/claimVesting.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ async function main() {
4242
const NOW = new BN(1741270829);
4343

4444
const seedBufferHex = "83cda9d4e2445bff";
45-
const seedBuffer = Buffer.from(seedBufferHex, 'hex');
45+
const seedBuffer = Buffer.from(seedBufferHex, "hex");
4646
const config = PublicKey.findProgramAddressSync(
4747
[
4848
Buffer.from(wasm.Constants.VESTING_CONFIG_SEED()),
@@ -51,7 +51,7 @@ async function main() {
5151
],
5252
vesterStakeConnection.program.programId,
5353
)[0];
54-
// const config = new PublicKey("AHfPLNVnRGoACwMfoRCwWnCEJWjMX4x7Yq3ufg3tpjQQ");
54+
// const config = new PublicKey("AHfPLNVnRGoACwMfoRCwWnCEJWjMX4x7Yq3ufg3tpjQQ");
5555
console.log("Vesting config account:", config);
5656

5757
const vault = getAssociatedTokenAddressSync(

solana/app/deploy/devnet/vesting/transferVesting.ts

+64-44
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
// Usage: npx ts-node app/deploy/devnet/vesting/transferVesting.ts
22

33
import { Wallet, AnchorProvider } from "@coral-xyz/anchor";
4-
import { Connection, PublicKey, SystemProgram, Transaction } from "@solana/web3.js";
4+
import {
5+
Connection,
6+
PublicKey,
7+
SystemProgram,
8+
Transaction,
9+
} from "@solana/web3.js";
510
import {
611
VESTING_ADMIN_KEYPAIR,
712
USER_AUTHORITY_KEYPAIR,
813
USER2_AUTHORITY_KEYPAIR,
914
WORMHOLE_TOKEN,
1015
RPC_NODE,
1116
} from "../constants";
12-
import { StakeAccountMetadata, StakeConnection } from "../../../StakeConnection";
17+
import {
18+
StakeAccountMetadata,
19+
StakeConnection,
20+
} from "../../../StakeConnection";
1321
import BN from "bn.js";
1422
import * as wasm from "@wormhole/staking-wasm";
1523
import {
@@ -106,20 +114,19 @@ async function main() {
106114
)[0];
107115

108116
let stakeAccountMetadataAddress =
109-
await vesterStakeConnection.getStakeMetadataAddress(
110-
vester.publicKey
111-
);
112-
// console.log("stakeAccountMetadataAddress:", stakeAccountMetadataAddress)
117+
await vesterStakeConnection.getStakeMetadataAddress(vester.publicKey);
118+
// console.log("stakeAccountMetadataAddress:", stakeAccountMetadataAddress)
113119
let newStakeAccountMetadataAddress =
114-
await vesterStakeConnection.getStakeMetadataAddress(
115-
newVester.publicKey,
116-
);
120+
await vesterStakeConnection.getStakeMetadataAddress(newVester.publicKey);
117121

118122
let vestingBalanceAccount =
119123
await vesterStakeConnection.program.account.vestingBalance.fetch(
120124
vestingBalance,
121125
);
122-
console.log("vestingBalanceAccount.totalVestingBalance: ", vestingBalanceAccount.totalVestingBalance.toString())
126+
console.log(
127+
"vestingBalanceAccount.totalVestingBalance: ",
128+
vestingBalanceAccount.totalVestingBalance.toString(),
129+
);
123130

124131
let vesterDelegateStakeAccountOwner = await vesterStakeConnection.delegates(
125132
vester.publicKey,
@@ -157,7 +164,8 @@ async function main() {
157164
vestingBalance,
158165
newVestingBalance,
159166
globalConfig: vesterStakeConnection.configAddress,
160-
delegateStakeAccountCheckpoints: newVesterDelegateStakeAccountCheckpointsAddress,
167+
delegateStakeAccountCheckpoints:
168+
newVesterDelegateStakeAccountCheckpointsAddress,
161169
delegateStakeAccountMetadata: newVesterDelegateStakeAccountMetadataAddress,
162170
stakeAccountMetadata: stakeAccountMetadataAddress,
163171
newStakeAccountMetadata: null,
@@ -209,35 +217,35 @@ async function main() {
209217
await vesterStakeConnection.provider.sendAndConfirm(tx, [vester]);
210218
console.log("transferVesting completed successfully.");
211219

212-
// console.log(`Delegate WH tokens with vests`);
213-
// await vesterStakeConnection.delegateWithVest(
214-
// newVesterDelegateStakeAccountOwner,
215-
// WHTokenBalance.fromString("0"),
216-
// true,
217-
// config,
218-
// );
219-
// console.log(`WH tokens with vests successfully delegated`);
220-
// await sleep(3000);
221-
//
222-
// console.log("Starting transferVesting...");
223-
// await vesterStakeConnection.program.methods
224-
// .transferVesting()
225-
// .accountsPartial({
226-
// ...accounts
227-
// })
228-
// .rpc()
229-
// .then(confirm);
230-
// console.log("transferVesting completed successfully.");
231-
// await sleep(3000);
232-
//
233-
// console.log(`Delegate WH tokens with vests`);
234-
// await vesterStakeConnection.delegateWithVest(
235-
// vesterDelegateStakeAccountOwner,
236-
// WHTokenBalance.fromString("0"),
237-
// true,
238-
// config,
239-
// );
240-
// console.log(`WH tokens with vests successfully delegated`);
220+
// console.log(`Delegate WH tokens with vests`);
221+
// await vesterStakeConnection.delegateWithVest(
222+
// newVesterDelegateStakeAccountOwner,
223+
// WHTokenBalance.fromString("0"),
224+
// true,
225+
// config,
226+
// );
227+
// console.log(`WH tokens with vests successfully delegated`);
228+
// await sleep(3000);
229+
//
230+
// console.log("Starting transferVesting...");
231+
// await vesterStakeConnection.program.methods
232+
// .transferVesting()
233+
// .accountsPartial({
234+
// ...accounts
235+
// })
236+
// .rpc()
237+
// .then(confirm);
238+
// console.log("transferVesting completed successfully.");
239+
// await sleep(3000);
240+
//
241+
// console.log(`Delegate WH tokens with vests`);
242+
// await vesterStakeConnection.delegateWithVest(
243+
// vesterDelegateStakeAccountOwner,
244+
// WHTokenBalance.fromString("0"),
245+
// true,
246+
// config,
247+
// );
248+
// console.log(`WH tokens with vests successfully delegated`);
241249

242250
vestingBalanceAccount =
243251
await vesterStakeConnection.program.account.vestingBalance.fetch(
@@ -247,8 +255,14 @@ async function main() {
247255
await vesterStakeConnection.program.account.vestingBalance.fetch(
248256
newVestingBalance,
249257
);
250-
console.log("vestingBalanceAccount.totalVestingBalance: ", vestingBalanceAccount.totalVestingBalance.toString())
251-
console.log("newVestingBalanceAccount.totalVestingBalance: ", newVestingBalanceAccount.totalVestingBalance.toString())
258+
console.log(
259+
"vestingBalanceAccount.totalVestingBalance: ",
260+
vestingBalanceAccount.totalVestingBalance.toString(),
261+
);
262+
console.log(
263+
"newVestingBalanceAccount.totalVestingBalance: ",
264+
newVestingBalanceAccount.totalVestingBalance.toString(),
265+
);
252266

253267
let vesterStakeMetadata: StakeAccountMetadata =
254268
await vesterStakeConnection.fetchStakeAccountMetadata(vester.publicKey);
@@ -258,8 +272,14 @@ async function main() {
258272
false,
259273
);
260274

261-
console.log("vesterStakeMetadata.recordedVestingBalance: ", vesterStakeMetadata.recordedVestingBalance.toString())
262-
console.log("vesterStakeMetadata.recordedBalance: ", vesterStakeMetadata.recordedBalance.toString())
275+
console.log(
276+
"vesterStakeMetadata.recordedVestingBalance: ",
277+
vesterStakeMetadata.recordedVestingBalance.toString(),
278+
);
279+
console.log(
280+
"vesterStakeMetadata.recordedBalance: ",
281+
vesterStakeMetadata.recordedBalance.toString(),
282+
);
263283
}
264284

265285
main();

solana/programs/staking/src/context.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ pub struct UpdateGovernanceAuthority<'info> {
441441
#[derive(Accounts)]
442442
pub struct ClaimGovernanceAuthority<'info> {
443443
#[account(
444-
mut,
445-
seeds = [CONFIG_SEED.as_bytes()],
444+
mut,
445+
seeds = [CONFIG_SEED.as_bytes()],
446446
bump = config.bump,
447447
constraint = (
448448
config.pending_governance_authority == Some(new_authority.key())
@@ -466,8 +466,8 @@ pub struct UpdateVestingAdmin<'info> {
466466
#[derive(Accounts)]
467467
pub struct ClaimVestingAdmin<'info> {
468468
#[account(
469-
mut,
470-
seeds = [CONFIG_SEED.as_bytes()],
469+
mut,
470+
seeds = [CONFIG_SEED.as_bytes()],
471471
bump = config.bump,
472472
constraint = (
473473
config.pending_vesting_admin == Some(new_vesting_admin.key())

solana/programs/staking/src/contexts/cancel_vesting.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use anchor_lang::prelude::*;
2-
use anchor_spl::associated_token::AssociatedToken;
3-
use anchor_spl::token::{Mint, Token, TokenAccount};
41
use crate::context::{CONFIG_SEED, VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED};
52
use crate::error::VestingError;
63
use crate::state::global_config::GlobalConfig;
74
use crate::state::{Vesting, VestingBalance, VestingConfig};
5+
use anchor_lang::prelude::*;
6+
use anchor_spl::associated_token::AssociatedToken;
7+
use anchor_spl::token::{Mint, Token, TokenAccount};
88

99
#[derive(Accounts)]
1010
pub struct CancelVesting<'info> {

solana/programs/staking/src/contexts/claim_vesting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
};
99
use anchor_lang::prelude::*;
1010
use anchor_spl::associated_token::AssociatedToken;
11-
use anchor_spl::token::{Mint, Token, TokenAccount, transfer_checked, TransferChecked};
11+
use anchor_spl::token::{transfer_checked, Mint, Token, TokenAccount, TransferChecked};
1212
use std::convert::TryInto;
1313

1414
#[event_cpi]

solana/programs/staking/src/contexts/create_vesting.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use anchor_lang::prelude::*;
2-
use anchor_spl::associated_token::AssociatedToken;
3-
use anchor_spl::token::{Mint, Token, TokenAccount};
41
use crate::context::{CONFIG_SEED, VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED};
52
use crate::error::VestingError;
63
use crate::state::global_config::GlobalConfig;
74
use crate::state::{Vesting, VestingBalance, VestingConfig};
5+
use anchor_lang::prelude::*;
6+
use anchor_spl::associated_token::AssociatedToken;
7+
use anchor_spl::token::{Mint, Token, TokenAccount};
88

99
#[derive(Accounts)]
1010
#[instruction(maturation: i64)]

solana/programs/staking/src/contexts/withdraw_surplus.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ use crate::state::global_config::GlobalConfig;
44
use crate::state::VestingConfig;
55
use anchor_lang::prelude::*;
66
use anchor_spl::associated_token::AssociatedToken;
7-
use anchor_spl::token::{
8-
transfer_checked, Mint, TokenAccount, Token, TransferChecked,
9-
};
7+
use anchor_spl::token::{transfer_checked, Mint, Token, TokenAccount, TransferChecked};
108

119
#[derive(Accounts)]
1210
pub struct WithdrawSurplus<'info> {

0 commit comments

Comments
 (0)