@velocity-exchange/sdk 0.0.2 → 0.0.5

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -13,13 +13,19 @@ const tweetnacl_util_1 = require("tweetnacl-util");
 const ws_1 = __importDefault(require("ws"));
 const sha256_1 = require("@noble/hashes/sha256");
 class SwiftOrderSubscriber {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     constructor(config) {
+        var _a;
         this.config = config;
         this.heartbeatTimeout = null;
         this.heartbeatIntervalMs = 60000;
         this.ws = null;
         this.subscribed = false;
-        this.driftClient = config.driftClient;
+        // Type-system guarantees at least one of the two is supplied.
+        this.velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
         this.userAccountGetter = config.userAccountGetter;
     }
     unsubscribe() {
@@ -31,9 +37,9 @@ class SwiftOrderSubscriber {
         }
     }
     getSymbolForMarketIndex(marketIndex) {
-        const markets = this.config.driftEnv === 'devnet'
-            ? perpMarkets_1.DevnetPerpMarkets
-            : perpMarkets_1.MainnetPerpMarkets;
+        var _a;
+        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
+        const markets = env === 'devnet' ? perpMarkets_1.DevnetPerpMarkets : perpMarkets_1.MainnetPerpMarkets;
         return markets[marketIndex].symbol;
     }
     generateChallengeResponse(nonce) {
@@ -66,10 +72,12 @@ class SwiftOrderSubscriber {
         }
     }
     async subscribe(onOrder, acceptSanitized = false, acceptDepositTrade = false) {
+        var _a, _b;
         this.onOrder = onOrder;
-        const endpoint = this.config.endpoint || this.config.driftEnv === 'devnet'
+        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
+        const endpoint = (_b = this.config.endpoint) !== null && _b !== void 0 ? _b : (env === 'devnet'
             ? 'wss://master.swift.drift.trade/ws'
-            : 'wss://swift.drift.trade/ws';
+            : 'wss://swift.drift.trade/ws');
         const ws = new ws_1.default(endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58());
         this.ws = ws;
         ws.on('open', async () => {
@@ -97,7 +105,7 @@ class SwiftOrderSubscriber {
                     const isDelegateSigner = signedMsgOrderParamsBuf
                         .slice(0, 8)
                         .equals(Uint8Array.from(Buffer.from((0, sha256_1.sha256)('global' + ':' + 'SignedMsgOrderParamsDelegateMessage')).slice(0, 8)));
-                    const signedMessage = this.driftClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf, isDelegateSigner);
+                    const signedMessage = this.velocityClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf, isDelegateSigner);
                     if (!signedMessage.signedMsgOrderParams.price) {
                         console.error(`order has no price: ${JSON.stringify(signedMessage.signedMsgOrderParams)}`);
                         return;
@@ -139,20 +147,20 @@ class SwiftOrderSubscriber {
         const isDelegateSigner = signedMsgOrderParamsBuf
             .slice(0, 8)
             .equals(Uint8Array.from(Buffer.from((0, sha256_1.sha256)('global' + ':' + 'SignedMsgOrderParamsDelegateMessage')).slice(0, 8)));
-        const signedMessage = this.driftClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf, isDelegateSigner);
+        const signedMessage = this.velocityClient.decodeSignedMsgOrderParamsMessage(signedMsgOrderParamsBuf, isDelegateSigner);
         const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw.taker_authority);
         const signingAuthority = new web3_js_1.PublicKey(orderMessageRaw.signing_authority);
         const takerUserPubkey = isDelegateSigner
             ? signedMessage.takerPubkey
-            : await (0, pda_1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, signedMessage.subAccountId);
+            : await (0, pda_1.getUserAccountPublicKey)(this.velocityClient.program.programId, takerAuthority, signedMessage.subAccountId);
         const takerUserAccount = await this.userAccountGetter.mustGetUserAccount(takerUserPubkey.toString());
-        const ixs = await this.driftClient.getPlaceAndMakeSignedMsgPerpOrderIxs({
+        const ixs = await this.velocityClient.getPlaceAndMakeSignedMsgPerpOrderIxs({
             orderParams: signedMsgOrderParamsBuf,
             signature: Buffer.from(orderMessageRaw.order_signature, 'base64'),
         }, (0, tweetnacl_util_1.decodeUTF8)(orderMessageRaw.uuid), {
             taker: takerUserPubkey,
             takerUserAccount,
-            takerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, takerUserAccount.authority),
+            takerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, takerUserAccount.authority),
             signingAuthority: signingAuthority,
         }, Object.assign({}, makerOrderParams, {
             postOnly: types_1.PostOnlyParams.MUST_POST_ONLY,

package/lib/browser/types.d.ts

@@ -1182,7 +1182,7 @@ export type Order = {
     existingPositionDirection: PositionDirection;
     postOnly: boolean;
     immediateOrCancel: boolean;
-    oraclePriceOffset: number;
+    oraclePriceOffset: BN;
     auctionDuration: number;
     auctionStartPrice: BN;
     auctionEndPrice: BN;
@@ -1203,7 +1203,7 @@ export type OrderParams = {
     bitFlags: number;
     triggerPrice: BN | null;
     triggerCondition: OrderTriggerCondition;
-    oraclePriceOffset: number | null;
+    oraclePriceOffset: BN | null;
     auctionDuration: number | null;
     maxTs: BN | null;
     auctionStartPrice: BN | null;

package/lib/browser/user.d.ts

@@ -27,7 +27,9 @@ import { StrictOraclePrice } from './oracles/strictOraclePrice';
 import { IsolatedMarginCalculation, MarginCalculation } from './marginCalculation';
 export type MarginType = 'Cross' | 'Isolated';
 export declare class User {
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient(): VelocityClient;
     userAccountPublicKey: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     _isSubscribed: boolean;