@triadxyz/triad-protocol 3.1.9-beta → 3.2.0-beta

package/dist/claim.d.ts

@@ -2,7 +2,7 @@
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultMerkleRootArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs } from './types';
+import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs } from './types';
 export default class Claim {
     private program;
     private rpcOptions;
@@ -42,12 +42,6 @@ export default class Claim {
      * @param claimVault - Claim vault
      */
     updateClaimVaultIsActive({ isActive, claimVaultName }: UpdateClaimVaultIsActiveArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Claim Vault Merkle Root
-     * @param merkleRoot - Merkle root
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }: UpdateClaimVaultMerkleRootArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Claim Vault Amount
      * @param amount - Amount to add
@@ -55,5 +49,5 @@ export default class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/claim.js

@@ -134,25 +134,6 @@ class Claim {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
-    /**
-     * Update Claim Vault Merkle Root
-     * @param merkleRoot - Merkle root
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateClaimVaultMerkleRoot(merkleRoot)
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
     /**
      * Update Claim Vault Amount
      * @param amount - Amount to add
@@ -160,13 +141,14 @@ class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }) {
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
                     .updateClaimVaultAmount({
                     amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                    newUsers: new anchor_1.BN(newUsers)
+                    newUsers: new anchor_1.BN(newUsers),
+                    merkleRoot
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,

package/dist/index.js

@@ -684,12 +684,12 @@ class TriadProtocolClient {
                         break;
                     }
                     userTrade.orders.forEach((order) => {
-                        if (order.orderStatus === types_1.OrderStatus.INIT ||
-                            order.orderStatus === types_1.OrderStatus.CLOSED) {
+                        if (order.orderStatus !== types_1.OrderStatus.OPEN) {
                             nonce = userTrade.isSubUser ? Number(userTrade.nonce) : 0;
                         }
                     });
                 }
+                console.log('nonce', nonce);
                 if (nonce === null) {
                     throw new Error('No open orders found');
                 }
@@ -783,11 +783,11 @@ class TriadProtocolClient {
                     return;
                 }
             }
+            const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(orders[0].orderDirection)[0]);
+            if (userTradeIxs.length > 0) {
+                ixs.push(...userTradeIxs);
+            }
             for (const order of orders) {
-                const { userTradePDA, userTradeIxs } = yield this.getUserTradeNonce(marketId, Object.keys(order.orderDirection)[0]);
-                if (userTradeIxs.length > 0) {
-                    ixs.push(...userTradeIxs);
-                }
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
                     amount: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),

package/dist/types/idl_triad_protocol.json

@@ -2679,29 +2679,6 @@
                 }
             ]
         },
-        {
-            "name": "update_claim_vault_merkle_root",
-            "discriminator": [83, 209, 102, 81, 118, 44, 157, 23],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "claim_vault",
-                    "writable": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "merkle_root",
-                    "type": {
-                        "array": ["u8", 32]
-                    }
-                }
-            ]
-        },
         {
             "name": "update_customer_fee",
             "discriminator": [218, 240, 1, 38, 34, 166, 40, 25],
@@ -4100,6 +4077,22 @@
                     {
                         "name": "pool_id",
                         "type": "u64"
+                    },
+                    {
+                        "name": "market_order_fee_available",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "market_order_fee_claimed",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "fee_recipient",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "resolved_ts",
+                        "type": "i64"
                     }
                 ]
             }
@@ -4968,6 +4961,12 @@
                     {
                         "name": "new_users",
                         "type": "u64"
+                    },
+                    {
+                        "name": "merkle_root",
+                        "type": {
+                            "array": ["u8", 32]
+                        }
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -337,10 +337,6 @@ export type UpdateClaimVaultIsActiveArgs = {
     isActive: boolean;
     claimVaultName: string;
 };
-export type UpdateClaimVaultMerkleRootArgs = {
-    merkleRoot: number[];
-    claimVaultName: string;
-};
 export type UpdateMarketWinningDirectionArgs = {
     marketId: number;
     poolId?: number;
@@ -356,4 +352,5 @@ export type UpdateClaimVaultAmountArgs = {
     newUsers: number;
     claimVaultName: string;
     mint: PublicKey;
+    merkleRoot: number[];
 };

package/dist/types/triad_protocol.d.ts

@@ -3770,29 +3770,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'updateClaimVaultMerkleRoot';
-            discriminator: [83, 209, 102, 81, 118, 44, 157, 23];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'claimVault';
-                    writable: true;
-                }
-            ];
-            args: [
-                {
-                    name: 'merkleRoot';
-                    type: {
-                        array: ['u8', 32];
-                    };
-                }
-            ];
-        },
         {
             name: 'updateCustomerFee';
             discriminator: [218, 240, 1, 38, 34, 166, 40, 25];
@@ -5203,6 +5180,22 @@ export type TriadProtocol = {
                     {
                         name: 'poolId';
                         type: 'u64';
+                    },
+                    {
+                        name: 'marketOrderFeeAvailable';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'marketOrderFeeClaimed';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'feeRecipient';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'resolvedTs';
+                        type: 'i64';
                     }
                 ];
             };
@@ -6071,6 +6064,12 @@ export type TriadProtocol = {
                     {
                         name: 'newUsers';
                         type: 'u64';
+                    },
+                    {
+                        name: 'merkleRoot';
+                        type: {
+                            array: ['u8', 32];
+                        };
                     }
                 ];
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "3.1.9-beta",
+  "version": "3.2.0-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",