flash-sdk 1.0.2 → 1.0.4

package/src/PerpetualsClient.ts

@@ -24,42 +24,72 @@ import {
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 
-import fetch from "node-fetch";
 import { sha256 } from "js-sha256";
 import { encode } from "bs58";
-import { readFileSync } from "fs";
-
 import { PoolAccount } from "./PoolAccount";
 import { PositionAccount } from "./PositionAccount";
 import { BorrowRateParams, Custody, Fees, OracleParams, Permissions, Position, PositionSide, PricingParams, TokenRatios, isVariant } from "./types";
 import { OraclePrice } from "./OraclePrice";
 import { CustodyAccount } from "./CustodyAccount";
-import { Perpetuals } from "./target/types/perpetuals"
-// import { Perpetuals } from "../../target/types/perpetuals"
+import { Perpetuals } from "./target/types/perpetuals";
+import {IDL}  from './target/types/perpetuals';
+
+
+/* USEAGE 
+
+UI ---  
+provider = from phatom 
+
+client = new PerpetualsClient(provider, user.pubkey , programId);
+
+BOT cli -------- 
 
+provider = await getProvider(new DefaultWallet(DEFAULT_PERPS_USER));
 
+AnchorProvider.local(clusterUrl, {
+       commitment: "confirmed",
+      preflightCommitment: "confirmed",
+       skipPreflight: true
+   });
+process.env["ANCHOR_WALLET"] = adminKeyPath;
+
+client = new PerpetualsClient(provider, DEFAULT_PERPS_USER.pubkey , programId);
+
+*/
 export class PerpetualsClient {
   provider: AnchorProvider;
   program: Program<Perpetuals>;
-  admin: Keypair;
+  admin: PublicKey;
+  programId: PublicKey;
 
   // pdas
   multisig: { publicKey: PublicKey; bump: number };
   authority: { publicKey: PublicKey; bump: number };
   perpetuals: { publicKey: PublicKey; bump: number };
 
-  constructor(clusterUrl: string, adminKey: string) {
-    this.provider = AnchorProvider.local(clusterUrl, {
-      commitment: "confirmed",
-      preflightCommitment: "confirmed",
-      skipPreflight: true
-    });
-    setProvider(this.provider);
-    this.program = workspace.Perpetuals as Program<Perpetuals>;
-
-    this.admin = Keypair.fromSecretKey(
-      new Uint8Array(JSON.parse(readFileSync(adminKey).toString()))
-    );
+  constructor(provider: AnchorProvider, programId: PublicKey) {
+    // this.provider = AnchorProvider.local(clusterUrl, {
+    //   commitment: "confirmed",
+    //   preflightCommitment: "confirmed",
+    //   skipPreflight: true
+    // });
+    // setProvider(this.provider);
+    this.provider = provider;
+    setProvider(provider);
+
+    // const idl = JSON.parse(  fs.readFileSync("./target/idl/perpetuals.json", "utf8"));
+    // const idl = JSON.parse(IDL);
+    // const program = new anchor.Program(idl, programId, provider);
+    this.program = new Program(IDL, programId); 
+    //this.program =  workspace.Perpetuals as Program<Perpetuals>;
+    console.log("client constructor programID : ",this.program.programId.toBase58());
+
+    // this.admin = Keypair.fromSecretKey(
+    //   new Uint8Array(JSON.parse(readFileSync(adminKey).toString()))
+    // );
+
+    this.admin =  this.provider.wallet.publicKey;
+    console.log("admin:",this.admin.toBase58())
 
     this.multisig = this.findProgramAddress("multisig");
     this.authority = this.findProgramAddress("transfer_authority");
@@ -343,11 +373,11 @@ export class PerpetualsClient {
           minSignatures,
         })
         .accounts({
-          admin: this.admin.publicKey,
+          admin: this.admin,
           multisig: this.multisig.publicKey,
         })
         .remainingAccounts(adminMetas)
-        .signers([this.admin])
+        // .signers([this.admin])
         .rpc();
     } catch (err) {
       // @ts-ignore
@@ -362,7 +392,7 @@ export class PerpetualsClient {
     await this.program.methods
       .addPool({ name })
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.provider.wallet.publicKey,
         multisig: this.multisig.publicKey,
         transferAuthority: this.authority.publicKey,
         perpetuals: this.perpetuals.publicKey,
@@ -372,7 +402,7 @@ export class PerpetualsClient {
         tokenProgram: TOKEN_PROGRAM_ID,
         rent: SYSVAR_RENT_PUBKEY,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);
@@ -384,14 +414,14 @@ export class PerpetualsClient {
     await this.program.methods
       .removePool({})
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.admin,
         multisig: this.multisig.publicKey,
         transferAuthority: this.authority.publicKey,
         perpetuals: this.perpetuals.publicKey,
         pool: this.getPoolKey(name),
         systemProgram: SystemProgram.programId,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);
@@ -425,7 +455,7 @@ export class PerpetualsClient {
         ratios,
       })
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.admin,
         multisig: this.multisig.publicKey,
         transferAuthority: this.authority.publicKey,
         perpetuals: this.perpetuals.publicKey,
@@ -440,7 +470,7 @@ export class PerpetualsClient {
         tokenProgram: TOKEN_PROGRAM_ID,
         rent: SYSVAR_RENT_PUBKEY,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);
@@ -481,7 +511,7 @@ export class PerpetualsClient {
         ratios,
       })
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.admin,
         multisig: this.multisig.publicKey,
         transferAuthority: this.authority.publicKey,
         perpetuals: this.perpetuals.publicKey,
@@ -496,7 +526,7 @@ export class PerpetualsClient {
         tokenProgram: TOKEN_PROGRAM_ID,
         rent: SYSVAR_RENT_PUBKEY,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);
@@ -509,7 +539,7 @@ export class PerpetualsClient {
     await this.program.methods
       .removeCustody({ ratios })
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.admin,
         multisig: this.multisig.publicKey,
         transferAuthority: this.authority.publicKey,
         perpetuals: this.perpetuals.publicKey,
@@ -522,7 +552,7 @@ export class PerpetualsClient {
         systemProgram: SystemProgram.programId,
         tokenProgram: TOKEN_PROGRAM_ID,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);
@@ -534,13 +564,13 @@ export class PerpetualsClient {
     await this.program.methods
       .upgradeCustody({})
       .accounts({
-        admin: this.admin.publicKey,
+        admin: this.admin,
         multisig: this.multisig.publicKey,
         pool: this.getPoolKey(poolName),
         custody: this.getCustodyKey(poolName, tokenMint),
         systemProgram: SystemProgram.programId,
       })
-      .signers([this.admin])
+      // .signers([this.admin])
       .rpc()
       .catch((err) => {
         console.error(err);

package/src/PoolAccount.ts

@@ -11,7 +11,7 @@ import { checkedCeilDiv, checkedDecimalCeilMul, checkedDecimalMul, scaleToExpone
 
 
 
-export class PoolAccount {
+export class PoolAccount implements Pool {
 
     publicKey: PublicKey;
 

package/src/PositionAccount.ts

@@ -3,7 +3,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { isVariant, Position, Side } from "./types";
 
 
-export class PositionAccount {
+export class PositionAccount implements Position {
 
     public publicKey: PublicKey;
 
@@ -25,6 +25,7 @@ export class PositionAccount {
     public lockedAmount: BN;
     public collateralAmount: BN;
     // extra 
+    public bump: number
 
     constructor( publicKey : PublicKey, parseData : Position) {
         this.publicKey = publicKey;