@drift-labs/sdk 0.2.0-temp.1 → 2.0.0

package/lib/serum/types.d.ts

@@ -0,0 +1,11 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+export declare type SerumMarketSubscriberConfig = {
+    connection: Connection;
+    programId: PublicKey;
+    marketAddress: PublicKey;
+    accountSubscription: {
+        type: 'polling';
+        accountLoader: BulkAccountLoader;
+    };
+};

package/lib/tokenFaucet.d.ts

@@ -21,6 +21,7 @@ export declare class TokenFaucet {
     getFaucetConfigPublicKey(): Promise<PublicKey>;
     initialize(): Promise<TransactionSignature>;
     fetchState(): Promise<any>;
+    private mintToUserIx;
     mintToUser(userTokenAccount: PublicKey, amount: BN): Promise<TransactionSignature>;
     transferMintAuthority(): Promise<TransactionSignature>;
     createAssociatedTokenAccountAndMintTo(userPublicKey: PublicKey, amount: BN): Promise<[PublicKey, TransactionSignature]>;

package/lib/tokenFaucet.js

@@ -73,8 +73,8 @@ class TokenFaucet {
     async fetchState() {
         return await this.program.account.faucetConfig.fetch(await this.getFaucetConfigPublicKey());
     }
-    async mintToUser(userTokenAccount, amount) {
-        return await this.program.rpc.mintToUser(amount, {
+    async mintToUserIx(userTokenAccount, amount) {
+        return this.program.instruction.mintToUser(amount, {
             accounts: {
                 faucetConfig: await this.getFaucetConfigPublicKey(),
                 mintAccount: this.mint,
@@ -84,6 +84,12 @@ class TokenFaucet {
             },
         });
     }
+    async mintToUser(userTokenAccount, amount) {
+        const mintIx = await this.mintToUserIx(userTokenAccount, amount);
+        const tx = new web3_js_1.Transaction().add(mintIx);
+        const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        return txSig;
+    }
     async transferMintAuthority() {
         return await this.program.rpc.transferMintAuthority({
             accounts: {
@@ -96,8 +102,21 @@ class TokenFaucet {
         });
     }
     async createAssociatedTokenAccountAndMintTo(userPublicKey, amount) {
+        const tx = new web3_js_1.Transaction();
         const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = await this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
-        const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToTx);
+        let associatedTokenAccountExists = false;
+        try {
+            const assosciatedTokenAccount = await this.connection.getAccountInfo(associatedTokenPublicKey);
+            associatedTokenAccountExists = !!assosciatedTokenAccount;
+        }
+        catch (e) {
+            // token account doesn't exist
+            associatedTokenAccountExists = false;
+        }
+        const skipAccountCreation = associatedTokenAccountExists;
+        if (!skipAccountCreation)
+            tx.add(createAssociatedAccountIx);
+        tx.add(mintToTx);
         const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
         return [associatedTokenPublicKey, txSig];
     }
@@ -105,15 +124,7 @@ class TokenFaucet {
         const state = await this.fetchState();
         const associateTokenPublicKey = await this.getAssosciatedMockUSDMintAddress({ userPubKey: userPublicKey });
         const createAssociatedAccountIx = spl_token_1.Token.createAssociatedTokenAccountInstruction(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, associateTokenPublicKey, userPublicKey, this.wallet.publicKey);
-        const mintToIx = await this.program.instruction.mintToUser(amount, {
-            accounts: {
-                faucetConfig: await this.getFaucetConfigPublicKey(),
-                mintAccount: state.mint,
-                userTokenAccount: associateTokenPublicKey,
-                mintAuthority: state.mintAuthority,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-        });
+        const mintToIx = await this.mintToUserIx(associateTokenPublicKey, amount);
         return [associateTokenPublicKey, createAssociatedAccountIx, mintToIx];
     }
     async getAssosciatedMockUSDMintAddress(props) {

package/lib/tx/retryTxSender.d.ts

@@ -11,7 +11,7 @@ export declare class RetryTxSender implements TxSender {
     retrySleep: number;
     additionalConnections: Connection[];
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;

package/lib/tx/retryTxSender.js

@@ -15,18 +15,27 @@ class RetryTxSender {
         this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
         this.additionalConnections = additionalConnections;
     }
-    async send(tx, additionalSigners, opts) {
+    async send(tx, additionalSigners, opts, preSigned) {
         if (additionalSigners === undefined) {
             additionalSigners = [];
         }
         if (opts === undefined) {
             opts = this.provider.opts;
         }
-        await this.prepareTx(tx, additionalSigners, opts);
+        if (!preSigned) {
+            await this.prepareTx(tx, additionalSigners, opts);
+        }
         const rawTransaction = tx.serialize();
         const startTime = this.getTimestamp();
-        const txid = await this.provider.connection.sendRawTransaction(rawTransaction, opts);
-        this.sendToAdditionalConnections(rawTransaction, opts);
+        let txid;
+        try {
+            txid = await this.provider.connection.sendRawTransaction(rawTransaction, opts);
+            this.sendToAdditionalConnections(rawTransaction, opts);
+        }
+        catch (e) {
+            console.error(e);
+            throw e;
+        }
         let done = false;
         const resolveReference = {
             resolve: undefined,

package/lib/tx/types.d.ts

@@ -6,5 +6,5 @@ export declare type TxSigAndSlot = {
 };
 export interface TxSender {
     provider: Provider;
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
 }