@triadxyz/triad-protocol 3.5.2-beta → 3.5.3-beta

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export * from './utils/helpers';
 export * from './utils/merkle';
 export * from './utils/feeCalculator';
 export * from './utils/constants';
+export * from './utils/pda';
 export default class TriadProtocol {
     private connection;
     private wallet;

package/dist/index.js

@@ -48,6 +48,7 @@ __exportStar(require("./utils/helpers"), exports);
 __exportStar(require("./utils/merkle"), exports);
 __exportStar(require("./utils/feeCalculator"), exports);
 __exportStar(require("./utils/constants"), exports);
+__exportStar(require("./utils/pda"), exports);
 class TriadProtocol {
     constructor(connection, wallet, rpcOptions) {
         this.connection = connection;

package/dist/stake.d.ts

@@ -21,6 +21,7 @@ export default class Stake {
      */
     getStakeByWallet(wallet: PublicKey): Promise<{
         available: number;
+        address: string;
         authority: string;
         initTs: number;
         checkedTs: number;

package/dist/stake.js

@@ -37,7 +37,7 @@ class Stake {
     getStakes() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.stakeV3.all();
-            return response.map((stake) => (0, helpers_1.formatStake)(stake.account));
+            return response.map((stake) => (0, helpers_1.formatStake)(stake.account, stake.publicKey));
         });
     }
     /**
@@ -48,7 +48,7 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const stake = yield this.program.account.stakeV3
                 .fetch((0, pda_1.getStakePDA)(this.program.programId, wallet))
-                .then((stake) => (0, helpers_1.formatStake)(stake));
+                .then((stake) => (0, helpers_1.formatStake)(stake, wallet));
             return Object.assign(Object.assign({}, stake), { available: (0, helpers_1.calculateStakeRewards)(stake) });
         });
     }

package/dist/types/idl_triad_protocol.json

@@ -1664,6 +1664,39 @@
                 }
             ]
         },
+        {
+            "name": "order_authority",
+            "discriminator": [173, 133, 92, 45, 165, 23, 172, 187],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true
+                },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "order",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "OrderAuthorityArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "payout_order",
             "discriminator": [247, 233, 158, 228, 63, 32, 236, 113],
@@ -2032,38 +2065,6 @@
                 }
             ]
         },
-        {
-            "name": "stake_authority",
-            "discriminator": [246, 215, 84, 204, 198, 135, 235, 247],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "stake",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [115, 116, 97, 107, 101, 95, 118, 51]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "signer"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": []
-        },
         {
             "name": "stake_token",
             "discriminator": [191, 127, 193, 101, 37, 96, 87, 211],
@@ -2832,6 +2833,10 @@
         }
     ],
     "events": [
+        {
+            "name": "ActivityEvent",
+            "discriminator": [231, 225, 142, 104, 209, 97, 39, 202]
+        },
         {
             "name": "BookOrderEvent",
             "discriminator": [175, 216, 61, 224, 98, 215, 181, 62]
@@ -2856,10 +2861,6 @@
             "name": "MarketFeeEvent",
             "discriminator": [191, 148, 93, 112, 63, 139, 16, 186]
         },
-        {
-            "name": "OrderEvent",
-            "discriminator": [209, 51, 146, 206, 88, 127, 112, 69]
-        },
         {
             "name": "PoolEvent",
             "discriminator": [76, 227, 205, 183, 1, 218, 164, 244]
@@ -3011,6 +3012,70 @@
         }
     ],
     "types": [
+        {
+            "name": "ActivityEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "order_direction",
+                        "type": {
+                            "defined": {
+                                "name": "OrderDirection"
+                            }
+                        }
+                    },
+                    {
+                        "name": "order_side",
+                        "type": {
+                            "defined": {
+                                "name": "OrderSide"
+                            }
+                        }
+                    },
+                    {
+                        "name": "order_type",
+                        "type": {
+                            "defined": {
+                                "name": "OrderType"
+                            }
+                        }
+                    },
+                    {
+                        "name": "order_status",
+                        "type": {
+                            "defined": {
+                                "name": "OrderStatus"
+                            }
+                        }
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "shares",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "fee",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timestamp",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "BaseAssetV1",
             "type": {
@@ -4079,6 +4144,26 @@
                 ]
             }
         },
+        {
+            "name": "OrderAuthorityArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "order_direction",
+                        "type": {
+                            "defined": {
+                                "name": "OrderDirection"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "OrderBook",
             "serialization": "bytemuck",
@@ -4153,66 +4238,6 @@
                 ]
             }
         },
-        {
-            "name": "OrderEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_side",
-                        "type": {
-                            "defined": {
-                                "name": "OrderSide"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_type",
-                        "type": {
-                            "defined": {
-                                "name": "OrderType"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_status",
-                        "type": {
-                            "defined": {
-                                "name": "OrderStatus"
-                            }
-                        }
-                    },
-                    {
-                        "name": "price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
-        },
         {
             "name": "OrderSide",
             "type": {

package/dist/types/index.d.ts

@@ -158,6 +158,7 @@ export type StakeVault = {
     revShareAvailable: number;
 };
 export type Stake = {
+    address: string;
     authority: string;
     initTs: number;
     checkedTs: number;

package/dist/types/triad_protocol.d.ts

@@ -2429,6 +2429,39 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'orderAuthority';
+            discriminator: [173, 133, 92, 45, 165, 23, 172, 187];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                },
+                {
+                    name: 'payer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'order';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'orderAuthorityArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'payoutOrder';
             discriminator: [247, 233, 158, 228, 63, 32, 236, 113];
@@ -2925,38 +2958,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'stakeAuthority';
-            discriminator: [246, 215, 84, 204, 198, 135, 235, 247];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'stake';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [115, 116, 97, 107, 101, 95, 118, 51];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'signer';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [];
-        },
         {
             name: 'stakeToken';
             discriminator: [191, 127, 193, 101, 37, 96, 87, 211];
@@ -3923,6 +3924,10 @@ export type TriadProtocol = {
         }
     ];
     events: [
+        {
+            name: 'activityEvent';
+            discriminator: [231, 225, 142, 104, 209, 97, 39, 202];
+        },
         {
             name: 'bookOrderEvent';
             discriminator: [175, 216, 61, 224, 98, 215, 181, 62];
@@ -3947,10 +3952,6 @@ export type TriadProtocol = {
             name: 'marketFeeEvent';
             discriminator: [191, 148, 93, 112, 63, 139, 16, 186];
         },
-        {
-            name: 'orderEvent';
-            discriminator: [209, 51, 146, 206, 88, 127, 112, 69];
-        },
         {
             name: 'poolEvent';
             discriminator: [76, 227, 205, 183, 1, 218, 164, 244];
@@ -4102,6 +4103,70 @@ export type TriadProtocol = {
         }
     ];
     types: [
+        {
+            name: 'activityEvent';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderSide';
+                        type: {
+                            defined: {
+                                name: 'orderSide';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderType';
+                        type: {
+                            defined: {
+                                name: 'orderType';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderStatus';
+                        type: {
+                            defined: {
+                                name: 'orderStatus';
+                            };
+                        };
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'shares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'fee';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'timestamp';
+                        type: 'i64';
+                    }
+                ];
+            };
+        },
         {
             name: 'baseAssetV1';
             type: {
@@ -5170,6 +5235,26 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'orderAuthorityArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'orderBook';
             serialization: 'bytemuck';
@@ -5244,66 +5329,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'orderEvent';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderSide';
-                        type: {
-                            defined: {
-                                name: 'orderSide';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderType';
-                        type: {
-                            defined: {
-                                name: 'orderType';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderStatus';
-                        type: {
-                            defined: {
-                                name: 'orderStatus';
-                            };
-                        };
-                    },
-                    {
-                        name: 'price';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'shares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'timestamp';
-                        type: 'i64';
-                    }
-                ];
-            };
-        },
         {
             name: 'orderSide';
             type: {

package/dist/utils/helpers.d.ts

@@ -5,7 +5,7 @@ import { TriadProtocol } from '../types/triad_protocol';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
-export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3']) => Stake;
+export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3'], address: PublicKey) => Stake;
 export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake'], address: PublicKey) => Unstake;
 export declare const formatPool: (account: IdlAccounts<TriadProtocol>['pool'], address: PublicKey) => Pool;
 export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;

package/dist/utils/helpers.js

@@ -34,8 +34,9 @@ const formatStakeVault = (stakeVault) => {
     };
 };
 exports.formatStakeVault = formatStakeVault;
-const formatStake = (stake) => {
+const formatStake = (stake, address) => {
     return {
+        address: address.toBase58(),
         authority: stake.authority.toBase58(),
         initTs: stake.initTs.toNumber(),
         checkedTs: stake.checkedTs.toNumber(),

package/package.json

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