@@ -14,7 +14,6 @@ import {
14
14
ContractTier ,
15
15
AssetTier ,
16
16
SpotFulfillmentConfigStatus ,
17
- IfRebalanceConfigParams ,
18
17
} from './types' ;
19
18
import { DEFAULT_MARKET_NAME , encodeName } from './userName' ;
20
19
import { BN } from '@coral-xyz/anchor' ;
@@ -38,7 +37,6 @@ import {
38
37
getProtectedMakerModeConfigPublicKey ,
39
38
getFuelOverflowAccountPublicKey ,
40
39
getTokenProgramForSpotMarket ,
41
- getIfRebalanceConfigPublicKey ,
42
40
} from './addresses/pda' ;
43
41
import { squareRootBN } from './math/utils' ;
44
42
import { TOKEN_PROGRAM_ID } from '@solana/spl-token' ;
@@ -3403,86 +3401,6 @@ export class AdminClient extends DriftClient {
3403
3401
) ;
3404
3402
}
3405
3403
3406
- public async updatePerpMarketTakerSpeedBumpOverride (
3407
- perpMarketIndex : number ,
3408
- takerSpeedBumpOverride : number
3409
- ) : Promise < TransactionSignature > {
3410
- const updatePerpMarketTakerSpeedBumpOverrideIx =
3411
- await this . getUpdatePerpMarketTakerSpeedBumpOverrideIx (
3412
- perpMarketIndex ,
3413
- takerSpeedBumpOverride
3414
- ) ;
3415
-
3416
- const tx = await this . buildTransaction (
3417
- updatePerpMarketTakerSpeedBumpOverrideIx
3418
- ) ;
3419
-
3420
- const { txSig } = await this . sendTransaction ( tx , [ ] , this . opts ) ;
3421
-
3422
- return txSig ;
3423
- }
3424
-
3425
- public async getUpdatePerpMarketTakerSpeedBumpOverrideIx (
3426
- perpMarketIndex : number ,
3427
- takerSpeedBumpOverride : number
3428
- ) : Promise < TransactionInstruction > {
3429
- return await this . program . instruction . updatePerpMarketTakerSpeedBumpOverride (
3430
- takerSpeedBumpOverride ,
3431
- {
3432
- accounts : {
3433
- admin : this . isSubscribed
3434
- ? this . getStateAccount ( ) . admin
3435
- : this . wallet . publicKey ,
3436
- state : await this . getStatePublicKey ( ) ,
3437
- perpMarket : await getPerpMarketPublicKey (
3438
- this . program . programId ,
3439
- perpMarketIndex
3440
- ) ,
3441
- } ,
3442
- }
3443
- ) ;
3444
- }
3445
-
3446
- public async updatePerpMarketAmmSpreadAdjustment (
3447
- perpMarketIndex : number ,
3448
- ammSpreadAdjustment : number
3449
- ) : Promise < TransactionSignature > {
3450
- const updatePerpMarketAmmSpreadAdjustmentIx =
3451
- await this . getUpdatePerpMarketAmmSpreadAdjustmentIx (
3452
- perpMarketIndex ,
3453
- ammSpreadAdjustment
3454
- ) ;
3455
-
3456
- const tx = await this . buildTransaction (
3457
- updatePerpMarketAmmSpreadAdjustmentIx
3458
- ) ;
3459
-
3460
- const { txSig } = await this . sendTransaction ( tx , [ ] , this . opts ) ;
3461
-
3462
- return txSig ;
3463
- }
3464
-
3465
- public async getUpdatePerpMarketAmmSpreadAdjustmentIx (
3466
- perpMarketIndex : number ,
3467
- ammSpreadAdjustment : number
3468
- ) : Promise < TransactionInstruction > {
3469
- return await this . program . instruction . updatePerpMarketAmmSpreadAdjustment (
3470
- ammSpreadAdjustment ,
3471
- {
3472
- accounts : {
3473
- admin : this . useHotWalletAdmin
3474
- ? this . wallet . publicKey
3475
- : this . getStateAccount ( ) . admin ,
3476
- state : await this . getStatePublicKey ( ) ,
3477
- perpMarket : await getPerpMarketPublicKey (
3478
- this . program . programId ,
3479
- perpMarketIndex
3480
- ) ,
3481
- } ,
3482
- }
3483
- ) ;
3484
- }
3485
-
3486
3404
public async updateSpotMarketFeeAdjustment (
3487
3405
perpMarketIndex : number ,
3488
3406
feeAdjustment : number
@@ -3941,39 +3859,34 @@ export class AdminClient extends DriftClient {
3941
3859
) ;
3942
3860
}
3943
3861
3944
- public async updatePerpMarketProtectedMakerParams (
3862
+ public async updatePerpMarketTakerSpeedBumpOverride (
3945
3863
perpMarketIndex : number ,
3946
- protectedMakerLimitPriceDivisor ?: number ,
3947
- protectedMakerDynamicDivisor ?: number
3864
+ takerSpeedBumpOverride : number
3948
3865
) : Promise < TransactionSignature > {
3949
- const updatePerpMarketProtectedMakerParamsIx =
3950
- await this . getUpdatePerpMarketProtectedMakerParamsIx (
3866
+ const updatePerpMarketTakerSpeedBumpOverrideIx =
3867
+ await this . getUpdatePerpMarketTakerSpeedBumpOverrideIx (
3951
3868
perpMarketIndex ,
3952
- protectedMakerLimitPriceDivisor || null ,
3953
- protectedMakerDynamicDivisor || null
3869
+ takerSpeedBumpOverride
3954
3870
) ;
3955
-
3956
3871
const tx = await this . buildTransaction (
3957
- updatePerpMarketProtectedMakerParamsIx
3872
+ updatePerpMarketTakerSpeedBumpOverrideIx
3958
3873
) ;
3959
3874
const { txSig } = await this . sendTransaction ( tx , [ ] , this . opts ) ;
3960
3875
3961
3876
return txSig ;
3962
3877
}
3963
3878
3964
- public async getUpdatePerpMarketProtectedMakerParamsIx (
3879
+ public async getUpdatePerpMarketTakerSpeedBumpOverrideIx (
3965
3880
perpMarketIndex : number ,
3966
- protectedMakerLimitPriceDivisor ?: number ,
3967
- protectedMakerDynamicDivisor ?: number
3881
+ takerSpeedBumpOverride : number
3968
3882
) : Promise < TransactionInstruction > {
3969
3883
const perpMarketPublicKey = await getPerpMarketPublicKey (
3970
3884
this . program . programId ,
3971
3885
perpMarketIndex
3972
3886
) ;
3973
3887
3974
- return await this . program . instruction . updatePerpMarketProtectedMakerParams (
3975
- protectedMakerLimitPriceDivisor || null ,
3976
- protectedMakerDynamicDivisor || null ,
3888
+ return await this . program . instruction . updatePerpMarketTakerSpeedBumpOverride (
3889
+ takerSpeedBumpOverride ,
3977
3890
{
3978
3891
accounts : {
3979
3892
admin : this . isSubscribed
@@ -3986,67 +3899,89 @@ export class AdminClient extends DriftClient {
3986
3899
) ;
3987
3900
}
3988
3901
3989
- public async initializeIfRebalanceConfig (
3990
- params : IfRebalanceConfigParams
3902
+ public async updatePerpMarketAmmSpreadAdjustment (
3903
+ perpMarketIndex : number ,
3904
+ ammSpreadAdjustment : number
3991
3905
) : Promise < TransactionSignature > {
3992
- const initializeIfRebalanceConfigIx =
3993
- await this . getInitializeIfRebalanceConfigIx ( params ) ;
3994
-
3995
- const tx = await this . buildTransaction ( initializeIfRebalanceConfigIx ) ;
3906
+ const updatePerpMarketAmmSpreadAdjustmentIx =
3907
+ await this . getUpdatePerpMarketAmmSpreadAdjustmentIx (
3908
+ perpMarketIndex ,
3909
+ ammSpreadAdjustment
3910
+ ) ;
3911
+ const tx = await this . buildTransaction (
3912
+ updatePerpMarketAmmSpreadAdjustmentIx
3913
+ ) ;
3996
3914
const { txSig } = await this . sendTransaction ( tx , [ ] , this . opts ) ;
3997
3915
3998
3916
return txSig ;
3999
3917
}
4000
3918
4001
- public async getInitializeIfRebalanceConfigIx (
4002
- params : IfRebalanceConfigParams
3919
+ public async getUpdatePerpMarketAmmSpreadAdjustmentIx (
3920
+ perpMarketIndex : number ,
3921
+ ammSpreadAdjustment : number
4003
3922
) : Promise < TransactionInstruction > {
4004
- return await this . program . instruction . initializeIfRebalanceConfig ( params , {
4005
- accounts : {
4006
- admin : this . isSubscribed
4007
- ? this . getStateAccount ( ) . admin
4008
- : this . wallet . publicKey ,
4009
- state : await this . getStatePublicKey ( ) ,
4010
- ifRebalanceConfig : await getIfRebalanceConfigPublicKey (
4011
- this . program . programId ,
4012
- params . inMarketIndex ,
4013
- params . outMarketIndex
4014
- ) ,
4015
- rent : SYSVAR_RENT_PUBKEY ,
4016
- systemProgram : anchor . web3 . SystemProgram . programId ,
4017
- } ,
4018
- } ) ;
3923
+ const perpMarketPublicKey = await getPerpMarketPublicKey (
3924
+ this . program . programId ,
3925
+ perpMarketIndex
3926
+ ) ;
3927
+
3928
+ return await this . program . instruction . updatePerpMarketAmmSpreadAdjustment (
3929
+ ammSpreadAdjustment ,
3930
+ {
3931
+ accounts : {
3932
+ admin : this . isSubscribed
3933
+ ? this . getStateAccount ( ) . admin
3934
+ : this . wallet . publicKey ,
3935
+ state : await this . getStatePublicKey ( ) ,
3936
+ perpMarket : perpMarketPublicKey ,
3937
+ } ,
3938
+ }
3939
+ ) ;
4019
3940
}
4020
3941
4021
- public async updateIfRebalanceConfig (
4022
- params : IfRebalanceConfigParams
3942
+ public async updatePerpMarketProtectedMakerParams (
3943
+ perpMarketIndex : number ,
3944
+ protectedMakerLimitPriceDivisor ?: number ,
3945
+ protectedMakerDynamicDivisor ?: number
4023
3946
) : Promise < TransactionSignature > {
4024
- const updateIfRebalanceConfigIx = await this . getUpdateIfRebalanceConfigIx (
4025
- params
4026
- ) ;
3947
+ const updatePerpMarketProtectedMakerParamsIx =
3948
+ await this . getUpdatePerpMarketProtectedMakerParamsIx (
3949
+ perpMarketIndex ,
3950
+ protectedMakerLimitPriceDivisor || null ,
3951
+ protectedMakerDynamicDivisor || null
3952
+ ) ;
4027
3953
4028
- const tx = await this . buildTransaction ( updateIfRebalanceConfigIx ) ;
3954
+ const tx = await this . buildTransaction (
3955
+ updatePerpMarketProtectedMakerParamsIx
3956
+ ) ;
4029
3957
const { txSig } = await this . sendTransaction ( tx , [ ] , this . opts ) ;
4030
3958
4031
3959
return txSig ;
4032
3960
}
4033
3961
4034
- public async getUpdateIfRebalanceConfigIx (
4035
- params : IfRebalanceConfigParams
3962
+ public async getUpdatePerpMarketProtectedMakerParamsIx (
3963
+ perpMarketIndex : number ,
3964
+ protectedMakerLimitPriceDivisor ?: number ,
3965
+ protectedMakerDynamicDivisor ?: number
4036
3966
) : Promise < TransactionInstruction > {
4037
- return await this . program . instruction . updateIfRebalanceConfig ( params , {
4038
- accounts : {
4039
- admin : this . isSubscribed
4040
- ? this . getStateAccount ( ) . admin
4041
- : this . wallet . publicKey ,
4042
- state : await this . getStatePublicKey ( ) ,
4043
- ifRebalanceConfig : await getIfRebalanceConfigPublicKey (
4044
- this . program . programId ,
4045
- params . inMarketIndex ,
4046
- params . outMarketIndex
4047
- ) ,
4048
- } ,
4049
- } ) ;
3967
+ const perpMarketPublicKey = await getPerpMarketPublicKey (
3968
+ this . program . programId ,
3969
+ perpMarketIndex
3970
+ ) ;
3971
+
3972
+ return await this . program . instruction . updatePerpMarketProtectedMakerParams (
3973
+ protectedMakerLimitPriceDivisor || null ,
3974
+ protectedMakerDynamicDivisor || null ,
3975
+ {
3976
+ accounts : {
3977
+ admin : this . isSubscribed
3978
+ ? this . getStateAccount ( ) . admin
3979
+ : this . wallet . publicKey ,
3980
+ state : await this . getStatePublicKey ( ) ,
3981
+ perpMarket : perpMarketPublicKey ,
3982
+ } ,
3983
+ }
3984
+ ) ;
4050
3985
}
4051
3986
4052
3987
public async initUserFuel (
0 commit comments