@drift-labs/common 1.0.17 → 1.0.18

package/lib/utils/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BN, Event, OrderActionRecord, OrderRecord, PublicKey, BigNum, MarketType, DriftClient, SpotMarketConfig } from '@drift-labs/sdk';
 import { UIMatchedOrderRecordAndAction, UISerializableOrderActionRecord } from '../serializableTypes';
 import { AccountInfo, Connection } from '@solana/web3.js';

package/lib/utils/token.d.ts

@@ -6,9 +6,10 @@ export declare const getTokenAddress: (mintAddress: string, userPubKey: string)
  * This should be used for spot token movement in and out of the user's wallet.
  * @param mintAddress - The mint address
  * @param authorityPubKey - The authority's public key
+ * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)
  * @returns The associated token address
  */
-export declare const getTokenAddressForDepositAndWithdraw: (mintAddress: PublicKey, authorityPubKey: PublicKey) => Promise<PublicKey>;
+export declare const getTokenAddressForDepositAndWithdraw: (mintAddress: PublicKey, authorityPubKey: PublicKey, tokenProgram?: PublicKey) => Promise<PublicKey>;
 export declare const getTokenAccount: (connection: Connection, mintAddress: string, userPubKey: string) => Promise<{
     pubkey: PublicKey;
     account: import('@solana/web3.js').AccountInfo<import('@solana/web3.js').ParsedAccountData>;

package/lib/utils/token.js

@@ -16,13 +16,14 @@ exports.getTokenAddress = getTokenAddress;
  * This should be used for spot token movement in and out of the user's wallet.
  * @param mintAddress - The mint address
  * @param authorityPubKey - The authority's public key
+ * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)
  * @returns The associated token address
  */
-const getTokenAddressForDepositAndWithdraw = async (mintAddress, authorityPubKey) => {
+const getTokenAddressForDepositAndWithdraw = async (mintAddress, authorityPubKey, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) => {
     const isSol = mintAddress.equals(sdk_1.WRAPPED_SOL_MINT);
     if (isSol)
         return authorityPubKey;
-    return (0, spl_token_1.getAssociatedTokenAddress)(mintAddress, authorityPubKey, true);
+    return (0, spl_token_1.getAssociatedTokenAddress)(mintAddress, authorityPubKey, true, tokenProgram);
 };
 exports.getTokenAddressForDepositAndWithdraw = getTokenAddressForDepositAndWithdraw;
 const getTokenAccount = async (connection, mintAddress, userPubKey) => {

package/lib/utils/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,iDAG2B;AAC3B,6CAAgF;AAEhF,+CAG2B;AAF1B,6GAAA,gBAAgB,OAAA;AAChB,6HAAA,gCAAgC,OAAA;AAG1B,MAAM,eAAe,GAAG,CAC9B,WAAmB,EACnB,UAAkB,EACG,EAAE;IACvB,OAAO,IAAA,qCAAyB,EAC/B,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEF;;;;;;GAMG;AACI,MAAM,oCAAoC,GAAG,KAAK,EACxD,WAAsB,EACtB,eAA0B,EACL,EAAE;IACvB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,sBAAgB,CAAC,CAAC;IAEnD,IAAI,KAAK;QAAE,OAAO,eAAe,CAAC;IAElC,OAAO,IAAA,qCAAyB,EAAC,WAAW,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;AACtE,CAAC,CAAC;AATW,QAAA,oCAAoC,wCAS/C;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,UAAsB,EACtB,WAAmB,EACnB,UAAkB,EAMhB,EAAE;IACJ,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACnE,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,EAAE,IAAI,EAAE,IAAI,mBAAS,CAAC,WAAW,CAAC,EAAE,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;IAEF,MAAM,aAAa,GAClB,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACxC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,aAAa,CAAC;AACtB,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACxC,KAAgB,EAChB,WAAsB,EACtB,KAAiB,EACiB,EAAE;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,GAAG,KAAK,CAAC;IACf,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,WAAW,EACX,KAAK,EACL,IAAI,CACJ,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAuC,EAChE,KAAK,EACL,iBAAiB,EACjB,KAAK,EACL,WAAW,CACX,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B","sourcesContent":["import { WRAPPED_SOL_MINT } from '@drift-labs/sdk';\nimport {\n\tcreateAssociatedTokenAccountInstruction,\n\tgetAssociatedTokenAddress,\n} from '@solana/spl-token';\nimport { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';\n\nexport {\n\tTOKEN_PROGRAM_ID,\n\tcreateTransferCheckedInstruction,\n} from '@solana/spl-token';\n\nexport const getTokenAddress = (\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<PublicKey> => {\n\treturn getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n};\n\n/**\n * Get the associated token address for the given mint and user public key. If the mint is SOL, return the user public key.\n * This should be used for spot token movement in and out of the user's wallet.\n * @param mintAddress - The mint address\n * @param authorityPubKey - The authority's public key\n * @returns The associated token address\n */\nexport const getTokenAddressForDepositAndWithdraw = async (\n\tmintAddress: PublicKey,\n\tauthorityPubKey: PublicKey\n): Promise<PublicKey> => {\n\tconst isSol = mintAddress.equals(WRAPPED_SOL_MINT);\n\n\tif (isSol) return authorityPubKey;\n\n\treturn getAssociatedTokenAddress(mintAddress, authorityPubKey, true);\n};\n\nexport const getTokenAccount = async (\n\tconnection: Connection,\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<{\n\tpubkey: PublicKey;\n\taccount: import('@solana/web3.js').AccountInfo<\n\t\timport('@solana/web3.js').ParsedAccountData\n\t>;\n}> => {\n\tconst tokenAccounts = await connection.getParsedTokenAccountsByOwner(\n\t\tnew PublicKey(userPubKey),\n\t\t{ mint: new PublicKey(mintAddress) }\n\t);\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n\n\tconst targetAccount =\n\t\ttokenAccounts.value.filter((account) =>\n\t\t\taccount.pubkey.equals(associatedAddress)\n\t\t)[0] || tokenAccounts.value[0];\n\n\treturn targetAccount;\n};\n\nexport const createTokenAccountIx = async (\n\towner: PublicKey,\n\tmintAddress: PublicKey,\n\tpayer?: PublicKey\n): Promise<TransactionInstruction> => {\n\tif (!payer) {\n\t\tpayer = owner;\n\t}\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\towner,\n\t\ttrue\n\t);\n\n\tconst createAtaIx = await createAssociatedTokenAccountInstruction(\n\t\tpayer,\n\t\tassociatedAddress,\n\t\towner,\n\t\tmintAddress\n\t);\n\n\treturn createAtaIx;\n};\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,iDAI2B;AAC3B,6CAAgF;AAEhF,+CAG2B;AAF1B,6GAAA,gBAAgB,OAAA;AAChB,6HAAA,gCAAgC,OAAA;AAG1B,MAAM,eAAe,GAAG,CAC9B,WAAmB,EACnB,UAAkB,EACG,EAAE;IACvB,OAAO,IAAA,qCAAyB,EAC/B,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEF;;;;;;;GAOG;AACI,MAAM,oCAAoC,GAAG,KAAK,EACxD,WAAsB,EACtB,eAA0B,EAC1B,eAA0B,4BAAgB,EACrB,EAAE;IACvB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,sBAAgB,CAAC,CAAC;IAEnD,IAAI,KAAK;QAAE,OAAO,eAAe,CAAC;IAElC,OAAO,IAAA,qCAAyB,EAC/B,WAAW,EACX,eAAe,EACf,IAAI,EACJ,YAAY,CACZ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,oCAAoC,wCAe/C;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,UAAsB,EACtB,WAAmB,EACnB,UAAkB,EAMhB,EAAE;IACJ,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACnE,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,EAAE,IAAI,EAAE,IAAI,mBAAS,CAAC,WAAW,CAAC,EAAE,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;IAEF,MAAM,aAAa,GAClB,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACxC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,aAAa,CAAC;AACtB,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACxC,KAAgB,EAChB,WAAsB,EACtB,KAAiB,EACiB,EAAE;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,GAAG,KAAK,CAAC;IACf,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,WAAW,EACX,KAAK,EACL,IAAI,CACJ,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAuC,EAChE,KAAK,EACL,iBAAiB,EACjB,KAAK,EACL,WAAW,CACX,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B","sourcesContent":["import { WRAPPED_SOL_MINT } from '@drift-labs/sdk';\nimport {\n\tcreateAssociatedTokenAccountInstruction,\n\tgetAssociatedTokenAddress,\n\tTOKEN_PROGRAM_ID,\n} from '@solana/spl-token';\nimport { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';\n\nexport {\n\tTOKEN_PROGRAM_ID,\n\tcreateTransferCheckedInstruction,\n} from '@solana/spl-token';\n\nexport const getTokenAddress = (\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<PublicKey> => {\n\treturn getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n};\n\n/**\n * Get the associated token address for the given mint and user public key. If the mint is SOL, return the user public key.\n * This should be used for spot token movement in and out of the user's wallet.\n * @param mintAddress - The mint address\n * @param authorityPubKey - The authority's public key\n * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)\n * @returns The associated token address\n */\nexport const getTokenAddressForDepositAndWithdraw = async (\n\tmintAddress: PublicKey,\n\tauthorityPubKey: PublicKey,\n\ttokenProgram: PublicKey = TOKEN_PROGRAM_ID\n): Promise<PublicKey> => {\n\tconst isSol = mintAddress.equals(WRAPPED_SOL_MINT);\n\n\tif (isSol) return authorityPubKey;\n\n\treturn getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\tauthorityPubKey,\n\t\ttrue,\n\t\ttokenProgram\n\t);\n};\n\nexport const getTokenAccount = async (\n\tconnection: Connection,\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<{\n\tpubkey: PublicKey;\n\taccount: import('@solana/web3.js').AccountInfo<\n\t\timport('@solana/web3.js').ParsedAccountData\n\t>;\n}> => {\n\tconst tokenAccounts = await connection.getParsedTokenAccountsByOwner(\n\t\tnew PublicKey(userPubKey),\n\t\t{ mint: new PublicKey(mintAddress) }\n\t);\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n\n\tconst targetAccount =\n\t\ttokenAccounts.value.filter((account) =>\n\t\t\taccount.pubkey.equals(associatedAddress)\n\t\t)[0] || tokenAccounts.value[0];\n\n\treturn targetAccount;\n};\n\nexport const createTokenAccountIx = async (\n\towner: PublicKey,\n\tmintAddress: PublicKey,\n\tpayer?: PublicKey\n): Promise<TransactionInstruction> => {\n\tif (!payer) {\n\t\tpayer = owner;\n\t}\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\towner,\n\t\ttrue\n\t);\n\n\tconst createAtaIx = await createAssociatedTokenAccountInstruction(\n\t\tpayer,\n\t\tassociatedAddress,\n\t\towner,\n\t\tmintAddress\n\t);\n\n\treturn createAtaIx;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/common",
-	"version": "1.0.17",
+	"version": "1.0.18",
 	"description": "Common functions for Drift",
 	"main": "./lib/index.js",
 	"types": "./lib/index.d.ts",
@@ -17,6 +17,7 @@
 	],
 	"author": "Drift Labs",
 	"dependencies": {
+		"@drift-labs/sdk": "^2.136.0",
 		"@slack/web-api": "6.4.0",
 		"@solana/spl-token": "0.3.8",
 		"@solana/web3.js": "1.98.0",
@@ -39,6 +40,9 @@
 	},
 	"scripts": {
 		"build": "yarn clean && tsc",
+		"build:minify": "node build-browser.js && node build-node.js",
+		"build:minify:browser": "node build-browser.js",
+		"build:minify:node": "node build-node.js",
 		"prepublishOnly": "yarn build",
 		"watch": "yarn clean && tsc --watch",
 		"build-dual": "yarn clean && tsup",
@@ -71,14 +75,22 @@
 		"@jest/globals": "29.3.1",
 		"@types/mocha": "10.0.4",
 		"@types/sinon": "^17.0.4",
+		"buffer": "^6.0.3",
 		"chai": "4.3.10",
+		"crypto-browserify": "^3.12.1",
 		"encoding": "0.1.13",
+		"esbuild": "^0.27.1",
 		"jest": "29.7.0",
 		"madge": "^8.0.0",
 		"mocha": "10.2.0",
+		"os-browserify": "^0.3.0",
+		"path-browserify": "^1.0.1",
+		"process": "^0.11.10",
 		"sinon": "^21.0.0",
+		"stream-browserify": "^3.0.0",
 		"ts-node": "10.9.1",
-		"typescript": "5.4.5"
+		"typescript": "5.4.5",
+		"vm-browserify": "^1.1.2"
 	},
 	"publishConfig": {
 		"access": "public"