flash-sdk 1.0.133 → 2.0.0

package/dist/PoolConfig.json

@@ -7,116 +7,21 @@
     },
     "pools": [
         {
-            "programId": "FT69jb9K5b6uUbvk2BczUoG5bUS9gDPNMRbSk4GRyqw9",
+            "programId": "FTN6rgbaaxwT8mpRuC55EFTwpHB3BwnHJ91Lqv4ZVCfW",
+            "perpComposibilityProgramId": "SWAP4AE4N1if9qKD7dgfQgmRBRv1CtWG8xDs4HP14ST",
             "cluster": "devnet",
-            "poolName": "devnet.6",
-            "poolAddress": "G1kqHDqxMfUDAjLbN43FC5ZM6XDcvWuazdKpDX6BVVxS",
-            "lpTokenMint": "9tbZ44Jgr4e6vMAVZL347iUxVubXsq9gZfbb4zM8nVZ9",
+            "poolName": "devnet.1",
+            "poolAddress": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+            "lpTokenMint": "H4h7nsZaz53KZHMdSXc5byBjcbymEFYX6an8UVbh51yU",
+            "metadataAccount": "7NvA4CEqr9Tei1MDDKrbYFKV5D39fkPPEfRv5Z5ZXZEb",
             "lpDecimals": 6,
-            "lpTokenSymbol": "FLP.6",
-            "perpetuals": "ArVyuoPszQtUJ55dLUbfSzgFEd51sGv6e9pa7mY28YSS",
-            "transferAuthority": "3SRkyahDfpKu7Z5pBpqqCh3BmNypdqTQTkPihwqJVHch",
-            "multisig": "H4qXpG1vtRC6k2FKQ1tCs2Ybu1JrFAAQhR3HpR17pNGk",
-            "addressLookupTableAddresses": ["73Tr8hBsgxQrugMQLsG5gSxBdHbnbhjh1VvgUgEz7MM3"],
-            "backupOracle": "AHaKsRB4tsGSzFfFqAxUpfRRmsUj5EhwHSxSXK2UGRp5",
-            "tokens": [
-                {
-                    "symbol": "USDC",
-                    "mintKey": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr",
-                    "decimals": 6,
-                    "isStable": true,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.USDC/USD",
-                    "pythPriceId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a"
-                },
-                {
-                    "symbol": "XAU",
-                    "mintKey": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "pythTicker": "Metal.XAU/USD",
-                    "pythPriceId": "0x765d2ba906dbc32ca17cc11f5310a89e9ee1f6420508c63861f2f8ba4ee34bb2"
-                },
-                {
-                    "symbol": "COIN",
-                    "mintKey": "coin5CDSu7E6t89hYjt22jinQTue2sXQUw4c54XKpxq",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "pythTicker": "Equity.US.COIN/USD",
-                    "pythPriceId": "0xfee33f2a978bf32dd6b662b65ba8083c6773b494f8401194ec1870c640860245"
-                },
-                {
-                    "symbol": "EUR",
-                    "mintKey": "eurExbEMAz5jq8r31EGc3gg9ddu7ftBJWg8A6hYsvng",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "pythTicker": "FX.EUR/USD",
-                    "pythPriceId": "0xa995d00bb36a63cef7fd2c287dc105fc8f3d93779f062f09551b0af3e81ec30b"
-                }
-            ],
-            "custodies": [
-                {
-                    "custodyId": 0,
-                    "custodyAccount": "2NtToAmany39eyukB2uy88u8sgHC59964tR4Fpsp4NMv",
-                    "tokenAccount": "4rvXQgs5n5kaEK9no9N5WV7NU7fMrAkyqGUvbN6v3VYB",
-                    "symbol": "USDC",
-                    "mintKey": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr",
-                    "decimals": 6,
-                    "isStable": true,
-                    "isVirtual": false,
-                    "oracleAddress": "5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7"
-                },
-                {
-                    "custodyId": 1,
-                    "custodyAccount": "gMEhcsS6vjEd8dR9gQ18QPCZbtvF4K4tmDFDmwzHX3g",
-                    "tokenAccount": "HqatH1tTT49AmfK1BwrJJohXeFVefcTSCP7jV2UF9H68",
-                    "symbol": "XAU",
-                    "mintKey": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "oracleAddress": "4GqTjGm686yihQ1m1YdTsSvfm4mNfadv6xskzgCYWNC5"
-                },
-                {
-                    "custodyId": 2,
-                    "custodyAccount": "6xKwkSLL6yfCSK247gKGZTEci1ibjA3FW47XWnqrkSDN",
-                    "tokenAccount": "Ek8XvjnpA2c2wvdTxQzB1fSpDXgZab9v2CyGnMuE9qSD",
-                    "symbol": "COIN",
-                    "mintKey": "coin5CDSu7E6t89hYjt22jinQTue2sXQUw4c54XKpxq",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "oracleAddress": "BwkRMkWjfMvWeFLqfQzwhumQan4CxNtyQRbKxtkV4yzi"
-                },
-                {
-                    "custodyId": 3,
-                    "custodyAccount": "Cd2w3Eino1XqNpEBw4bzsm57BXwMpxgTiVdXVYA7ymZE",
-                    "tokenAccount": "HRhHeY8zzEN4wD2ykwvfXtvY5rV1zQeLSbBj56UZyWrh",
-                    "symbol": "EUR",
-                    "mintKey": "eurExbEMAz5jq8r31EGc3gg9ddu7ftBJWg8A6hYsvng",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": true,
-                    "oracleAddress": "E36MyBbavhYKHVLWR79GiReNNnBDiHj6nWA7htbkNZbh"
-                }
-            ]
-        },
-        {
-            "programId": "FT69jb9K5b6uUbvk2BczUoG5bUS9gDPNMRbSk4GRyqw9",
-            "cluster": "devnet",
-            "poolName": "devnet.5",
-            "poolAddress": "G4Pzz6ComzRJ7Tc2JvYWUzECedC8dmz9n2fZpj8hFWmK",
-            "lpTokenMint": "GmURGADRvNzCrV8BDVuG2qVn5JAUgiUuo8NqP7FPj2Yc",
-            "lpDecimals": 6,
-            "lpTokenSymbol": "FLP.5",
-            "perpetuals": "ArVyuoPszQtUJ55dLUbfSzgFEd51sGv6e9pa7mY28YSS",
-            "transferAuthority": "3SRkyahDfpKu7Z5pBpqqCh3BmNypdqTQTkPihwqJVHch",
-            "multisig": "H4qXpG1vtRC6k2FKQ1tCs2Ybu1JrFAAQhR3HpR17pNGk",
-            "addressLookupTableAddresses": ["73Tr8hBsgxQrugMQLsG5gSxBdHbnbhjh1VvgUgEz7MM3"],
+            "lpTokenSymbol": "FLP.1",
+            "perpetuals": "445GcRLAJ64DcxSRbvQTkbwXgWUyubAxzQUQ2wL73KLS",
+            "transferAuthority": "EPyHAAHUYnFATwd8CJ7owLnozFeS8pFsr3RNJD1eueYq",
+            "multisig": "Eu3cBFRo18AeN9BFb5ndzk2PEmBT7yWEhh3VkG21pyGo",
+            "addressLookupTableAddresses": ["Ejc8FEVsREUim6wb7Xwgf7nai3T3AWNCBWBM7pbWdbJa"],
             "backupOracle": "AHaKsRB4tsGSzFfFqAxUpfRRmsUj5EhwHSxSXK2UGRp5",
+            "nftCollectionAddress": "3rkRzHdN7dXy5CQfX3Lz6UBBJ2F9n58VEpvDSmbaVHt9",
             "tokens": [
                 {
                     "symbol": "USDC",
@@ -167,8 +72,8 @@
             "custodies": [
                 {
                     "custodyId": 0,
-                    "custodyAccount": "FxNrtHfQtEgLjEJETU82Wr4qNcE3SGo7fidujLvzdCE9",
-                    "tokenAccount": "DBGzx3FM9NiMYDkZMB1nKGHEwJyV8EXbTatFF8EWtzSZ",
+                    "custodyAccount": "AqZSmo7tVgPrZ72kSpRugN8pTCBTHovw65qPikP15dmK",
+                    "tokenAccount": "8q8f5sp7kwGktJzboffVcKhXanGcJJ9HbqFH1LU8B1Ux",
                     "symbol": "USDC",
                     "mintKey": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr",
                     "decimals": 6,
@@ -178,8 +83,8 @@
                 },
                 {
                     "custodyId": 1,
-                    "custodyAccount": "6exZmF1QpA7HgYLbBnf5u9kbwYYEr5y8fzhWBBpvzqM",
-                    "tokenAccount": "BxknHpSoiHpavTmppybgpYFmmh2KJjGApBhrMBV69ZLL",
+                    "custodyAccount": "8BHHyTJKvZXQkjCeigdkH7hAFcnfX5ecXwysjLnG18FT",
+                    "tokenAccount": "8Qa3fV58Lu8WsiPRnkn4xx3PyA2wxE62ESHLXxhesWST",
                     "symbol": "SOL",
                     "mintKey": "So11111111111111111111111111111111111111112",
                     "decimals": 9,
@@ -189,8 +94,8 @@
                 },
                 {
                     "custodyId": 2,
-                    "custodyAccount": "2qMFGfvKLgVNU9BBhjyKyacGdqkH9ynT9DqXyJpqwi6G",
-                    "tokenAccount": "21rH6U43WH9BPsXTpmahYxBeE9ehdjz44gJYdyJZ9XcX",
+                    "custodyAccount": "F8peHuGzRwLAgRXm9CGQNKqpWkxTkJQVZw6uLJPx12TV",
+                    "tokenAccount": "CEgxrynA9ifMkbiGC8za4LgrvbvzZYSoh1iYQ1n7qMAJ",
                     "symbol": "BTC",
                     "mintKey": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",
                     "decimals": 6,
@@ -200,8 +105,8 @@
                 },
                 {
                     "custodyId": 3,
-                    "custodyAccount": "ExE7ZBKRNdztDeQgkuyW9QWzBARvYAvT2Q5aa8KAHiZB",
-                    "tokenAccount": "BwsUPZBYNJVVHBq94dm1XJAPRgERrSc9tnN8e3zKSJYX",
+                    "custodyAccount": "4Xtj4GEPwHjeXeDRmcAyAoZyPH4bsEQ4qFyhcK8bBGgy",
+                    "tokenAccount": "7rUd15esvCwMCQZfrr3s2WnPYkQtB75AvLNBoEZs5XHJ",
                     "symbol": "ETH",
                     "mintKey": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
                     "decimals": 6,
@@ -209,21 +114,98 @@
                     "isVirtual": false,
                     "oracleAddress": "EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw"
                 }
+            ],
+            "markets": [
+                {
+                    "marketId": 0,
+                    "marketAccount": "7HkcVQpXAR9RB4aQhuV9TAXaSLWGbu5JMs6M3EWB3Gj2",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "8BHHyTJKvZXQkjCeigdkH7hAFcnfX5ecXwysjLnG18FT",
+                    "collateralCustody": "8BHHyTJKvZXQkjCeigdkH7hAFcnfX5ecXwysjLnG18FT",
+                    "side": "long",
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 1,
+                    "targetMint": "So11111111111111111111111111111111111111112",
+                    "collateralMint": "So11111111111111111111111111111111111111112"
+                },
+                {
+                    "marketId": 1,
+                    "marketAccount": "Fj1hwfeccqjSAKGkX6jEbJZ2auW2zWsoYPjzugwKBTpJ",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "8BHHyTJKvZXQkjCeigdkH7hAFcnfX5ecXwysjLnG18FT",
+                    "collateralCustody": "AqZSmo7tVgPrZ72kSpRugN8pTCBTHovw65qPikP15dmK",
+                    "side": "short",
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 0,
+                    "targetMint": "So11111111111111111111111111111111111111112",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 2,
+                    "marketAccount": "GZ9HHuNoz17Tj6xBks1ZRAN4k4h47E88iEeBoeZUTNbX",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "F8peHuGzRwLAgRXm9CGQNKqpWkxTkJQVZw6uLJPx12TV",
+                    "collateralCustody": "F8peHuGzRwLAgRXm9CGQNKqpWkxTkJQVZw6uLJPx12TV",
+                    "side": "long",
+                    "targetCustodyId": 2,
+                    "collateralCustodyId": 2,
+                    "targetMint": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",
+                    "collateralMint": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP"
+                },
+                {
+                    "marketId": 3,
+                    "marketAccount": "FXVWNVv1y7vS7boZmTWq9TujhdZLfGmrWFDEqnTpg9zU",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "F8peHuGzRwLAgRXm9CGQNKqpWkxTkJQVZw6uLJPx12TV",
+                    "collateralCustody": "AqZSmo7tVgPrZ72kSpRugN8pTCBTHovw65qPikP15dmK",
+                    "side": "short",
+                    "targetCustodyId": 2,
+                    "collateralCustodyId": 0,
+                    "targetMint": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 4,
+                    "marketAccount": "4xZb6fic3bDcXG38tXzjQ5n7qRpPoQt7P2rRfEPfYYmz",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "4Xtj4GEPwHjeXeDRmcAyAoZyPH4bsEQ4qFyhcK8bBGgy",
+                    "collateralCustody": "4Xtj4GEPwHjeXeDRmcAyAoZyPH4bsEQ4qFyhcK8bBGgy",
+                    "side": "long",
+                    "targetCustodyId": 3,
+                    "collateralCustodyId": 3,
+                    "targetMint": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
+                    "collateralMint": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz"
+                },
+                {
+                    "marketId": 5,
+                    "marketAccount": "96GfXnGddBdZbFfbLAcpj4BLAvKj8VAoAti97vhvsizG",
+                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
+                    "targetCustody": "4Xtj4GEPwHjeXeDRmcAyAoZyPH4bsEQ4qFyhcK8bBGgy",
+                    "collateralCustody": "AqZSmo7tVgPrZ72kSpRugN8pTCBTHovw65qPikP15dmK",
+                    "side": "short",
+                    "targetCustodyId": 3,
+                    "collateralCustodyId": 0,
+                    "targetMint": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                }
             ]
         },
         {
-            "programId": "FT69jb9K5b6uUbvk2BczUoG5bUS9gDPNMRbSk4GRyqw9",
+            "programId": "FTN6rgbaaxwT8mpRuC55EFTwpHB3BwnHJ91Lqv4ZVCfW",
+            "perpComposibilityProgramId": "SWAP4AE4N1if9qKD7dgfQgmRBRv1CtWG8xDs4HP14ST",
             "cluster": "devnet",
-            "poolName": "devnet.4",
-            "poolAddress": "6dohCdceggAgNCG3JGx4cqhyyhchRHpLoTD4RmsYBVar",
-            "lpTokenMint": "RcsqWsonqwfbXqmQQ5SrvLA1LD63AHkm2cLFhHKc1xS",
+            "poolName": "devnet.2",
+            "poolAddress": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+            "lpTokenMint": "CEBnqSukYQjcRiKiZKmkbJSDYojtc4GdSipKJ5bSYvHd",
+            "metadataAccount": "CeUy9d6CGyj4mL3JVhYKK2A462yjpb4FGyWUyA7zDoWi",
             "lpDecimals": 6,
-            "lpTokenSymbol": "FLP.4",
-            "perpetuals": "ArVyuoPszQtUJ55dLUbfSzgFEd51sGv6e9pa7mY28YSS",
-            "transferAuthority": "3SRkyahDfpKu7Z5pBpqqCh3BmNypdqTQTkPihwqJVHch",
-            "multisig": "H4qXpG1vtRC6k2FKQ1tCs2Ybu1JrFAAQhR3HpR17pNGk",
-            "addressLookupTableAddresses": ["AxeLTBekT2jYrzwh69NZiUJFF9ZY6ukEWpWSmpDUAjRW"],
+            "lpTokenSymbol": "FLP.2",
+            "perpetuals": "445GcRLAJ64DcxSRbvQTkbwXgWUyubAxzQUQ2wL73KLS",
+            "transferAuthority": "EPyHAAHUYnFATwd8CJ7owLnozFeS8pFsr3RNJD1eueYq",
+            "multisig": "Eu3cBFRo18AeN9BFb5ndzk2PEmBT7yWEhh3VkG21pyGo",
+            "addressLookupTableAddresses": ["Ejc8FEVsREUim6wb7Xwgf7nai3T3AWNCBWBM7pbWdbJa"],
             "backupOracle": "AHaKsRB4tsGSzFfFqAxUpfRRmsUj5EhwHSxSXK2UGRp5",
+            "nftCollectionAddress": "3rkRzHdN7dXy5CQfX3Lz6UBBJ2F9n58VEpvDSmbaVHt9",
             "tokens": [
                 {
                     "symbol": "USDC",
@@ -234,42 +216,6 @@
                     "pythTicker": "Crypto.USDC/USD",
                     "pythPriceId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a"
                 },
-                {
-                    "symbol": "SOL",
-                    "mintKey": "So11111111111111111111111111111111111111112",
-                    "decimals": 9,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.SOL/USD",
-                    "pythPriceId": "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d"
-                },
-                {
-                    "symbol": "WSOL",
-                    "mintKey": "So11111111111111111111111111111111111111112",
-                    "decimals": 9,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.SOL/USD",
-                    "pythPriceId": "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d"
-                },
-                {
-                    "symbol": "BTC",
-                    "mintKey": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.BTC/USD",
-                    "pythPriceId": "0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43"
-                },
-                {
-                    "symbol": "ETH",
-                    "mintKey": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.ETH/USD",
-                    "pythPriceId": "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace"
-                },
                 {
                     "symbol": "XAU",
                     "mintKey": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
@@ -301,8 +247,8 @@
             "custodies": [
                 {
                     "custodyId": 0,
-                    "custodyAccount": "DiT9DtZUfeLVYLgDmX1fGrbbrhx5LDdwMruZRTHD49hL",
-                    "tokenAccount": "NmcFhdBeyXd7FHi5d7R572YVmdUzXtQTrZthahuVQSk",
+                    "custodyAccount": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "tokenAccount": "33GEjYtTbKXtBJSpR92DMqBUWUhgMXRUmRe5BaV5ximh",
                     "symbol": "USDC",
                     "mintKey": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr",
                     "decimals": 6,
@@ -312,41 +258,8 @@
                 },
                 {
                     "custodyId": 1,
-                    "custodyAccount": "DPk2Fch1z1e5VzMUAFdLXfxB7fYEvmjkdv893QUsREPq",
-                    "tokenAccount": "CenkKUBkcaRnx33nKGBZaZgXQVV1rc79UC4o8t5U46Hi",
-                    "symbol": "SOL",
-                    "mintKey": "So11111111111111111111111111111111111111112",
-                    "decimals": 9,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "oracleAddress": "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix"
-                },
-                {
-                    "custodyId": 2,
-                    "custodyAccount": "APUEYEXeF2LtuuLHx4xAMVhaWQSpW4AFPaZqnzRBBB71",
-                    "tokenAccount": "62nixm4GXVagnrJ9Fhz4TvzaY7SGzSxd5M64etndE2a6",
-                    "symbol": "BTC",
-                    "mintKey": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "oracleAddress": "HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J"
-                },
-                {
-                    "custodyId": 3,
-                    "custodyAccount": "FCiG7QmAZ2SKpoFtfaskHD7upaXKtcPLZuaaGZVYNpem",
-                    "tokenAccount": "5vGRrHN1NRDqcf9b2EVVmpNvtN2dLMdk5miY17ThDFpA",
-                    "symbol": "ETH",
-                    "mintKey": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
-                    "decimals": 6,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "oracleAddress": "EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw"
-                },
-                {
-                    "custodyId": 4,
-                    "custodyAccount": "CvLqzpDBN7tzQMdeibVJzZPzUxJtpyWh9tKLi3g7EuMs",
-                    "tokenAccount": "FFpHEX4Ba26KRNbE5YHhQ5V9s2EJxaB4YmuJwZbCRHe9",
+                    "custodyAccount": "3de6DnZhfv7TmuaAsfzBtkmueWxLQuJ772ATYB7GCguW",
+                    "tokenAccount": "CQ33dxTZwEaqYMEzD2yJLW4U4z81YLiwZkoEhbeZ31zS",
                     "symbol": "XAU",
                     "mintKey": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
                     "decimals": 6,
@@ -355,9 +268,9 @@
                     "oracleAddress": "4GqTjGm686yihQ1m1YdTsSvfm4mNfadv6xskzgCYWNC5"
                 },
                 {
-                    "custodyId": 5,
-                    "custodyAccount": "AenEuCqMYZf1ZGkp9HuXTyf9Qg2SjUwWRDHMPJPVMviQ",
-                    "tokenAccount": "6w9QTXmw6EzmqdGDmqiz2rFrg7NrYfJLEHFoXo259hjy",
+                    "custodyId": 2,
+                    "custodyAccount": "JCwAVqhhYkFQxAoT6TMJFcQQzD4BqcswSo9tZSVTEB9r",
+                    "tokenAccount": "EyTXjGLn7Bcs2T5qUbKszacGc9CQcjTid1BBq3zhwMrp",
                     "symbol": "COIN",
                     "mintKey": "coin5CDSu7E6t89hYjt22jinQTue2sXQUw4c54XKpxq",
                     "decimals": 6,
@@ -366,9 +279,9 @@
                     "oracleAddress": "BwkRMkWjfMvWeFLqfQzwhumQan4CxNtyQRbKxtkV4yzi"
                 },
                 {
-                    "custodyId": 6,
-                    "custodyAccount": "8KcCvkq1G5g6imnZA75XatBdXYCXoDsNgWBH5QAoQqnX",
-                    "tokenAccount": "FkFpCPqRWEpVUG4Qa34guqdsdSyeMbk7mo3p1jeAmyEG",
+                    "custodyId": 3,
+                    "custodyAccount": "EoCbHAPYhUPZY977AKU7j4XU5rgYnbjQMnB9nqZYCrrG",
+                    "tokenAccount": "sYnuU1vKqGaU5V9A7F83yiGAKNVhpPHSHooAn4qqSWr",
                     "symbol": "EUR",
                     "mintKey": "eurExbEMAz5jq8r31EGc3gg9ddu7ftBJWg8A6hYsvng",
                     "decimals": 6,
@@ -376,6 +289,80 @@
                     "isVirtual": true,
                     "oracleAddress": "E36MyBbavhYKHVLWR79GiReNNnBDiHj6nWA7htbkNZbh"
                 }
+            ],
+            "markets": [
+                {
+                    "marketId": 0,
+                    "marketAccount": "B71om3HUqZ64e9wRj1R8LbWUFvw6cde4yuU4yXvo4GYv",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "3de6DnZhfv7TmuaAsfzBtkmueWxLQuJ772ATYB7GCguW",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "long",
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 0,
+                    "targetMint": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 1,
+                    "marketAccount": "9wV2Y87ix64cFP6B3VNxuXiabTPYgAm65MuqgivXVUn7",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "3de6DnZhfv7TmuaAsfzBtkmueWxLQuJ772ATYB7GCguW",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "short",
+                    "targetCustodyId": 1,
+                    "collateralCustodyId": 0,
+                    "targetMint": "xaucSYSxjZF4EbsLqAGRvPcuD1uXAj9awmsxYkUAavx",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 2,
+                    "marketAccount": "9AiEn2s6DipDBesE84qWPmPwMAJpeYRBZtCaTy7D6DhA",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "JCwAVqhhYkFQxAoT6TMJFcQQzD4BqcswSo9tZSVTEB9r",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "long",
+                    "targetCustodyId": 2,
+                    "collateralCustodyId": 0,
+                    "targetMint": "coin5CDSu7E6t89hYjt22jinQTue2sXQUw4c54XKpxq",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 3,
+                    "marketAccount": "CmEEEnADVBkhdf9BRckynfyfU8epzy2Bzave8UnBdJRK",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "JCwAVqhhYkFQxAoT6TMJFcQQzD4BqcswSo9tZSVTEB9r",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "short",
+                    "targetCustodyId": 2,
+                    "collateralCustodyId": 0,
+                    "targetMint": "coin5CDSu7E6t89hYjt22jinQTue2sXQUw4c54XKpxq",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 4,
+                    "marketAccount": "4ryTFNWPE1J1X3akTrXjygS47b9agM9uGGByc1TvxbdN",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "EoCbHAPYhUPZY977AKU7j4XU5rgYnbjQMnB9nqZYCrrG",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "long",
+                    "targetCustodyId": 3,
+                    "collateralCustodyId": 0,
+                    "targetMint": "eurExbEMAz5jq8r31EGc3gg9ddu7ftBJWg8A6hYsvng",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                },
+                {
+                    "marketId": 5,
+                    "marketAccount": "Cz3FVEBdQ2Ns2uorfM6ZjWbvqMNRSnSHaTFprAcKUzEJ",
+                    "pool": "5MCtcNsF3dxna8ArzMamyciWDV3TBkiAzY1NqLtNiXvw",
+                    "targetCustody": "EoCbHAPYhUPZY977AKU7j4XU5rgYnbjQMnB9nqZYCrrG",
+                    "collateralCustody": "8DrHPGQq4dBrSYV2oy8oDi3sQDSgeCaAe1jq3s9tSh42",
+                    "side": "short",
+                    "targetCustodyId": 3,
+                    "collateralCustodyId": 0,
+                    "targetMint": "eurExbEMAz5jq8r31EGc3gg9ddu7ftBJWg8A6hYsvng",
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
+                }
             ]
         }
     ]

package/dist/PoolDataClient.d.ts

@@ -5,6 +5,7 @@ import { CustodyAccount } from "./CustodyAccount";
 import { OraclePrice } from "./OraclePrice";
 import { PoolConfig } from "./PoolConfig";
 import { PoolAccount } from "./PoolAccount";
+import { MarketAccount } from "./MarketAccount";
 export interface LpStats {
     lpTokenSupply: BN;
     decimals: number;
@@ -37,23 +38,16 @@ export interface CustodyStats {
     minCapacityAmountUi: string;
     maxCapacityAmountUi: string;
 }
-export interface PoolStats {
-    totalFees: BN;
-    totalVolume: BN;
-    currentLongPositionsUsd: BN;
-    currentShortPositionsUsd: BN;
-}
 export declare class PoolDataClient {
     poolConfig: PoolConfig;
     pool: PoolAccount;
     lpTokenInfo: Mint;
     custodies: CustodyAccount[];
+    markets: MarketAccount[];
     constructor(poolConfig: PoolConfig, pool: PoolAccount, lpTokenInfo: Mint, custodies: CustodyAccount[]);
     loadCustodies(custodies: CustodyAccount[]): void;
     loadPoolData(pool: PoolAccount): void;
     loadLpData(lpTokenInfo: Mint): void;
-    getOiLongUI(): BN;
-    getOiShortUI(): BN;
     getLpStats(pricesMap: Map<string, {
         price: OraclePrice;
         emaPrice: OraclePrice;
@@ -62,5 +56,4 @@ export declare class PoolDataClient {
         price: OraclePrice;
         emaPrice: OraclePrice;
     }>): CustodyStats[];
-    getPoolStats(): PoolStats;
 }

package/dist/PoolDataClient.js

@@ -24,20 +24,6 @@ var PoolDataClient = (function () {
     PoolDataClient.prototype.loadLpData = function (lpTokenInfo) {
         this.lpTokenInfo = lpTokenInfo;
     };
-    PoolDataClient.prototype.getOiLongUI = function () {
-        var totalAmount = new anchor_1.BN('0');
-        this.custodies.forEach(function (i) {
-            totalAmount = totalAmount.add(i.tradeStats.oiLong);
-        });
-        return totalAmount;
-    };
-    PoolDataClient.prototype.getOiShortUI = function () {
-        var totalAmount = new anchor_1.BN('0');
-        this.custodies.forEach(function (i) {
-            totalAmount = totalAmount.add(i.tradeStats.oiShort);
-        });
-        return totalAmount;
-    };
     PoolDataClient.prototype.getLpStats = function (pricesMap) {
         var stableCoinAmountBni = new bignumber_js_1.default(0);
         var totalPoolValueUsdBnUi = new bignumber_js_1.default(0);
@@ -78,7 +64,7 @@ var PoolDataClient = (function () {
     };
     PoolDataClient.prototype.getCustodyStats = function (pricesMap) {
         var totalPoolValueUsd = this.getLpStats(pricesMap).totalPoolValueUsd;
-        var totalPoolValueUsdUi = totalPoolValueUsd.isZero() ? '0' : (0, utils_1.nativeToUiDecimals)(totalPoolValueUsd, constants_1.PRICE_DECIMALS, constants_1.PRICE_DECIMALS);
+        var totalPoolValueUsdUi = totalPoolValueUsd.isZero() ? '0' : (0, utils_1.nativeToUiDecimals)(totalPoolValueUsd, constants_1.USD_DECIMALS, constants_1.USD_DECIMALS);
         var custodyDetails = [];
         var _loop_2 = function (i) {
             var custodyConfig = this_2.poolConfig.custodies[i];
@@ -140,34 +126,6 @@ var PoolDataClient = (function () {
         }
         return custodyDetails;
     };
-    PoolDataClient.prototype.getPoolStats = function () {
-        var totalFees = new anchor_1.BN(0);
-        var totalVolume = new anchor_1.BN(0);
-        var currentLongPositionsUsd = new anchor_1.BN(0);
-        var currentShortPositionsUsd = new anchor_1.BN(0);
-        var _loop_3 = function (custody) {
-            var custodyData = this_3.custodies.find(function (t) { return t.mint.toBase58() === custody.mintKey.toBase58(); });
-            if (custodyData) {
-                var custodyFeeTotal = Object.values(custodyData.collectedFees).reduce(function (a, b) { return a.add(b); }, new anchor_1.BN(0));
-                totalFees = totalFees.add(custodyFeeTotal);
-                var custodyVolume = Object.values(custodyData.volumeStats).reduce(function (a, b) { return a.add(b); }, new anchor_1.BN(0));
-                totalVolume = totalVolume.add(custodyVolume);
-                currentLongPositionsUsd = currentLongPositionsUsd.add(custodyData.tradeStats.oiLong);
-                currentShortPositionsUsd = currentShortPositionsUsd.add(custodyData.tradeStats.oiShort);
-            }
-        };
-        var this_3 = this;
-        for (var _i = 0, _a = this.poolConfig.custodies; _i < _a.length; _i++) {
-            var custody = _a[_i];
-            _loop_3(custody);
-        }
-        return {
-            totalFees: totalFees,
-            totalVolume: totalVolume,
-            currentLongPositionsUsd: currentLongPositionsUsd,
-            currentShortPositionsUsd: currentShortPositionsUsd
-        };
-    };
     return PoolDataClient;
 }());
 exports.PoolDataClient = PoolDataClient;

package/dist/PositionAccount.d.ts

@@ -1,27 +1,29 @@
 /// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
-import { Position, Side } from "./types";
+import { ContractOraclePrice, Position } from "./types";
 export declare class PositionAccount implements Position {
     publicKey: PublicKey;
     owner: PublicKey;
+    market: PublicKey;
     delegate: PublicKey;
-    pool: PublicKey;
-    custody: PublicKey;
-    collateralCustody: PublicKey;
     openTime: BN;
     updateTime: BN;
-    side: Side;
-    price: BN;
+    entryPrice: ContractOraclePrice;
     sizeUsd: BN;
-    borrowSizeUsd: BN;
-    collateralUsd: BN;
-    unsettledAmount: BN;
-    unrealizedLossUsd: BN;
-    cumulativeInterestSnapshot: BN;
+    sizeAmount: BN;
     lockedAmount: BN;
+    lockedUsd: BN;
     collateralAmount: BN;
-    sizeAmount: BN;
+    collateralUsd: BN;
+    unsettledAmount: BN;
+    unsettledFeesUsd: BN;
+    cumulativeLockFeeSnapshot: BN;
+    takeProfitPrice: ContractOraclePrice;
+    stopLossPrice: ContractOraclePrice;
+    sizeDecimals: number;
+    lockedDecimals: number;
+    collateralDecimals: number;
     bump: number;
     constructor(publicKey: PublicKey, parseData: Position);
     static from(publicKey: PublicKey, parseData: Position): PositionAccount;

package/dist/TradingAccount.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="bn.js" />
+import { BN } from "@coral-xyz/anchor";
+import { Trading, VoltageStats } from "./types";
+import { PublicKey } from "@solana/web3.js";
+export declare class TradingAccount implements Trading {
+    publicKey: PublicKey;
+    nftMint: PublicKey;
+    owner: PublicKey;
+    delegate: PublicKey;
+    isInitialized: boolean;
+    level: number;
+    bump: number;
+    voltagePoints: BN;
+    stats: VoltageStats;
+    snapshot: VoltageStats;
+    padding: BN[];
+    constructor(publicKey: PublicKey, parseData: Trading);
+    static from(publicKey: PublicKey, parseData: Trading): TradingAccount;
+    updatePoolData(parseData: Trading): void;
+}