Wphan/merge-master-devnet (#1897)

* chore: add laserstream client

* add hlmm to decodeUser (#1881)

* add hlmm to decodeUser

* throw if unrecognized margin mode

* fallback to default margin mode

* sdk: release v2.138.0-beta.2

* fix: update to correct naming

* sdk: release v2.138.0-beta.3

* chore: rename lazer -> laser

* sdk: release v2.138.0-beta.4

* Revert "chore: rename lazer -> laser"

This reverts commit f6d8530.

* Revert "fix: update to correct naming"

This reverts commit 42c8b10.

* Revert "chore: add laserstream client"

This reverts commit 8da91cb.

* sdk: release v2.138.0-beta.5

* feat: pin deps away from mal packages (#1858)

* feat: pin deps away from mal packages

* fix: chalk deps break lint

* fix: linter unix format

* try fix broken anchor tests

---------

Co-authored-by: Nick Caradonna <[email protected]>

* sdk: release v2.138.0-beta.6

* Revert "Crispeaney/revert swift max margin ratio" (#1877)

* Revert "program: revert swift max margin ratio (#1874)"

This reverts commit 87bfe72.

* add SignedMsgExtensions enum struct variant

* Revert "add SignedMsgExtensions enum struct variant"

This reverts commit 9dbe65c.

* add extended SignedMsgOrderParamsMessage variant

* zero pad short swift messages when decoding

* revert to single sdk decode function

* cargo fmt

* comments

* use fixed padding for sdk swift decode fn

* fix comments

* sdk: release v2.138.0-beta.7

* add lp events for evnet subscriber (#1892)

* add lp events for evnet subscriber

* idl build

* sdk: release v2.138.0-beta.8

* CHANGELOG

* sdk: fix idl

* program: token 22 scaled ui support (#1894)

* init

* program: scaled ui working

* cargo fmt --

* ts lint

* sdk: release v2.138.0-beta.9

* fix build

---------

Co-authored-by: Jack Waller <[email protected]>
Co-authored-by: lowkeynicc <[email protected]>
Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: LukasDeco <[email protected]>
Co-authored-by: Nick Caradonna <[email protected]>
Co-authored-by: moosecat <[email protected]>
Co-authored-by: Chris Heaney <[email protected]>

Author: 7 people

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: support scaled ui extension ([#1894](https://github.com/drift-labs/protocol-v2/pull/1894))
+
 ### Fixes
 
 ### Breaking

package.json

@@ -50,7 +50,7 @@
 		"prettify:fix": "prettier --write './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
 		"lint": "eslint . --ext ts --quiet --format unix",
 		"lint:fix": "eslint . --ext ts --fix",
-		"update-idl": "cp target/idl/drift.json sdk/src/idl/drift.json"
+		"update-idl": "anchor build -- --features anchor-test && cp target/idl/drift.json sdk/src/idl/drift.json"
 	},
 	"engines": {
 		"node": ">=12"
@@ -95,4 +95,4 @@
 		"supports-hyperlinks": "<4.1.1",
 		"has-ansi": "<6.0.1"
 	}
-}
+}

programs/drift/src/controller/token.rs

@@ -273,3 +273,21 @@ pub fn transfer_checked_with_transfer_hook<'info>(
 
     solana_program::program::invoke_signed(&ix, &account_infos, signer_seeds).map_err(Into::into)
 }
+
+pub fn initialize_token_account<'info>(
+    token_program: &Interface<'info, TokenInterface>,
+    account: &AccountInfo<'info>,
+    owner: &AccountInfo<'info>,
+    mint: &InterfaceAccount<'info, Mint>,
+) -> Result<()> {
+    let cpi_program = token_program.to_account_info();
+    let accounts = ::anchor_spl::token_interface::InitializeAccount3 {
+        account: account.to_account_info(),
+        mint: mint.to_account_info(),
+        authority: owner.to_account_info(),
+    };
+    let cpi_ctx = anchor_lang::context::CpiContext::new(cpi_program, accounts);
+    ::anchor_spl::token_interface::initialize_account3(cpi_ctx)?;
+
+    Ok(())
+}

programs/drift/src/instructions/admin.rs

@@ -9,7 +9,7 @@ use serum_dex::state::ToAlignedBytes;
 use std::convert::{identity, TryInto};
 use std::mem::size_of;
 
-use crate::controller::token::close_vault;
+use crate::controller::token::{close_vault, initialize_token_account};
 use crate::error::ErrorCode;
 use crate::ids::{admin_hot_wallet, amm_spread_adjust_wallet, mm_oracle_crank_wallet};
 use crate::instructions::constraints::*;
@@ -150,15 +150,19 @@ pub fn handle_initialize_spot_market(
     let state = &mut ctx.accounts.state;
     let spot_market_pubkey = ctx.accounts.spot_market.key();
 
-    // protocol must be authority of collateral vault
-    if ctx.accounts.spot_market_vault.owner != state.signer {
-        return Err(ErrorCode::InvalidSpotMarketAuthority.into());
-    }
+    initialize_token_account(
+        &ctx.accounts.token_program,
+        &ctx.accounts.spot_market_vault,
+        &ctx.accounts.drift_signer,
+        &ctx.accounts.spot_market_mint,
+    )?;
 
-    // protocol must be authority of collateral vault
-    if ctx.accounts.insurance_fund_vault.owner != state.signer {
-        return Err(ErrorCode::InvalidInsuranceFundAuthority.into());
-    }
+    initialize_token_account(
+        &ctx.accounts.token_program,
+        &ctx.accounts.insurance_fund_vault,
+        &ctx.accounts.drift_signer,
+        &ctx.accounts.spot_market_mint,
+    )?;
 
     validate_borrow_rate(optimal_utilization, optimal_borrow_rate, max_borrow_rate, 0)?;
 
@@ -284,7 +288,7 @@ pub fn handle_initialize_spot_market(
         historical_oracle_data: historical_oracle_data_default,
         historical_index_data: historical_index_data_default,
         mint: ctx.accounts.spot_market_mint.key(),
-        vault: *ctx.accounts.spot_market_vault.to_account_info().key,
+        vault: ctx.accounts.spot_market_vault.key(),
         revenue_pool: PoolBalance {
             scaled_balance: 0,
             market_index: spot_market_index,
@@ -341,7 +345,7 @@ pub fn handle_initialize_spot_market(
         pool_id: 0,
         padding: [0; 40],
         insurance_fund: InsuranceFund {
-            vault: *ctx.accounts.insurance_fund_vault.to_account_info().key,
+            vault: ctx.accounts.insurance_fund_vault.key(),
             unstaking_period: THIRTEEN_DAY,
             total_factor: if_total_factor,
             user_factor: if_total_factor / 2,
@@ -5099,25 +5103,30 @@ pub struct InitializeSpotMarket<'info> {
         payer = admin
     )]
     pub spot_market: AccountLoader<'info, SpotMarket>,
+    #[account(
+        mint::token_program = token_program,
+    )]
     pub spot_market_mint: Box<InterfaceAccount<'info, Mint>>,
     #[account(
         init,
         seeds = [b"spot_market_vault".as_ref(), state.number_of_spot_markets.to_le_bytes().as_ref()],
         bump,
         payer = admin,
-        token::mint = spot_market_mint,
-        token::authority = drift_signer
+        space = get_vault_len(&spot_market_mint)?,
+        owner = token_program.key()
     )]
-    pub spot_market_vault: Box<InterfaceAccount<'info, TokenAccount>>,
+    /// CHECK: checked in `initialize_spot_market`
+    pub spot_market_vault: AccountInfo<'info>,
     #[account(
         init,
         seeds = [b"insurance_fund_vault".as_ref(), state.number_of_spot_markets.to_le_bytes().as_ref()],
         bump,
         payer = admin,
-        token::mint = spot_market_mint,
-        token::authority = drift_signer
+        space = get_vault_len(&spot_market_mint)?,
+        owner = token_program.key()
     )]
-    pub insurance_fund_vault: Box<InterfaceAccount<'info, TokenAccount>>,
+    /// CHECK: checked in `initialize_spot_market`
+    pub insurance_fund_vault: AccountInfo<'info>,
     #[account(
         constraint = state.signer.eq(&drift_signer.key())
     )]

programs/drift/src/instructions/constraints.rs

@@ -1,7 +1,9 @@
 use anchor_lang::accounts::account::Account;
 use anchor_lang::accounts::account_loader::AccountLoader;
 use anchor_lang::accounts::signer::Signer;
+use anchor_lang::prelude::*;
 use anchor_lang::prelude::{AccountInfo, Pubkey};
+use anchor_spl::token_interface::Mint;
 
 use crate::error::ErrorCode;
 use crate::msg;
@@ -145,3 +147,28 @@ pub fn exchange_not_paused(state: &Account<State>) -> anchor_lang::Result<()> {
     }
     Ok(())
 }
+
+pub fn get_vault_len(mint: &InterfaceAccount<Mint>) -> anchor_lang::Result<usize> {
+    let mint_info = mint.to_account_info();
+    let len = if *mint_info.owner == ::anchor_spl::token_2022::Token2022::id() {
+        use ::anchor_spl::token_2022::spl_token_2022::extension::{
+            BaseStateWithExtensions, ExtensionType, StateWithExtensions,
+        };
+        use ::anchor_spl::token_2022::spl_token_2022::state::{Account, Mint};
+        let mint_data = mint_info.try_borrow_data()?;
+        let mint_state = StateWithExtensions::<Mint>::unpack(&mint_data)?;
+        let mint_extensions = match mint_state.get_extension_types() {
+            Ok(extensions) => extensions,
+            // If we cant deserialize the mint, we use the default token account length
+            // Init token will fail if this size doesnt work, so worst case init account just fails
+            Err(_) => return Ok(::anchor_spl::token::TokenAccount::LEN),
+        };
+        let required_extensions =
+            ExtensionType::get_required_init_account_extensions(&mint_extensions);
+        ExtensionType::try_calculate_account_len::<Account>(&required_extensions)?
+    } else {
+        ::anchor_spl::token::TokenAccount::LEN
+    };
+
+    Ok(len)
+}

sdk/VERSION

@@ -1 +1 @@
-2.138.0-beta.8
+2.138.0-beta.9

sdk/encode_swift_message.ts

@@ -0,0 +1,113 @@
+import { BASE_PRECISION, BN, getMarketOrderParams, getOrderParams, MarketType, PositionDirection } from '@drift-labs/sdk';
+import {
+    DriftClient,
+    Wallet,
+    SignedMsgOrderParams,
+    SignedMsgOrderParamsDelegateMessage,
+    OrderParams,
+    // SignedMsgExtensions,
+} from './src/';
+import {
+    Connection,
+    Keypair,
+    PublicKey,
+} from '@solana/web3.js';
+import { nanoid } from 'nanoid';
+
+async function main() {
+    const keypair = Keypair.generate();
+    console.log(keypair.publicKey.toString());
+    const driftClient = new DriftClient({
+        wallet: new Wallet(keypair),
+        connection: new Connection('https://api.mainnet-beta.solana.com'),
+    });
+    const slot = new BN(2345);
+
+    // test_deserialize_into_verified_message_delegate_with_max_margin_ratio
+    // const e0 = driftClient.encodeSignedMsgOrderParamsMessage(
+    //     {
+    //         signedMsgOrderParams: getOrderParams(getMarketOrderParams(
+    //             {
+    //                 marketIndex: 0,
+    //                 userOrderId: 2,
+    //                 price: new BN("237000000"),
+    //                 marketType: MarketType.PERP,
+    //                 baseAssetAmount: new BN("1000000000"),
+    //                 direction: PositionDirection.SHORT,
+    //                 reduceOnly: false,
+    //                 auctionDuration: 10,
+    //                 auctionStartPrice: new BN("240000000"),
+    //                 auctionEndPrice: new BN("238000000"),
+    //             }
+    //         )),
+    //         takerPubkey: new PublicKey('HG2iQKnRkkasrLptwMZewV6wT7KPstw9wkA8yyu8Nx3m'),
+    //         slot,
+    //         uuid: Buffer.from([67, 82, 79, 51, 105, 114, 71, 49]),
+    //         takeProfitOrderParams: {
+    //             baseAssetAmount: new BN("1000000000"),
+    //             triggerPrice: new BN("230000000"),
+    //         },
+    //         stopLossOrderParams: {
+    //             baseAssetAmount: new BN("1000000000"),
+    //             triggerPrice: new BN("250000000"),
+    //         },
+    //         ext: SignedMsgExtensions.V1({ maxMarginRatio: 1 }),
+    //     },
+    //     true,
+    // )
+    // console.log(JSON.stringify(Array.from(e0)));
+
+    // test_deserialize_into_verified_message_non_delegate_with_max_margin_ratio
+    const delegateSigner = false;
+    const e0 = driftClient.encodeSignedMsgOrderParamsMessage(
+        {
+            signedMsgOrderParams: getOrderParams(getMarketOrderParams(
+                {
+                    marketIndex: 0,
+                    userOrderId: 3,
+                    price: new BN("237000000"),
+                    marketType: MarketType.PERP,
+                    baseAssetAmount: new BN("3456000000"),
+                    direction: PositionDirection.LONG,
+                    reduceOnly: false,
+                    auctionDuration: 10,
+                    auctionStartPrice: new BN("230000000"),
+                    auctionEndPrice: new BN("237000000"),
+                }
+            )),
+            subAccountId: 2,
+            slot,
+            uuid: Buffer.from([67, 82, 79, 51, 105, 114, 71, 49]),
+            takeProfitOrderParams: {
+                baseAssetAmount: new BN("3456000000"),
+                triggerPrice: new BN("240000000"),
+            },
+            stopLossOrderParams: {
+                baseAssetAmount: new BN("3456000000"),
+                triggerPrice: new BN("225000000"),
+            },
+            // ext: SignedMsgExtensions.V0,
+            // ext: SignedMsgExtensions.V1({ maxMarginRatio: 65535 }),
+            // ext: SignedMsgExtensions.V2({ maxMarginRatio: 65535, newField: 1, newField2: 2 }),
+        },
+        delegateSigner,
+    );
+    // console.log('encoded: ', JSON.stringify(Array.from(e0)));
+
+    // const messageToDecode = e0;
+
+     // v0 message
+     // const messageToDecode = Buffer.from([200,213,166,94,34,52,245,93,0,1,0,3,0,96,254,205,0,0,0,0,64,85,32,14,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,1,128,133,181,13,0,0,0,0,1,64,85,32,14,0,0,0,0,2,0,41,9,0,0,0,0,0,0,67,82,79,51,105,114,71,49,1,0,28,78,14,0,0,0,0,0,96,254,205,0,0,0,0,1,64,58,105,13,0,0,0,0,0,96,254,205,0,0,0,0,0]);
+
+    // the v1 message
+    // const messageToDecode = Buffer.from([200,213,166,94,34,52,245,93,0,1,0,3,0,96,254,205,0,0,0,0,64,85,32,14,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,1,128,133,181,13,0,0,0,0,1,64,85,32,14,0,0,0,0,2,0,41,9,0,0,0,0,0,0,67,82,79,51,105,114,71,49,1,0,28,78,14,0,0,0,0,0,96,254,205,0,0,0,0,1,64,58,105,13,0,0,0,0,0,96,254,205,0,0,0,0,1,1,255,255]);
+
+    // the v2 message
+    const messageToDecode = Buffer.from([200,213,166,94,34,52,245,93,0,1,0,3,0,96,254,205,0,0,0,0,64,85,32,14,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,1,128,133,181,13,0,0,0,0,1,64,85,32,14,0,0,0,0,2,0,41,9,0,0,0,0,0,0,67,82,79,51,105,114,71,49,1,0,28,78,14,0,0,0,0,0,96,254,205,0,0,0,0,1,64,58,105,13,0,0,0,0,0,96,254,205,0,0,0,0,2,1,255,255,1,1,0,1,2,0]);
+
+    console.log('decoding:', JSON.stringify(Array.from((messageToDecode))));
+    const d0 = driftClient.decodeSignedMsgOrderParamsMessage(messageToDecode, delegateSigner)
+    console.log(d0)
+}
+
+main();

sdk/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.138.0-beta.8",
+	"version": "2.138.0-beta.9",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",