flash-sdk 1.0.1 → 1.0.3

package/lib/client/src/PerpetualsClient.js

@@ -42,10 +42,31 @@ var web3_js_1 = require("@solana/web3.js");
 var spl_token_1 = require("@solana/spl-token");
 var js_sha256_1 = require("js-sha256");
 var bs58_1 = require("bs58");
-var fs_1 = require("fs");
 var PositionAccount_1 = require("./PositionAccount");
+var perpetuals_1 = require("../../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);
+
+*/
 var PerpetualsClient = /** @class */ (function () {
-    function PerpetualsClient(clusterUrl, adminKey) {
+    function PerpetualsClient(provider, programId) {
         var _this = this;
         this.findProgramAddress = function (label, extraSeeds) {
             if (extraSeeds === void 0) { extraSeeds = null; }
@@ -334,11 +355,11 @@ var PerpetualsClient = /** @class */ (function () {
                                 minSignatures: minSignatures,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                             })
                                 .remainingAccounts(adminMetas)
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()];
                     case 2:
                         _a.sent();
@@ -360,7 +381,7 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .addPool({ name: name })
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.provider.wallet.publicKey,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
@@ -370,7 +391,7 @@ var PerpetualsClient = /** @class */ (function () {
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -388,14 +409,14 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, 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: web3_js_1.SystemProgram.programId,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -429,7 +450,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 ratios: ratios,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -441,7 +462,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                             })
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
@@ -478,7 +499,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 ratios: ratios,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -490,7 +511,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                             })
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
@@ -509,7 +530,7 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .removeCustody({ ratios: ratios })
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
@@ -519,7 +540,7 @@ var PerpetualsClient = /** @class */ (function () {
                             systemProgram: web3_js_1.SystemProgram.programId,
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -537,13 +558,13 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, 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: web3_js_1.SystemProgram.programId,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -992,14 +1013,24 @@ var PerpetualsClient = /** @class */ (function () {
                 }
             });
         }); };
-        this.provider = anchor_1.AnchorProvider.local(clusterUrl, {
-            commitment: "confirmed",
-            preflightCommitment: "confirmed",
-            skipPreflight: true
-        });
-        (0, anchor_1.setProvider)(this.provider);
-        this.program = anchor_1.workspace.Perpetuals;
-        this.admin = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse((0, fs_1.readFileSync)(adminKey).toString())));
+        // this.provider = AnchorProvider.local(clusterUrl, {
+        //   commitment: "confirmed",
+        //   preflightCommitment: "confirmed",
+        //   skipPreflight: true
+        // });
+        // setProvider(this.provider);
+        (0, anchor_1.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 anchor_1.Program(perpetuals_1.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");
         this.perpetuals = this.findProgramAddress("perpetuals");
@@ -1010,4 +1041,3 @@ var PerpetualsClient = /** @class */ (function () {
     return PerpetualsClient;
 }());
 exports.PerpetualsClient = PerpetualsClient;
-//# sourceMappingURL=PerpetualsClient.js.map

package/lib/client/src/index.d.ts

@@ -4,5 +4,6 @@ export * from './PositionAccount';
 export * from './OraclePrice';
 export * from './constants';
 export * from './types';
+export * from './utils';
 export * from './PerpetualsClient';
-//# sourceMappingURL=index.d.ts.map
+export * from './PoolConfig';

package/lib/client/src/index.js

@@ -20,5 +20,7 @@ __exportStar(require("./PositionAccount"), exports);
 __exportStar(require("./OraclePrice"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./types"), exports);
+__exportStar(require("./utils"), exports);
 __exportStar(require("./PerpetualsClient"), exports);
-//# sourceMappingURL=index.js.map
+__exportStar(require("./PoolConfig"), exports);
+// export { default as PoolConfigJson } from "./PoolConfig.json";

package/lib/client/src/target/types/limit_order_cpi.d.ts

@@ -0,0 +1,130 @@
+export type LimitOrderCpi = {
+    "version": "0.1.0";
+    "name": "limit_order_cpi";
+    "instructions": [
+        {
+            "name": "processMarketOrder";
+            "accounts": [
+                {
+                    "name": "keeper";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "pdaAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "pdaTokenVault";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "transferAuthority";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "perpetuals";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "pool";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "position";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "custody";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "custodyOracleAccount";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "custodyTokenAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "systemProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "tokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "flashProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                }
+            ];
+            "args": [
+                {
+                    "name": "params";
+                    "type": {
+                        "defined": "OpenPositionParams";
+                    };
+                }
+            ];
+        }
+    ];
+    "types": [
+        {
+            "name": "OpenPositionParams";
+            "type": {
+                "kind": "struct";
+                "fields": [
+                    {
+                        "name": "price";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "collateral";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "size";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "side";
+                        "type": {
+                            "defined": "Side";
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            "name": "Side";
+            "type": {
+                "kind": "enum";
+                "variants": [
+                    {
+                        "name": "None";
+                    },
+                    {
+                        "name": "Long";
+                    },
+                    {
+                        "name": "Short";
+                    }
+                ];
+            };
+        }
+    ];
+};
+export declare const IDL: LimitOrderCpi;

package/lib/client/src/target/types/limit_order_cpi.js

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IDL = void 0;
+exports.IDL = {
+    "version": "0.1.0",
+    "name": "limit_order_cpi",
+    "instructions": [
+        {
+            "name": "processMarketOrder",
+            "accounts": [
+                {
+                    "name": "keeper",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "pdaAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "pdaTokenVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "transferAuthority",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpetuals",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "pool",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "position",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "custody",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "custodyOracleAccount",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "custodyTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "flashProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "params",
+                    "type": {
+                        "defined": "OpenPositionParams"
+                    }
+                }
+            ]
+        }
+    ],
+    "types": [
+        {
+            "name": "OpenPositionParams",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "collateral",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "size",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "side",
+                        "type": {
+                            "defined": "Side"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "Side",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "None"
+                    },
+                    {
+                        "name": "Long"
+                    },
+                    {
+                        "name": "Short"
+                    }
+                ]
+            }
+        }
+    ]
+};

package/lib/constants/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { Cluster } from "@solana/web3.js";
 export declare const DEFAULT_CLUSTER: Cluster;
 export declare const DEFAULT_POOL: string;