Skip to content

Commit

Permalink
chore: reduce deprecated code usage (#55)
Browse files Browse the repository at this point in the history 
Replaces associated-token library with the newer web3.js sync equivalent. Favors named imports over
module for types.
  • Loading branch information
@diegofigs
diegofigs authored Mar 12, 2024
1 parent c398396 commit b029a93
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 55 deletions.
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"dependencies": {
"@dual-finance/staking-options": "^0.0.17",
"@project-serum/anchor": "^0.25.0",
"@project-serum/associated-token": "^0.1.1",
"@solana/spl-token": "^0.3.6",
"@solana/web3.js": "^1.66.2",
"dotenv": "^16.0.3"
Expand Down
90 changes: 41 additions & 49 deletions src/gso.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,26 @@ import {
ConnectionConfig,
Keypair,
PublicKey,
SYSVAR_RENT_PUBKEY,
SystemProgram,
TransactionInstruction,
} from '@solana/web3.js';
import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
import {
TOKEN_PROGRAM_ID,
getAssociatedTokenAddressSync,
} from '@solana/spl-token';
import {
AnchorProvider,
BN,
Program,
Wallet,
Idl,
web3,
utils,
} from '@project-serum/anchor';
import {
StakingOptions,
STAKING_OPTIONS_PK,
} from '@dual-finance/staking-options';
import { getAssociatedTokenAddress } from '@project-serum/associated-token';
import gsoIdl from './gso.json';
import { parseGsoState } from './utils';

Expand Down Expand Up @@ -122,7 +126,7 @@ export class GSO {
* Get the public key for the gso state.
*/
public async state(name: string): Promise<PublicKey> {
const [state, _stateBump] = await web3.PublicKey.findProgramAddress(
const [state, _stateBump] = PublicKey.findProgramAddressSync(
[
Buffer.from(utils.bytes.utf8.encode('GSO-state')),
GSO.toBeBytes(1), /* period_num */
Expand All @@ -137,11 +141,8 @@ export class GSO {
* Get the public key for xBase token.
*/
public async xBaseMint(gsoState: PublicKey): Promise<PublicKey> {
const [xBaseMint, _xBaseMintBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('xGSO')),
gsoState.toBuffer(),
],
const [xBaseMint, _xBaseMintBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('xGSO')), gsoState.toBuffer()],
this.program.programId,
);
return xBaseMint;
Expand All @@ -151,11 +152,8 @@ export class GSO {
* Get the public key for base vault.
*/
public async baseVault(gsoState: PublicKey): Promise<PublicKey> {
const [baseVault, _baseVaultBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('base-vault')),
gsoState.toBuffer(),
],
const [baseVault, _baseVaultBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('base-vault')), gsoState.toBuffer()],
this.program.programId,
);
return baseVault;
Expand All @@ -179,14 +177,11 @@ export class GSO {
baseAccount: PublicKey,
quoteAccount: PublicKey,
lotSize: number,
): Promise<web3.TransactionInstruction> {
): Promise<TransactionInstruction> {
const gsoState = await this.state(projectName);

const [soAuthority, soAuthorityBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('gso')),
gsoState.toBuffer(),
],
const [soAuthority, soAuthorityBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('gso')), gsoState.toBuffer()],
this.program.programId,
);
const so = new StakingOptions(this.connection.rpcEndpoint);
Expand Down Expand Up @@ -227,8 +222,8 @@ export class GSO {
baseVault,
stakingOptionsProgram: STAKING_OPTIONS_PK,
tokenProgram: TOKEN_PROGRAM_ID,
systemProgram: web3.SystemProgram.programId,
rent: web3.SYSVAR_RENT_PUBKEY,
systemProgram: SystemProgram.programId,
rent: SYSVAR_RENT_PUBKEY,
},
},
);
Expand All @@ -243,14 +238,11 @@ export class GSO {
strikeAtomsPerLot: number,
authority: PublicKey,
baseMint: PublicKey,
): Promise<web3.TransactionInstruction> {
): Promise<TransactionInstruction> {
const gsoState = await this.state(projectName);

const [soAuthority, _soAuthorityBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('gso')),
gsoState.toBuffer(),
],
const [soAuthority, _soAuthorityBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('gso')), gsoState.toBuffer()],
this.program.programId,
);
const so = new StakingOptions(this.connection.rpcEndpoint);
Expand All @@ -260,7 +252,7 @@ export class GSO {
const xBaseMint = await this.xBaseMint(gsoState);

const [optionMetadata, _optionMintMetadataBump] = (
await web3.PublicKey.findProgramAddress(
PublicKey.findProgramAddressSync(
[
Buffer.from(utils.bytes.utf8.encode('metadata')),
metaplexId.toBuffer(),
Expand All @@ -270,7 +262,7 @@ export class GSO {
));

const [xBaseMetadata, _xBaseMintMetadataAccountBump] = (
await web3.PublicKey.findProgramAddress(
PublicKey.findProgramAddressSync(
[
Buffer.from(utils.bytes.utf8.encode('metadata')),
metaplexId.toBuffer(),
Expand All @@ -292,8 +284,8 @@ export class GSO {
optionMetadata,
stakingOptionsProgram: STAKING_OPTIONS_PK,
tokenMetadataProgram: metaplexId,
rent: web3.SYSVAR_RENT_PUBKEY,
systemProgram: web3.SystemProgram.programId,
rent: SYSVAR_RENT_PUBKEY,
systemProgram: SystemProgram.programId,
},
},
);
Expand All @@ -308,14 +300,11 @@ export class GSO {
authority: PublicKey,
baseMint: PublicKey,
userBaseAccount: PublicKey,
): Promise<web3.TransactionInstruction> {
): Promise<TransactionInstruction> {
const gsoState = await this.state(projectName);

const [soAuthority, _soAuthorityBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('gso')),
gsoState.toBuffer(),
],
const [soAuthority, _soAuthorityBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('gso')), gsoState.toBuffer()],
this.program.programId,
);
const so = new StakingOptions(this.connection.rpcEndpoint);
Expand All @@ -329,8 +318,14 @@ export class GSO {
const baseVault = await this.baseVault(gsoState);

// TODO: Possibly init these.
const soUserOptionAccount = await getAssociatedTokenAddress(authority, soOptionMint);
const userXBaseAccount = await getAssociatedTokenAddress(authority, xBaseMint);
const soUserOptionAccount = getAssociatedTokenAddressSync(
soOptionMint,
authority,
);
const userXBaseAccount = getAssociatedTokenAddressSync(
xBaseMint,
authority,
);

return this.program.instruction.stake(
new BN(amount),
Expand Down Expand Up @@ -361,12 +356,12 @@ export class GSO {
projectName: string,
authority: PublicKey,
userBaseAccount: PublicKey,
): Promise<web3.TransactionInstruction> {
): Promise<TransactionInstruction> {
const gsoState = await this.state(projectName);

const xBaseMint = await this.xBaseMint(gsoState);
const baseVault = await this.baseVault(gsoState);
const userXBaseAccount = await getAssociatedTokenAddress(authority, xBaseMint);
const userXBaseAccount = getAssociatedTokenAddressSync(xBaseMint, authority);

return this.program.instruction.unstake(
new BN(amount),
Expand All @@ -392,18 +387,15 @@ export class GSO {
baseMint: PublicKey,
authority: PublicKey,
userBaseAccount: PublicKey,
): Promise<web3.TransactionInstruction> {
): Promise<TransactionInstruction> {
const gsoState = await this.state(projectName);
const so = new StakingOptions(this.connection.rpcEndpoint);
const soBaseVault = await so.baseVault(`GSO${projectName}`, baseMint);

const soState = await so.state(`GSO${projectName}`, baseMint);

const [soAuthority, _soAuthorityBump] = await web3.PublicKey.findProgramAddress(
[
Buffer.from(utils.bytes.utf8.encode('gso')),
gsoState.toBuffer(),
],
const [soAuthority, _soAuthorityBump] = PublicKey.findProgramAddressSync(
[Buffer.from(utils.bytes.utf8.encode('gso')), gsoState.toBuffer()],
this.program.programId,
);

Expand All @@ -418,7 +410,7 @@ export class GSO {
userBaseAccount,
stakingOptionsProgram: STAKING_OPTIONS_PK,
tokenProgram: TOKEN_PROGRAM_ID,
systemProgram: web3.SystemProgram.programId,
systemProgram: SystemProgram.programId,
},
},
);
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,11 +668,6 @@
superstruct "^0.15.4"
toml "^3.0.0"

"@project-serum/associated-token@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@project-serum/associated-token/-/associated-token-0.1.1.tgz#9acf745e84dad21e2ea26e06694704b9d698e532"
integrity sha512-Zc1wdqragbDiyBVagzIbIsMe37P7fgkArWZPIj+jJjDIoznlmYMK6ASU5mtdDZrPJ7sNABF/lzZ3+jvCCcU+oA==

"@project-serum/borsh@^0.2.5":
version "0.2.5"
resolved "https://registry.yarnpkg.com/@project-serum/borsh/-/borsh-0.2.5.tgz#6059287aa624ecebbfc0edd35e4c28ff987d8663"
Expand Down

0 comments on commit b029a93

Please sign in to comment.