@triadxyz/triad-protocol 0.1.0-alpha.7 → 0.1.0-beta

package/dist/vault.d.ts

@@ -15,8 +15,8 @@ export default class Vault {
         name: string;
         tokenAccount: PublicKey;
         tickerAddress: PublicKey;
-        totalDeposits: BN;
-        totalWithdraws: BN;
+        totalDeposited: BN;
+        totalWithdrawn: BN;
         initTs: BN;
         netDeposits: BN;
         netWithdraws: BN;
@@ -24,7 +24,6 @@ export default class Vault {
         shortBalance: BN;
         longPositionsOpened: BN;
         shortPositionsOpened: BN;
-        ticker: PublicKey;
     }>[]>;
     /**
      * Get vault by ticker Address
@@ -36,8 +35,8 @@ export default class Vault {
         name: string;
         tokenAccount: PublicKey;
         tickerAddress: PublicKey;
-        totalDeposits: BN;
-        totalWithdraws: BN;
+        totalDeposited: BN;
+        totalWithdrawn: BN;
         initTs: BN;
         netDeposits: BN;
         netWithdraws: BN;
@@ -45,7 +44,6 @@ export default class Vault {
         shortBalance: BN;
         longPositionsOpened: BN;
         shortPositionsOpened: BN;
-        ticker: PublicKey;
     }>;
     /**
      * Open Position
@@ -59,6 +57,8 @@ export default class Vault {
         amount: string;
         position: 'Long' | 'Short';
         mint: PublicKey;
+    }, options?: {
+        priorityFee: number;
     }): Promise<string>;
     /**
      * Withdraw from a vault
@@ -69,11 +69,11 @@ export default class Vault {
      *  @param positionPubkey - The position public key
      *
      */
-    closePosition({ tickerPDA, amount, position, mint, positionPubkey }: {
+    closePosition({ tickerPDA, mint, positionIndex }: {
         tickerPDA: PublicKey;
-        amount: string;
-        position: 'Long' | 'Short';
         mint: PublicKey;
-        positionPubkey: PublicKey;
+        positionIndex: number;
+    }, options?: {
+        priorityFee: number;
     }): Promise<string>;
 }

package/dist/vault.js

@@ -49,30 +49,30 @@ class Vault {
      *  @param position - Long or Short
      *  @param mint - Token mint for the vault (e.g. USDC)
      */
-    openPosition({ tickerPDA, amount, position, mint }) {
+    openPosition({ tickerPDA, amount, position, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const UserPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, this.provider.wallet.publicKey);
+                const UserPositionPDA = (0, helpers_1.getUserPositionAddressSync)(this.program.programId, this.provider.wallet.publicKey, tickerPDA);
                 const VaultPDA = (0, helpers_1.getVaultAddressSync)(this.program.programId, tickerPDA);
-                const VaultTokenAccountPDA = (0, helpers_1.getTokenVaultAddressSync)(this.program.programId, VaultPDA);
                 const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(mint, this.provider.wallet.publicKey);
-                let hasUser = false;
+                let hasUserPosition = false;
                 try {
-                    yield this.program.account.user.fetch(UserPDA);
-                    hasUser = true;
+                    yield this.program.account.userPosition.fetch(UserPositionPDA);
+                    hasUserPosition = true;
                 }
                 catch (_a) { }
                 const instructions = [];
-                if (!hasUser) {
+                if (options === null || options === void 0 ? void 0 : options.priorityFee) {
+                    instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.priorityFee
+                    }));
+                }
+                if (!hasUserPosition) {
                     instructions.push(yield this.program.methods
-                        .createUser({
-                        name: `User ${Math.floor(Math.random() * 100)}`,
-                        referrer: '',
-                        community: ''
-                    })
+                        .createUserPosition()
                         .accounts({
                         signer: this.provider.wallet.publicKey,
-                        user: UserPDA
+                        ticker: tickerPDA
                     })
                         .instruction());
                 }
@@ -82,10 +82,9 @@ class Vault {
                     isLong: position === 'Long'
                 })
                     .accounts({
-                    user: UserPDA,
+                    userPosition: UserPositionPDA,
                     ticker: tickerPDA,
                     vault: VaultPDA,
-                    vaultTokenAccount: VaultTokenAccountPDA,
                     userTokenAccount
                 })
                     .instruction());
@@ -95,7 +94,17 @@ class Vault {
                     recentBlockhash: blockhash,
                     instructions
                 }).compileToV0Message();
-                return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
+                const hash = yield this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
+                const { blockhash: blockhash2, lastValidBlockHeight } = yield this.provider.connection.getLatestBlockhash();
+                const confirmTx = yield this.provider.connection.confirmTransaction({
+                    signature: hash,
+                    blockhash: blockhash2,
+                    lastValidBlockHeight
+                }, 'finalized');
+                if (confirmTx.value.err) {
+                    throw new Error('Failed to open position');
+                }
+                return hash;
             }
             catch (error) {
                 console.error(error);
@@ -111,45 +120,41 @@ class Vault {
      *  @param positionPubkey - The position public key
      *
      */
-    closePosition({ tickerPDA, amount, position, mint, positionPubkey }) {
+    closePosition({ tickerPDA, mint, positionIndex }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const UserPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, this.provider.wallet.publicKey);
+                const UserPositionPDA = (0, helpers_1.getUserPositionAddressSync)(this.program.programId, this.provider.wallet.publicKey, tickerPDA);
                 const VaultPDA = (0, helpers_1.getVaultAddressSync)(this.program.programId, tickerPDA);
                 const VaultTokenAccountPDA = (0, helpers_1.getTokenVaultAddressSync)(this.program.programId, VaultPDA);
                 const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(mint, this.provider.wallet.publicKey);
                 let hasUser = false;
                 try {
-                    yield this.program.account.user.fetch(UserPDA);
-                    console.log('User exists');
+                    yield this.program.account.userPosition.fetch(UserPositionPDA);
                     hasUser = true;
                 }
                 catch (e) {
-                    console.log('User does not exist');
                     console.log(e);
                 }
                 const instructions = [];
+                if (options === null || options === void 0 ? void 0 : options.priorityFee) {
+                    instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.priorityFee
+                    }));
+                }
                 if (!hasUser) {
                     instructions.push(yield this.program.methods
-                        .createUser({
-                        name: `User ${Math.floor(Math.random() * 100)}`,
-                        referrer: '',
-                        community: ''
-                    })
+                        .createUserPosition()
                         .accounts({
                         signer: this.provider.wallet.publicKey,
-                        user: UserPDA
+                        ticker: tickerPDA
                     })
                         .instruction());
                 }
                 instructions.push(yield this.program.methods
-                    .closePosition({
-                    amount: new anchor_1.BN(amount),
-                    isLong: position === 'Long',
-                    pubkey: positionPubkey
-                })
+                    .closePosition({ positionIndex })
                     .accounts({
-                    user: UserPDA,
+                    userPosition: UserPositionPDA,
+                    ticker: tickerPDA,
                     vault: VaultPDA,
                     vaultTokenAccount: VaultTokenAccountPDA,
                     userTokenAccount
@@ -161,7 +166,17 @@ class Vault {
                     recentBlockhash: blockhash,
                     instructions
                 }).compileToV0Message();
-                return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
+                const hash = yield this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
+                const { blockhash: blockhash2, lastValidBlockHeight } = yield this.provider.connection.getLatestBlockhash();
+                const confirmTx = yield this.provider.connection.confirmTransaction({
+                    signature: hash,
+                    blockhash: blockhash2,
+                    lastValidBlockHeight
+                }, 'finalized');
+                if (confirmTx.value.err) {
+                    throw new Error('Failed to open position');
+                }
+                return hash;
             }
             catch (error) {
                 console.error(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,7 +8,8 @@
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
     "prepublishOnly": "yarn build",
-    "start": "yarn build && node ./dist/index.js"
+    "start": "yarn build && node ./dist/test.js",
+    "test": "rimraf dist && tsc && node ./dist/test.js"
   },
   "publishConfig": {
     "access": "public"
@@ -24,18 +25,18 @@
     "blockchain",
     "protocol",
     "triad",
-    "trading protocols"
+    "trading protocols",
+    "dex",
+    "SPL 404"
   ],
   "author": "Triad Labs",
   "license": "ISC",
   "dependencies": {
-    "@coral-xyz/anchor": "0.28.0",
-    "@firethreexyz/firethree-protocol": "^0.19.1",
-    "@pythnetwork/client": "^2.19.0",
-    "@shadow-drive/sdk": "5.0.0",
-    "@solana/spl-token": "^0.3.11",
+    "@coral-xyz/anchor": "0.30.0",
+    "@solana/spl-token": "0.4.6",
     "@solana/web3.js": "1.89.1",
     "axios": "^1.5.1",
+    "bn.js": "^5.2.1",
     "bs58": "5.0.0",
     "uuid": "^9.0.1"
   },