sdk: fix helius-laserstream detection and prebuild:browser hook #2199
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
|
|
||
| const targetDir = path.join(__dirname, '..', 'node_modules', 'helius-laserstream'); | ||
|
|
||
| let packageResolvable = false; | ||
| try { | ||
| require.resolve('helius-laserstream'); | ||
| packageResolvable = true; | ||
| } catch (_) { | ||
| // not installed or not resolvable | ||
| } | ||
|
|
||
| if (!packageResolvable) { | ||
| console.log('helius-laserstream is not installed. Creating a local shim for compilation...'); | ||
| try { | ||
| fs.mkdirSync(targetDir, { recursive: true }); | ||
| } catch (e) { | ||
| console.error('Failed to create directory for helius-laserstream shim:', e); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| const packageJson = { | ||
| name: 'helius-laserstream', | ||
| version: '0.1.8', | ||
| main: 'index.js', | ||
| types: 'index.d.ts' | ||
| }; | ||
|
|
||
| const indexJs = `module.exports = { | ||
| CommitmentLevel: { | ||
| PROCESSED: 0, | ||
| CONFIRMED: 1, | ||
| FINALIZED: 2 | ||
| }, | ||
| CompressionAlgorithms: { | ||
| identity: 0, | ||
| deflate: 1, | ||
| gzip: 2, | ||
| zstd: 3 | ||
| }, | ||
| subscribe: () => { | ||
| throw new Error('helius-laserstream is shimmed and not available on this platform.'); | ||
| } | ||
| };`; | ||
|
|
||
| const indexDts = `export interface LaserstreamConfig { | ||
| apiKey?: string; | ||
| endpoint?: string; | ||
| maxReconnectAttempts?: number; | ||
| channelOptions?: any; | ||
| } | ||
| export interface SubscribeRequest { | ||
| slots?: any; | ||
| accounts?: any; | ||
| transactions?: any; | ||
| blocks?: any; | ||
| blocksMeta?: any; | ||
| accountsDataSlice?: any; | ||
| commitment?: any; | ||
| entry?: any; | ||
| transactionsStatus?: any; | ||
| } | ||
| export interface SubscribeUpdate { | ||
| account?: { | ||
| slot: string | number; | ||
| account: { | ||
| pubkey: string; | ||
| owner: string; | ||
| lamports: string | number; | ||
| data: Uint8Array | number[] | string; | ||
| executable: boolean; | ||
| rentEpoch: string | number; | ||
| }; | ||
| }; | ||
| } | ||
| export enum CommitmentLevel { | ||
| PROCESSED = 0, | ||
| CONFIRMED = 1, | ||
| FINALIZED = 2 | ||
| } | ||
| export enum CompressionAlgorithms { | ||
| identity = 0, | ||
| deflate = 1, | ||
| gzip = 2, | ||
| zstd = 3 | ||
| } | ||
| export function subscribe(...args: any[]): any;`; | ||
|
|
||
| try { | ||
| fs.writeFileSync(path.join(targetDir, 'package.json'), JSON.stringify(packageJson, null, 2)); | ||
| fs.writeFileSync(path.join(targetDir, 'index.js'), indexJs); | ||
| fs.writeFileSync(path.join(targetDir, 'index.d.ts'), indexDts); | ||
| console.log('Shim created successfully.'); | ||
| } catch (e) { | ||
| console.error('Failed to write files for helius-laserstream shim:', e); | ||
| process.exit(1); | ||
| } | ||
| } else { | ||
| console.log('helius-laserstream is already installed.'); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2319,6 +2319,12 @@ export class DriftClient { | |
| tokenPrograms.add(tokenProgram.toBase58()); | ||
|
|
||
| this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts); | ||
| if (this.isTransferHook(spotMarket)) { | ||
| await this.addExtraAccountMetasToRemainingAccounts( | ||
| spotMarket.mint, | ||
| remainingAccounts | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| for (const tokenProgram of tokenPrograms) { | ||
|
|
@@ -4114,6 +4120,27 @@ export class DriftClient { | |
| }); | ||
| } | ||
|
|
||
| if (depositAmount === undefined || !depositAmount.isZero()) { | ||
| this.addTokenMintToRemainingAccounts(depositFromSpotMarket, remainingAccounts); | ||
| if (this.isTransferHook(depositFromSpotMarket)) { | ||
| await this.addExtraAccountMetasToRemainingAccounts( | ||
| depositFromSpotMarket.mint, | ||
| remainingAccounts | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if (borrowAmount === undefined || !borrowAmount.isZero()) { | ||
| const borrowToSpotMarket = this.getSpotMarketAccount(borrowToMarketIndex); | ||
| this.addTokenMintToRemainingAccounts(borrowToSpotMarket, remainingAccounts); | ||
| if (this.isTransferHook(borrowToSpotMarket)) { | ||
| await this.addExtraAccountMetasToRemainingAccounts( | ||
| borrowToSpotMarket.mint, | ||
| remainingAccounts | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| return await this.program.instruction.transferPools( | ||
| depositFromMarketIndex, | ||
| depositToMarketIndex, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shared transfer-hook iterator can break later CPIs in the same instruction.
A single
remaining_accounts_iteris reused across the whole function, but the transfer-hook path consumes iterator entries. Since this function can perform multiple hook-enabled transfers (inside the spot-position loop), the first hook CPI can drain accounts required by later hook CPIs and cause runtime failure.Use per-transfer account windows/iterators (or make hook-account consumption bounded to one transfer) instead of one shared draining iterator.
Also applies to: 3317-3321, 3339-3343
🤖 Prompt for AI Agents