flash-sdk 1.0.17 → 1.0.18

package/src/PoolConfig.json

@@ -55,6 +55,7 @@
       ],
       "custodies": [
         {
+          "custodyId" : 0,
           "custodyAccount": "CkYddgaB8c5tvs9WP11B83HvMaU35ZFpTzLLGg4NviEj",
           "tokenAccount": "DHy9BXo36hwKkvBJnPd11zH77BefA77mTiL7yu2LNWPx",
           "symbol": "USDC",
@@ -64,6 +65,7 @@
           "oracleAddress": "5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7"
         },
         {
+          "custodyId" : 1,
           "custodyAccount": "4ueMZBmpTMPykYwTENJs7diYfgx6UBCPQnRwb2F5UFgw",
           "tokenAccount": "G9bJQdZkzXZsiwouZ8MsZw6p8Pg5vtM9hbVHjfqSrJZo",
           "symbol": "SOL",
@@ -73,6 +75,7 @@
           "oracleAddress": "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix"
         },
         {
+          "custodyId" : 2,
           "custodyAccount": "F9qzX5pHGS5SFfP5M24a8dqXUHQdraexJ3P9TNGF2WFj",
           "tokenAccount": "y5vPUaQdM3fJkEyn3oA8uFMRzwJYcNJsjBZyW1yRUar",
           "symbol": "BTC",
@@ -82,6 +85,7 @@
           "oracleAddress": "HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J"
         },
         {
+          "custodyId" : 3,
           "custodyAccount": "BZggMsfpcpbB3tnhmtM2qJ1uMobKVBEmYZp2jmDrBHZD",
           "tokenAccount": "HP4CcezCpCZqcoo8BsrroFEaykz2F4bz6sWBCCUJEBPy",
           "symbol": "ETH",

package/src/PoolConfig.ts

@@ -4,6 +4,7 @@ import poolConfigs from './PoolConfig.json';
 
 
 export interface CustodyConfig {
+  custodyId: number;
   custodyAccount: PublicKey;
   tokenAccount: PublicKey;
   symbol: string;
@@ -108,9 +109,10 @@ export class PoolConfig {
         mintKey : new PublicKey(i.mintKey)
       }
     })
-    const custodies : CustodyConfig[] = poolConfig['custodies'].map(i => {
+    const custodies : CustodyConfig[] = poolConfig['custodies'].map((i, index) => {
       return {
         ...i,
+        custodyId : i?.custodyId ?? index,
         custodyAccount : new PublicKey(i.custodyAccount),
         tokenAccount : new PublicKey(i.tokenAccount),
         mintKey : new PublicKey(i.mintKey),

package/src/idl/perpetuals.ts

@@ -3365,36 +3365,79 @@ export type Perpetuals = {
   ],
   "events": [
     {
-      "name": "OpenPositionLog",
+      "name": "AddCollateralLog",
       "fields": [
         {
-          "name": "positionPubKey",
+          "name": "owner",
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
+          "index": false
+        },
+        {
+          "name": "price",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateral",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "AddLiquidityLog",
+      "fields": [
         {
           "name": "owner",
           "type": "publicKey",
           "index": false
         },
         {
-          "name": "pool",
-          "type": "publicKey",
+          "name": "tokenIn",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "custody",
-          "type": "publicKey",
+          "name": "amountIn",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "openTime",
-          "type": "i64",
+          "name": "lpAmountOut",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "ClosePositionLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
           "index": false
         },
         {
-          "name": "updateTime",
-          "type": "i64",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
@@ -3415,68 +3458,113 @@ export type Perpetuals = {
           "index": false
         },
         {
-          "name": "collateralUsd",
+          "name": "profitUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "unrealizedProfitUsd",
+          "name": "lossUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "unrealizedLossUsd",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "LiquidateLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          "name": "cumulativeInterestSnapshot",
-          "type": "u128",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
           "index": false
         },
         {
-          "name": "lockedAmount",
+          "name": "price",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateralAmount",
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "feeAmount",
           "type": "u64",
           "index": false
         }
       ]
     },
     {
-      "name": "ClosePositionLog",
+      "name": "OpenPositionLog",
       "fields": [
         {
-          "name": "positionPubKey",
+          "name": "owner",
           "type": "publicKey",
           "index": false
         },
         {
-          "name": "owner",
-          "type": "publicKey",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "pool",
-          "type": "publicKey",
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
           "index": false
         },
         {
-          "name": "custody",
-          "type": "publicKey",
+          "name": "size",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "openTime",
-          "type": "i64",
+          "name": "price",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "updateTime",
-          "type": "i64",
+          "name": "collateral",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "RemoveCollateralLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
@@ -3492,52 +3580,88 @@ export type Perpetuals = {
           "index": false
         },
         {
-          "name": "sizeUsd",
+          "name": "collateralUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateralUsd",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "RemoveLiquidityLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          "name": "unrealizedProfitUsd",
-          "type": "u64",
+          "name": "tokenOut",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "unrealizedLossUsd",
+          "name": "lpAmountIn",
           "type": "u64",
           "index": false
         },
         {
-          "name": "cumulativeInterestSnapshot",
-          "type": "u128",
+          "name": "amountOut",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "lockedAmount",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "SwapLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "tokenIn",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
         },
         {
-          "name": "collateralAmount",
+          "name": "tokenOut",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "amountIn",
           "type": "u64",
           "index": false
         },
         {
-          "name": "profitUsd",
+          "name": "amountOut",
           "type": "u64",
           "index": false
         },
         {
-          "name": "lossUsd",
+          "name": "feeInAmount",
           "type": "u64",
           "index": false
         },
         {
-          "name": "feeAmount",
+          "name": "feeOutAmount",
           "type": "u64",
           "index": false
         }
@@ -7040,36 +7164,79 @@ export const IDL: Perpetuals = {
   ],
   "events": [
     {
-      "name": "OpenPositionLog",
+      "name": "AddCollateralLog",
       "fields": [
         {
-          "name": "positionPubKey",
+          "name": "owner",
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
+          "index": false
+        },
+        {
+          "name": "price",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateral",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "AddLiquidityLog",
+      "fields": [
         {
           "name": "owner",
           "type": "publicKey",
           "index": false
         },
         {
-          "name": "pool",
-          "type": "publicKey",
+          "name": "tokenIn",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "custody",
-          "type": "publicKey",
+          "name": "amountIn",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "openTime",
-          "type": "i64",
+          "name": "lpAmountOut",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "ClosePositionLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
           "index": false
         },
         {
-          "name": "updateTime",
-          "type": "i64",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
@@ -7090,68 +7257,113 @@ export const IDL: Perpetuals = {
           "index": false
         },
         {
-          "name": "collateralUsd",
+          "name": "profitUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "unrealizedProfitUsd",
+          "name": "lossUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "unrealizedLossUsd",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "LiquidateLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          "name": "cumulativeInterestSnapshot",
-          "type": "u128",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
           "index": false
         },
         {
-          "name": "lockedAmount",
+          "name": "price",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateralAmount",
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "feeAmount",
           "type": "u64",
           "index": false
         }
       ]
     },
     {
-      "name": "ClosePositionLog",
+      "name": "OpenPositionLog",
       "fields": [
         {
-          "name": "positionPubKey",
+          "name": "owner",
           "type": "publicKey",
           "index": false
         },
         {
-          "name": "owner",
-          "type": "publicKey",
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "pool",
-          "type": "publicKey",
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
           "index": false
         },
         {
-          "name": "custody",
-          "type": "publicKey",
+          "name": "size",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "openTime",
-          "type": "i64",
+          "name": "price",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "updateTime",
-          "type": "i64",
+          "name": "collateral",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "RemoveCollateralLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "custodyId",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
@@ -7167,52 +7379,88 @@ export const IDL: Perpetuals = {
           "index": false
         },
         {
-          "name": "sizeUsd",
+          "name": "collateralUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateralUsd",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "RemoveLiquidityLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          "name": "unrealizedProfitUsd",
-          "type": "u64",
+          "name": "tokenOut",
+          "type": {
+            "defined": "usize"
+          },
           "index": false
         },
         {
-          "name": "unrealizedLossUsd",
+          "name": "lpAmountIn",
           "type": "u64",
           "index": false
         },
         {
-          "name": "cumulativeInterestSnapshot",
-          "type": "u128",
+          "name": "amountOut",
+          "type": "u64",
           "index": false
         },
         {
-          "name": "lockedAmount",
+          "name": "feeAmount",
           "type": "u64",
           "index": false
+        }
+      ]
+    },
+    {
+      "name": "SwapLog",
+      "fields": [
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "tokenIn",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
         },
         {
-          "name": "collateralAmount",
+          "name": "tokenOut",
+          "type": {
+            "defined": "usize"
+          },
+          "index": false
+        },
+        {
+          "name": "amountIn",
           "type": "u64",
           "index": false
         },
         {
-          "name": "profitUsd",
+          "name": "amountOut",
           "type": "u64",
           "index": false
         },
         {
-          "name": "lossUsd",
+          "name": "feeInAmount",
           "type": "u64",
           "index": false
         },
         {
-          "name": "feeAmount",
+          "name": "feeOutAmount",
           "type": "u64",
           "index": false
         }