flash-sdk 1.0.13 → 1.0.15

package/src/PoolAccount.ts

@@ -168,7 +168,7 @@ export class PoolAccount implements Pool {
     ) : BN {
         if(isEntry){
             const current_price = this.getEntryPrice(token_price, token_ema_price, side, custody);
-            console.log("getEntryPrice current_price:",current_price.toString())
+            // console.log("getEntryPrice current_price:",current_price.toString())
             // TODO:: checked USE
             let spread_i = checkedDecimalCeilMul(
                 current_price,
@@ -177,7 +177,7 @@ export class PoolAccount implements Pool {
                 new BN(-1 * BPS_DECIMALS),
                 new BN(-1*PRICE_DECIMALS),
             );
-            console.log("getPriceAfterSlippage spread_i:",spread_i.toString());
+            // console.log("getPriceAfterSlippage spread_i:",spread_i.toString());
 
             if (isVariant(side, 'long')) {
                 return current_price.add(spread_i);
@@ -191,7 +191,7 @@ export class PoolAccount implements Pool {
         } else {
             // Opp in during close
             const current_price = this.getExitPrice(token_price, token_ema_price, side, custody);
-            console.log("getExitPrice current_price:",current_price.toString())
+            // console.log("getExitPrice current_price:",current_price.toString())
             // TODO:: checked USE
             let spread_i = checkedDecimalCeilMul(
                 current_price,
@@ -200,7 +200,7 @@ export class PoolAccount implements Pool {
                 new BN(-1 * BPS_DECIMALS),
                 new BN(-1*PRICE_DECIMALS),
             );
-            console.log("spread_i:",spread_i);
+            // console.log("spread_i:",spread_i);
             if (isVariant(side, 'long')) {
                 if (spread_i.lt(current_price) ){
                     return current_price.sub(spread_i)
@@ -221,7 +221,7 @@ export class PoolAccount implements Pool {
         spread: BN,
      ) : OraclePrice {
         if (isVariant(side, 'long')) {
-            console.log("inside long")
+            // console.log("inside long")
             let max_price : OraclePrice;
              if (token_price.cmp(token_ema_price))  {
                 max_price = token_price;
@@ -236,14 +236,14 @@ export class PoolAccount implements Pool {
                 new BN(-1 * BPS_DECIMALS),
                 max_price.exponent,
             );
-            console.log("getPrice spread_i:",spread_i.toString());
+            // console.log("getPrice spread_i:",spread_i.toString());
 
             return new OraclePrice({
                 price : max_price.price.add(spread_i),
                 exponent : max_price.exponent,
             })
         } else {
-            console.log("inside short ")
+            // console.log("inside short ")
             let min_price:OraclePrice;
             if (token_price.cmp(token_ema_price) ) {
                 min_price = token_ema_price;
@@ -258,7 +258,7 @@ export class PoolAccount implements Pool {
                 new BN(-1 * BPS_DECIMALS),
                 min_price.exponent,
             );
-            console.log("spread_i:",spread_i.toString())
+            // console.log("spread_i:",spread_i.toString())
 
             let price : BN;
             if (spread_i.lt(min_price.price) ){
@@ -300,11 +300,11 @@ export class PoolAccount implements Pool {
 
 
         let exit_price = PoolAccount.getExitPrice(token_price, token_ema_price, position.side, custody);
-        console.log("exit_price:",exit_price, exit_price?.toString())
+        // console.log("exit_price:",exit_price, exit_price?.toString())
 
 
         let size = token_ema_price.getTokenAmount(position.sizeUsd, custody.decimals);
-        console.log("size:",size, size?.toString())
+        // console.log("size:",size, size?.toString())
 
         let exit_fee :BN; 
         if (liquidation) {
@@ -312,16 +312,16 @@ export class PoolAccount implements Pool {
         } else {
             exit_fee = this.getExitFee(size, custody)
         };
-        console.log("exit_fee:",exit_fee.toString())
+        // console.log("exit_fee:",exit_fee.toString())
 
         let exit_fee_usd = token_ema_price.getAssetAmountUsd(exit_fee, custody.decimals);
-        console.log("exit_fee_usd:",exit_fee_usd.toString())
+        // console.log("exit_fee_usd:",exit_fee_usd.toString())
 
         let interest_usd = custody.getInterestAmountUsd(position, curtime);
-        console.log("interest_usd:",interest_usd.toString())
+        // console.log("interest_usd:",interest_usd.toString())
 
         let unrealized_loss_usd =  (exit_fee_usd.add(interest_usd)).add(position.unrealizedLossUsd);
-        console.log("unrealized_loss_usd:",unrealized_loss_usd.toString())
+        // console.log("unrealized_loss_usd:",unrealized_loss_usd.toString())
 
         let price_diff_profit, price_diff_loss ;
         if (isVariant(position.side, 'long'))  {
@@ -339,8 +339,8 @@ export class PoolAccount implements Pool {
             price_diff_profit = BN_ZERO;
             price_diff_loss = exit_price.sub(position.price);
         };
-        console.log("1 price_diff_profit:",price_diff_profit.toString())
-        console.log("2 price_diff_loss:",price_diff_loss.toString())
+        // console.log("1 price_diff_profit:",price_diff_profit.toString())
+        // console.log("2 price_diff_loss:",price_diff_loss.toString())
 
 
         let position_price = scaleToExponent(
@@ -348,14 +348,14 @@ export class PoolAccount implements Pool {
             new BN(-1 * PRICE_DECIMALS),
             new BN(-1 * USD_DECIMALS ),
         );
-        console.log("position_price:",position_price.toString())
+        // console.log("position_price:",position_price.toString())
 
         if (price_diff_profit.gt(BN_ZERO)) {
             
             let potential_profit_usd = (position.sizeUsd.mul(price_diff_profit)).div(position_price);
 
             potential_profit_usd = potential_profit_usd.add(position.unrealizedProfitUsd);
-            console.log("potential_profit_usd:",potential_profit_usd.toString())
+            // console.log("potential_profit_usd:",potential_profit_usd.toString())
 
 
             if (potential_profit_usd.gte(unrealized_loss_usd))  {
@@ -363,8 +363,8 @@ export class PoolAccount implements Pool {
                 let max_profit_usd =
                     min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
 
-                console.log("cur_profit_usd:",cur_profit_usd.toString())
-                console.log("max_profit_usd:",max_profit_usd.toString())
+                // console.log("cur_profit_usd:",cur_profit_usd.toString())
+                // console.log("max_profit_usd:",max_profit_usd.toString())
 
                 return { 
                     profit: BN.min(max_profit_usd, cur_profit_usd),
@@ -372,8 +372,8 @@ export class PoolAccount implements Pool {
                     exitFee:  exit_fee
                 }
             } else {
-                console.log(" -- unrealized_loss_usd:",unrealized_loss_usd.toString())
-                console.log(" -- potential_profit_usd:",potential_profit_usd.toString())
+                // console.log(" -- unrealized_loss_usd:",unrealized_loss_usd.toString())
+                // console.log(" -- potential_profit_usd:",potential_profit_usd.toString())
 
                 return { 
                     profit: BN_ZERO,
@@ -388,11 +388,11 @@ export class PoolAccount implements Pool {
             );
 
              potential_loss_usd = potential_loss_usd.add(unrealized_loss_usd);
-             console.log("potential_loss_usd:",potential_loss_usd.toString())
+            //  console.log("potential_loss_usd:",potential_loss_usd.toString())
 
 
             if ( potential_loss_usd.gte(position.unrealizedProfitUsd) ) {
-             console.log("position.unrealizedProfitUsd:",position.unrealizedProfitUsd.toString())
+            //  console.log("position.unrealizedProfitUsd:",position.unrealizedProfitUsd.toString())
 
                 return { 
                     profit: BN_ZERO,
@@ -402,8 +402,8 @@ export class PoolAccount implements Pool {
             } else {
                 let cur_profit_usd = position.unrealizedProfitUsd.sub(potential_loss_usd);
                 let max_profit_usd = min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
-             console.log("cur_profit_usd:",cur_profit_usd.toString())
-             console.log("max_profit_usd:",max_profit_usd.toString())
+            //  console.log("cur_profit_usd:",cur_profit_usd.toString())
+            //  console.log("max_profit_usd:",max_profit_usd.toString())
                 
                 return { 
                     profit: BN.min(max_profit_usd, cur_profit_usd),

package/src/PoolConfig.json

@@ -31,6 +31,13 @@
           "isStable": false,
           "pythTicker" : "Crypto.SOL/USD"
         },
+        {
+          "symbol": "WSOL",
+          "mintKey": "So11111111111111111111111111111111111111112",
+          "decimals": 9,
+          "isStable": false,
+          "pythTicker" : "Crypto.SOL/USD"
+        },
         {
           "symbol": "BTC",
           "mintKey": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",

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

@@ -1,130 +0,0 @@
-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

@@ -1,132 +0,0 @@
-"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"
-                    }
-                ]
-            }
-        }
-    ]
-};