flash-sdk 2.23.2 → 2.24.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1455,6 +1455,237 @@ export type Perpetuals = {
1455
1455
  ];
1456
1456
  "returns": "u64";
1457
1457
  },
1458
+ {
1459
+ "name": "swapAndOpen";
1460
+ "accounts": [
1461
+ {
1462
+ "name": "owner";
1463
+ "isMut": true;
1464
+ "isSigner": true;
1465
+ },
1466
+ {
1467
+ "name": "feePayer";
1468
+ "isMut": true;
1469
+ "isSigner": true;
1470
+ },
1471
+ {
1472
+ "name": "fundingAccount";
1473
+ "isMut": true;
1474
+ "isSigner": false;
1475
+ },
1476
+ {
1477
+ "name": "transferAuthority";
1478
+ "isMut": false;
1479
+ "isSigner": false;
1480
+ },
1481
+ {
1482
+ "name": "perpetuals";
1483
+ "isMut": false;
1484
+ "isSigner": false;
1485
+ },
1486
+ {
1487
+ "name": "pool";
1488
+ "isMut": true;
1489
+ "isSigner": false;
1490
+ },
1491
+ {
1492
+ "name": "receivingCustody";
1493
+ "isMut": true;
1494
+ "isSigner": false;
1495
+ },
1496
+ {
1497
+ "name": "receivingCustodyOracleAccount";
1498
+ "isMut": false;
1499
+ "isSigner": false;
1500
+ },
1501
+ {
1502
+ "name": "receivingCustodyTokenAccount";
1503
+ "isMut": true;
1504
+ "isSigner": false;
1505
+ },
1506
+ {
1507
+ "name": "position";
1508
+ "isMut": true;
1509
+ "isSigner": false;
1510
+ },
1511
+ {
1512
+ "name": "market";
1513
+ "isMut": true;
1514
+ "isSigner": false;
1515
+ },
1516
+ {
1517
+ "name": "targetCustody";
1518
+ "isMut": false;
1519
+ "isSigner": false;
1520
+ },
1521
+ {
1522
+ "name": "targetOracleAccount";
1523
+ "isMut": false;
1524
+ "isSigner": false;
1525
+ },
1526
+ {
1527
+ "name": "collateralCustody";
1528
+ "isMut": true;
1529
+ "isSigner": false;
1530
+ },
1531
+ {
1532
+ "name": "collateralOracleAccount";
1533
+ "isMut": false;
1534
+ "isSigner": false;
1535
+ },
1536
+ {
1537
+ "name": "collateralCustodyTokenAccount";
1538
+ "isMut": true;
1539
+ "isSigner": false;
1540
+ },
1541
+ {
1542
+ "name": "systemProgram";
1543
+ "isMut": false;
1544
+ "isSigner": false;
1545
+ },
1546
+ {
1547
+ "name": "tokenProgram";
1548
+ "isMut": false;
1549
+ "isSigner": false;
1550
+ },
1551
+ {
1552
+ "name": "eventAuthority";
1553
+ "isMut": false;
1554
+ "isSigner": false;
1555
+ },
1556
+ {
1557
+ "name": "ixSysvar";
1558
+ "isMut": false;
1559
+ "isSigner": false;
1560
+ }
1561
+ ];
1562
+ "args": [
1563
+ {
1564
+ "name": "params";
1565
+ "type": {
1566
+ "defined": "SwapAndOpenParams";
1567
+ };
1568
+ }
1569
+ ];
1570
+ },
1571
+ {
1572
+ "name": "closeAndSwap";
1573
+ "accounts": [
1574
+ {
1575
+ "name": "owner";
1576
+ "isMut": true;
1577
+ "isSigner": true;
1578
+ },
1579
+ {
1580
+ "name": "feePayer";
1581
+ "isMut": true;
1582
+ "isSigner": true;
1583
+ },
1584
+ {
1585
+ "name": "receivingAccount";
1586
+ "isMut": true;
1587
+ "isSigner": false;
1588
+ },
1589
+ {
1590
+ "name": "collateralAccount";
1591
+ "isMut": true;
1592
+ "isSigner": false;
1593
+ },
1594
+ {
1595
+ "name": "transferAuthority";
1596
+ "isMut": false;
1597
+ "isSigner": false;
1598
+ },
1599
+ {
1600
+ "name": "perpetuals";
1601
+ "isMut": false;
1602
+ "isSigner": false;
1603
+ },
1604
+ {
1605
+ "name": "pool";
1606
+ "isMut": true;
1607
+ "isSigner": false;
1608
+ },
1609
+ {
1610
+ "name": "position";
1611
+ "isMut": true;
1612
+ "isSigner": false;
1613
+ },
1614
+ {
1615
+ "name": "market";
1616
+ "isMut": true;
1617
+ "isSigner": false;
1618
+ },
1619
+ {
1620
+ "name": "targetCustody";
1621
+ "isMut": false;
1622
+ "isSigner": false;
1623
+ },
1624
+ {
1625
+ "name": "targetOracleAccount";
1626
+ "isMut": false;
1627
+ "isSigner": false;
1628
+ },
1629
+ {
1630
+ "name": "collateralCustody";
1631
+ "isMut": true;
1632
+ "isSigner": false;
1633
+ },
1634
+ {
1635
+ "name": "collateralOracleAccount";
1636
+ "isMut": false;
1637
+ "isSigner": false;
1638
+ },
1639
+ {
1640
+ "name": "collateralCustodyTokenAccount";
1641
+ "isMut": true;
1642
+ "isSigner": false;
1643
+ },
1644
+ {
1645
+ "name": "dispensingCustody";
1646
+ "isMut": true;
1647
+ "isSigner": false;
1648
+ },
1649
+ {
1650
+ "name": "dispensingOracleAccount";
1651
+ "isMut": false;
1652
+ "isSigner": false;
1653
+ },
1654
+ {
1655
+ "name": "dispensingCustodyTokenAccount";
1656
+ "isMut": true;
1657
+ "isSigner": false;
1658
+ },
1659
+ {
1660
+ "name": "tokenProgram";
1661
+ "isMut": false;
1662
+ "isSigner": false;
1663
+ },
1664
+ {
1665
+ "name": "eventAuthority";
1666
+ "isMut": false;
1667
+ "isSigner": false;
1668
+ },
1669
+ {
1670
+ "name": "program";
1671
+ "isMut": false;
1672
+ "isSigner": false;
1673
+ },
1674
+ {
1675
+ "name": "ixSysvar";
1676
+ "isMut": false;
1677
+ "isSigner": false;
1678
+ }
1679
+ ];
1680
+ "args": [
1681
+ {
1682
+ "name": "params";
1683
+ "type": {
1684
+ "defined": "CloseAndSwapParams";
1685
+ };
1686
+ }
1687
+ ];
1688
+ },
1458
1689
  {
1459
1690
  "name": "addLiquidityAndStake";
1460
1691
  "accounts": [
@@ -3477,12 +3708,12 @@ export type Perpetuals = {
3477
3708
  "returns": "u64";
3478
3709
  },
3479
3710
  {
3480
- "name": "executeLimitOrder";
3711
+ "name": "executeLimitWithSwap";
3481
3712
  "accounts": [
3482
3713
  {
3483
3714
  "name": "feePayer";
3484
3715
  "isMut": true;
3485
- "isSigner": true;
3716
+ "isSigner": false;
3486
3717
  },
3487
3718
  {
3488
3719
  "name": "perpetuals";
@@ -3491,6 +3722,16 @@ export type Perpetuals = {
3491
3722
  },
3492
3723
  {
3493
3724
  "name": "pool";
3725
+ "isMut": true;
3726
+ "isSigner": false;
3727
+ },
3728
+ {
3729
+ "name": "reserveCustody";
3730
+ "isMut": true;
3731
+ "isSigner": false;
3732
+ },
3733
+ {
3734
+ "name": "reserveCustodyOracleAccount";
3494
3735
  "isMut": false;
3495
3736
  "isSigner": false;
3496
3737
  },
@@ -3559,29 +3800,19 @@ export type Perpetuals = {
3559
3800
  {
3560
3801
  "name": "params";
3561
3802
  "type": {
3562
- "defined": "ExecuteLimitOrderParams";
3803
+ "defined": "ExecuteLimitWithSwapParams";
3563
3804
  };
3564
3805
  }
3565
3806
  ];
3566
3807
  },
3567
3808
  {
3568
- "name": "placeLimitOrder";
3809
+ "name": "executeLimitOrder";
3569
3810
  "accounts": [
3570
- {
3571
- "name": "owner";
3572
- "isMut": true;
3573
- "isSigner": true;
3574
- },
3575
3811
  {
3576
3812
  "name": "feePayer";
3577
3813
  "isMut": true;
3578
3814
  "isSigner": true;
3579
3815
  },
3580
- {
3581
- "name": "fundingAccount";
3582
- "isMut": true;
3583
- "isSigner": false;
3584
- },
3585
3816
  {
3586
3817
  "name": "perpetuals";
3587
3818
  "isMut": false;
@@ -3604,7 +3835,7 @@ export type Perpetuals = {
3604
3835
  },
3605
3836
  {
3606
3837
  "name": "market";
3607
- "isMut": false;
3838
+ "isMut": true;
3608
3839
  "isSigner": false;
3609
3840
  },
3610
3841
  {
@@ -3618,12 +3849,110 @@ export type Perpetuals = {
3618
3849
  "isSigner": false;
3619
3850
  },
3620
3851
  {
3621
- "name": "reserveCustody";
3852
+ "name": "collateralCustody";
3622
3853
  "isMut": true;
3623
3854
  "isSigner": false;
3624
3855
  },
3625
3856
  {
3626
- "name": "reserveOracleAccount";
3857
+ "name": "collateralOracleAccount";
3858
+ "isMut": false;
3859
+ "isSigner": false;
3860
+ },
3861
+ {
3862
+ "name": "systemProgram";
3863
+ "isMut": false;
3864
+ "isSigner": false;
3865
+ },
3866
+ {
3867
+ "name": "tokenProgram";
3868
+ "isMut": false;
3869
+ "isSigner": false;
3870
+ },
3871
+ {
3872
+ "name": "eventAuthority";
3873
+ "isMut": false;
3874
+ "isSigner": false;
3875
+ },
3876
+ {
3877
+ "name": "program";
3878
+ "isMut": false;
3879
+ "isSigner": false;
3880
+ },
3881
+ {
3882
+ "name": "ixSysvar";
3883
+ "isMut": false;
3884
+ "isSigner": false;
3885
+ }
3886
+ ];
3887
+ "args": [
3888
+ {
3889
+ "name": "params";
3890
+ "type": {
3891
+ "defined": "ExecuteLimitOrderParams";
3892
+ };
3893
+ }
3894
+ ];
3895
+ },
3896
+ {
3897
+ "name": "placeLimitOrder";
3898
+ "accounts": [
3899
+ {
3900
+ "name": "owner";
3901
+ "isMut": true;
3902
+ "isSigner": true;
3903
+ },
3904
+ {
3905
+ "name": "feePayer";
3906
+ "isMut": true;
3907
+ "isSigner": true;
3908
+ },
3909
+ {
3910
+ "name": "fundingAccount";
3911
+ "isMut": true;
3912
+ "isSigner": false;
3913
+ },
3914
+ {
3915
+ "name": "perpetuals";
3916
+ "isMut": false;
3917
+ "isSigner": false;
3918
+ },
3919
+ {
3920
+ "name": "pool";
3921
+ "isMut": false;
3922
+ "isSigner": false;
3923
+ },
3924
+ {
3925
+ "name": "position";
3926
+ "isMut": true;
3927
+ "isSigner": false;
3928
+ },
3929
+ {
3930
+ "name": "order";
3931
+ "isMut": true;
3932
+ "isSigner": false;
3933
+ },
3934
+ {
3935
+ "name": "market";
3936
+ "isMut": false;
3937
+ "isSigner": false;
3938
+ },
3939
+ {
3940
+ "name": "targetCustody";
3941
+ "isMut": false;
3942
+ "isSigner": false;
3943
+ },
3944
+ {
3945
+ "name": "targetOracleAccount";
3946
+ "isMut": false;
3947
+ "isSigner": false;
3948
+ },
3949
+ {
3950
+ "name": "reserveCustody";
3951
+ "isMut": true;
3952
+ "isSigner": false;
3953
+ },
3954
+ {
3955
+ "name": "reserveOracleAccount";
3627
3956
  "isMut": false;
3628
3957
  "isSigner": false;
3629
3958
  },
@@ -3936,6 +4265,124 @@ export type Perpetuals = {
3936
4265
  }
3937
4266
  ];
3938
4267
  },
4268
+ {
4269
+ "name": "executeTriggerWithSwap";
4270
+ "accounts": [
4271
+ {
4272
+ "name": "feePayer";
4273
+ "isMut": true;
4274
+ "isSigner": false;
4275
+ },
4276
+ {
4277
+ "name": "receivingAccount";
4278
+ "isMut": true;
4279
+ "isSigner": false;
4280
+ },
4281
+ {
4282
+ "name": "collateralAccount";
4283
+ "isMut": true;
4284
+ "isSigner": false;
4285
+ },
4286
+ {
4287
+ "name": "transferAuthority";
4288
+ "isMut": false;
4289
+ "isSigner": false;
4290
+ },
4291
+ {
4292
+ "name": "perpetuals";
4293
+ "isMut": false;
4294
+ "isSigner": false;
4295
+ },
4296
+ {
4297
+ "name": "pool";
4298
+ "isMut": true;
4299
+ "isSigner": false;
4300
+ },
4301
+ {
4302
+ "name": "position";
4303
+ "isMut": true;
4304
+ "isSigner": false;
4305
+ },
4306
+ {
4307
+ "name": "order";
4308
+ "isMut": true;
4309
+ "isSigner": false;
4310
+ },
4311
+ {
4312
+ "name": "market";
4313
+ "isMut": true;
4314
+ "isSigner": false;
4315
+ },
4316
+ {
4317
+ "name": "targetCustody";
4318
+ "isMut": false;
4319
+ "isSigner": false;
4320
+ },
4321
+ {
4322
+ "name": "targetOracleAccount";
4323
+ "isMut": false;
4324
+ "isSigner": false;
4325
+ },
4326
+ {
4327
+ "name": "collateralCustody";
4328
+ "isMut": true;
4329
+ "isSigner": false;
4330
+ },
4331
+ {
4332
+ "name": "collateralOracleAccount";
4333
+ "isMut": false;
4334
+ "isSigner": false;
4335
+ },
4336
+ {
4337
+ "name": "collateralCustodyTokenAccount";
4338
+ "isMut": true;
4339
+ "isSigner": false;
4340
+ },
4341
+ {
4342
+ "name": "dispensingCustody";
4343
+ "isMut": true;
4344
+ "isSigner": false;
4345
+ },
4346
+ {
4347
+ "name": "dispensingOracleAccount";
4348
+ "isMut": false;
4349
+ "isSigner": false;
4350
+ },
4351
+ {
4352
+ "name": "dispensingCustodyTokenAccount";
4353
+ "isMut": true;
4354
+ "isSigner": false;
4355
+ },
4356
+ {
4357
+ "name": "tokenProgram";
4358
+ "isMut": false;
4359
+ "isSigner": false;
4360
+ },
4361
+ {
4362
+ "name": "eventAuthority";
4363
+ "isMut": false;
4364
+ "isSigner": false;
4365
+ },
4366
+ {
4367
+ "name": "program";
4368
+ "isMut": false;
4369
+ "isSigner": false;
4370
+ },
4371
+ {
4372
+ "name": "ixSysvar";
4373
+ "isMut": false;
4374
+ "isSigner": false;
4375
+ }
4376
+ ];
4377
+ "args": [
4378
+ {
4379
+ "name": "params";
4380
+ "type": {
4381
+ "defined": "ExecuteTriggerWithSwapParams";
4382
+ };
4383
+ }
4384
+ ];
4385
+ },
3939
4386
  {
3940
4387
  "name": "executeTriggerOrder";
3941
4388
  "accounts": [
@@ -6066,6 +6513,30 @@ export type Perpetuals = {
6066
6513
  ];
6067
6514
  };
6068
6515
  },
6516
+ {
6517
+ "name": "CloseAndSwapParams";
6518
+ "type": {
6519
+ "kind": "struct";
6520
+ "fields": [
6521
+ {
6522
+ "name": "priceWithSlippage";
6523
+ "type": {
6524
+ "defined": "OraclePrice";
6525
+ };
6526
+ },
6527
+ {
6528
+ "name": "minSwapAmountOut";
6529
+ "type": "u64";
6530
+ },
6531
+ {
6532
+ "name": "privilege";
6533
+ "type": {
6534
+ "defined": "Privilege";
6535
+ };
6536
+ }
6537
+ ];
6538
+ };
6539
+ },
6069
6540
  {
6070
6541
  "name": "ClosePositionParams";
6071
6542
  "type": {
@@ -6185,6 +6656,10 @@ export type Perpetuals = {
6185
6656
  "type": {
6186
6657
  "defined": "OraclePrice";
6187
6658
  };
6659
+ },
6660
+ {
6661
+ "name": "receiveCustodyId";
6662
+ "type": "u8";
6188
6663
  }
6189
6664
  ];
6190
6665
  };
@@ -6233,6 +6708,24 @@ export type Perpetuals = {
6233
6708
  ];
6234
6709
  };
6235
6710
  },
6711
+ {
6712
+ "name": "ExecuteLimitWithSwapParams";
6713
+ "type": {
6714
+ "kind": "struct";
6715
+ "fields": [
6716
+ {
6717
+ "name": "orderId";
6718
+ "type": "u8";
6719
+ },
6720
+ {
6721
+ "name": "privilege";
6722
+ "type": {
6723
+ "defined": "Privilege";
6724
+ };
6725
+ }
6726
+ ];
6727
+ };
6728
+ },
6236
6729
  {
6237
6730
  "name": "ExecuteTriggerOrderParams";
6238
6731
  "type": {
@@ -6250,7 +6743,23 @@ export type Perpetuals = {
6250
6743
  };
6251
6744
  },
6252
6745
  {
6253
- "name": "ForceClosePositionParams";
6746
+ "name": "ExecuteTriggerWithSwapParams";
6747
+ "type": {
6748
+ "kind": "struct";
6749
+ "fields": [
6750
+ {
6751
+ "name": "isStopLoss";
6752
+ "type": "bool";
6753
+ },
6754
+ {
6755
+ "name": "orderId";
6756
+ "type": "u8";
6757
+ }
6758
+ ];
6759
+ };
6760
+ },
6761
+ {
6762
+ "name": "ForceClosePositionParams";
6254
6763
  "type": {
6255
6764
  "kind": "struct";
6256
6765
  "fields": [
@@ -7083,6 +7592,38 @@ export type Perpetuals = {
7083
7592
  ];
7084
7593
  };
7085
7594
  },
7595
+ {
7596
+ "name": "SwapAndOpenParams";
7597
+ "type": {
7598
+ "kind": "struct";
7599
+ "fields": [
7600
+ {
7601
+ "name": "amountIn";
7602
+ "type": "u64";
7603
+ },
7604
+ {
7605
+ "name": "minCollateralAmountOut";
7606
+ "type": "u64";
7607
+ },
7608
+ {
7609
+ "name": "priceWithSlippage";
7610
+ "type": {
7611
+ "defined": "OraclePrice";
7612
+ };
7613
+ },
7614
+ {
7615
+ "name": "sizeAmount";
7616
+ "type": "u64";
7617
+ },
7618
+ {
7619
+ "name": "privilege";
7620
+ "type": {
7621
+ "defined": "Privilege";
7622
+ };
7623
+ }
7624
+ ];
7625
+ };
7626
+ },
7086
7627
  {
7087
7628
  "name": "SwapFeeInternalParams";
7088
7629
  "type": {
@@ -8617,7 +9158,7 @@ export type Perpetuals = {
8617
9158
  ];
8618
9159
  },
8619
9160
  {
8620
- "name": "ClosePositionLog";
9161
+ "name": "ClosePositionLogV3";
8621
9162
  "fields": [
8622
9163
  {
8623
9164
  "name": "owner";
@@ -8630,89 +9171,104 @@ export type Perpetuals = {
8630
9171
  "index": false;
8631
9172
  },
8632
9173
  {
8633
- "name": "priceUsd";
9174
+ "name": "entryPrice";
8634
9175
  "type": "u64";
8635
9176
  "index": false;
8636
9177
  },
8637
9178
  {
8638
- "name": "sizeAmount";
8639
- "type": "u64";
9179
+ "name": "entryPriceExponent";
9180
+ "type": "i32";
8640
9181
  "index": false;
8641
9182
  },
8642
9183
  {
8643
- "name": "sizeUsd";
8644
- "type": "u64";
9184
+ "name": "duration";
9185
+ "type": "i64";
8645
9186
  "index": false;
8646
9187
  },
8647
9188
  {
8648
- "name": "profitUsd";
9189
+ "name": "exitPrice";
8649
9190
  "type": "u64";
8650
9191
  "index": false;
8651
9192
  },
8652
9193
  {
8653
- "name": "lossUsd";
9194
+ "name": "exitPriceExponent";
9195
+ "type": "i32";
9196
+ "index": false;
9197
+ },
9198
+ {
9199
+ "name": "sizeAmount";
8654
9200
  "type": "u64";
8655
9201
  "index": false;
8656
9202
  },
8657
9203
  {
8658
- "name": "feeAmount";
9204
+ "name": "sizeUsd";
8659
9205
  "type": "u64";
8660
9206
  "index": false;
8661
- }
8662
- ];
8663
- },
8664
- {
8665
- "name": "ClosePositionLogV2";
8666
- "fields": [
9207
+ },
8667
9208
  {
8668
- "name": "owner";
8669
- "type": "publicKey";
9209
+ "name": "collateralPrice";
9210
+ "type": "u64";
8670
9211
  "index": false;
8671
9212
  },
8672
9213
  {
8673
- "name": "market";
8674
- "type": "publicKey";
9214
+ "name": "collateralPriceExponent";
9215
+ "type": "i32";
8675
9216
  "index": false;
8676
9217
  },
8677
9218
  {
8678
- "name": "price";
9219
+ "name": "collateralAmount";
8679
9220
  "type": "u64";
8680
9221
  "index": false;
8681
9222
  },
8682
9223
  {
8683
- "name": "priceExponent";
8684
- "type": "i32";
9224
+ "name": "profitUsd";
9225
+ "type": "u64";
8685
9226
  "index": false;
8686
9227
  },
8687
9228
  {
8688
- "name": "sizeAmount";
9229
+ "name": "lossUsd";
8689
9230
  "type": "u64";
8690
9231
  "index": false;
8691
9232
  },
8692
9233
  {
8693
- "name": "sizeUsd";
9234
+ "name": "feeAmount";
8694
9235
  "type": "u64";
8695
9236
  "index": false;
8696
9237
  },
8697
9238
  {
8698
- "name": "profitUsd";
9239
+ "name": "feeRebateAmount";
8699
9240
  "type": "u64";
8700
9241
  "index": false;
8701
9242
  },
8702
9243
  {
8703
- "name": "lossUsd";
9244
+ "name": "exitFeeAmount";
8704
9245
  "type": "u64";
8705
9246
  "index": false;
8706
9247
  },
8707
9248
  {
8708
- "name": "feeAmount";
9249
+ "name": "oracleAccountTime";
9250
+ "type": "i64";
9251
+ "index": false;
9252
+ },
9253
+ {
9254
+ "name": "oracleAccountType";
9255
+ "type": "u8";
9256
+ "index": false;
9257
+ },
9258
+ {
9259
+ "name": "oracleAccountPrice";
8709
9260
  "type": "u64";
8710
9261
  "index": false;
9262
+ },
9263
+ {
9264
+ "name": "oracleAccountPriceExponent";
9265
+ "type": "i32";
9266
+ "index": false;
8711
9267
  }
8712
9268
  ];
8713
9269
  },
8714
9270
  {
8715
- "name": "ClosePositionLogV3";
9271
+ "name": "CloseAndSwapLog";
8716
9272
  "fields": [
8717
9273
  {
8718
9274
  "name": "owner";
@@ -8800,54 +9356,44 @@ export type Perpetuals = {
8800
9356
  "index": false;
8801
9357
  },
8802
9358
  {
8803
- "name": "oracleAccountTime";
8804
- "type": "i64";
9359
+ "name": "receiveCustodyId";
9360
+ "type": "u64";
8805
9361
  "index": false;
8806
9362
  },
8807
9363
  {
8808
- "name": "oracleAccountType";
8809
- "type": "u8";
9364
+ "name": "receiveAmount";
9365
+ "type": "u64";
8810
9366
  "index": false;
8811
9367
  },
8812
9368
  {
8813
- "name": "oracleAccountPrice";
9369
+ "name": "swapFeeAmount";
8814
9370
  "type": "u64";
8815
9371
  "index": false;
8816
9372
  },
8817
9373
  {
8818
- "name": "oracleAccountPriceExponent";
8819
- "type": "i32";
8820
- "index": false;
8821
- }
8822
- ];
8823
- },
8824
- {
8825
- "name": "CollectStakeRewardLog";
8826
- "fields": [
8827
- {
8828
- "name": "owner";
8829
- "type": "publicKey";
9374
+ "name": "oracleAccountTime";
9375
+ "type": "i64";
8830
9376
  "index": false;
8831
9377
  },
8832
9378
  {
8833
- "name": "poolName";
8834
- "type": "string";
9379
+ "name": "oracleAccountType";
9380
+ "type": "u8";
8835
9381
  "index": false;
8836
9382
  },
8837
9383
  {
8838
- "name": "rewardAmount";
9384
+ "name": "oracleAccountPrice";
8839
9385
  "type": "u64";
8840
9386
  "index": false;
8841
9387
  },
8842
9388
  {
8843
- "name": "rewardMint";
8844
- "type": "publicKey";
9389
+ "name": "oracleAccountPriceExponent";
9390
+ "type": "i32";
8845
9391
  "index": false;
8846
9392
  }
8847
9393
  ];
8848
9394
  },
8849
9395
  {
8850
- "name": "CollectStakeRewardLogV2";
9396
+ "name": "ClosePositionLog";
8851
9397
  "fields": [
8852
9398
  {
8853
9399
  "name": "owner";
@@ -8855,64 +9401,44 @@ export type Perpetuals = {
8855
9401
  "index": false;
8856
9402
  },
8857
9403
  {
8858
- "name": "poolName";
8859
- "type": "string";
8860
- "index": false;
8861
- },
8862
- {
8863
- "name": "rewardAmount";
8864
- "type": "u64";
8865
- "index": false;
8866
- },
8867
- {
8868
- "name": "rewardMint";
9404
+ "name": "market";
8869
9405
  "type": "publicKey";
8870
9406
  "index": false;
8871
9407
  },
8872
9408
  {
8873
- "name": "rewardShare";
9409
+ "name": "priceUsd";
8874
9410
  "type": "u64";
8875
9411
  "index": false;
8876
- }
8877
- ];
8878
- },
8879
- {
8880
- "name": "CompoundingFeesLog";
8881
- "fields": [
8882
- {
8883
- "name": "poolName";
8884
- "type": "string";
8885
- "index": false;
8886
9412
  },
8887
9413
  {
8888
- "name": "rewardAmount";
9414
+ "name": "sizeAmount";
8889
9415
  "type": "u64";
8890
9416
  "index": false;
8891
9417
  },
8892
9418
  {
8893
- "name": "rewardLpAmount";
9419
+ "name": "sizeUsd";
8894
9420
  "type": "u64";
8895
9421
  "index": false;
8896
9422
  },
8897
9423
  {
8898
- "name": "rewardPerLpStaked";
9424
+ "name": "profitUsd";
8899
9425
  "type": "u64";
8900
9426
  "index": false;
8901
9427
  },
8902
9428
  {
8903
- "name": "lpPriceUsd";
9429
+ "name": "lossUsd";
8904
9430
  "type": "u64";
8905
9431
  "index": false;
8906
9432
  },
8907
9433
  {
8908
- "name": "compoundingPriceUsd";
9434
+ "name": "feeAmount";
8909
9435
  "type": "u64";
8910
9436
  "index": false;
8911
9437
  }
8912
9438
  ];
8913
9439
  },
8914
9440
  {
8915
- "name": "DecreaseSizeLog";
9441
+ "name": "ClosePositionLogV2";
8916
9442
  "fields": [
8917
9443
  {
8918
9444
  "name": "owner";
@@ -8925,32 +9451,32 @@ export type Perpetuals = {
8925
9451
  "index": false;
8926
9452
  },
8927
9453
  {
8928
- "name": "priceUsd";
9454
+ "name": "price";
8929
9455
  "type": "u64";
8930
9456
  "index": false;
8931
9457
  },
8932
9458
  {
8933
- "name": "sizeDelta";
8934
- "type": "u64";
9459
+ "name": "priceExponent";
9460
+ "type": "i32";
8935
9461
  "index": false;
8936
9462
  },
8937
9463
  {
8938
- "name": "sizeDeltaUsd";
9464
+ "name": "sizeAmount";
8939
9465
  "type": "u64";
8940
9466
  "index": false;
8941
9467
  },
8942
9468
  {
8943
- "name": "settledReturns";
9469
+ "name": "sizeUsd";
8944
9470
  "type": "u64";
8945
9471
  "index": false;
8946
9472
  },
8947
9473
  {
8948
- "name": "deltaProfitUsd";
9474
+ "name": "profitUsd";
8949
9475
  "type": "u64";
8950
9476
  "index": false;
8951
9477
  },
8952
9478
  {
8953
- "name": "deltaLossUsd";
9479
+ "name": "lossUsd";
8954
9480
  "type": "u64";
8955
9481
  "index": false;
8956
9482
  },
@@ -8962,7 +9488,7 @@ export type Perpetuals = {
8962
9488
  ];
8963
9489
  },
8964
9490
  {
8965
- "name": "DecreaseSizeLogV2";
9491
+ "name": "ClosePositionLogV3";
8966
9492
  "fields": [
8967
9493
  {
8968
9494
  "name": "owner";
@@ -8975,145 +9501,615 @@ export type Perpetuals = {
8975
9501
  "index": false;
8976
9502
  },
8977
9503
  {
8978
- "name": "price";
9504
+ "name": "entryPrice";
8979
9505
  "type": "u64";
8980
9506
  "index": false;
8981
9507
  },
8982
9508
  {
8983
- "name": "priceExponent";
9509
+ "name": "entryPriceExponent";
8984
9510
  "type": "i32";
8985
9511
  "index": false;
8986
9512
  },
8987
9513
  {
8988
- "name": "sizeDelta";
8989
- "type": "u64";
9514
+ "name": "duration";
9515
+ "type": "i64";
8990
9516
  "index": false;
8991
9517
  },
8992
9518
  {
8993
- "name": "sizeDeltaUsd";
9519
+ "name": "exitPrice";
8994
9520
  "type": "u64";
8995
9521
  "index": false;
8996
9522
  },
8997
9523
  {
8998
- "name": "settledReturns";
8999
- "type": "u64";
9524
+ "name": "exitPriceExponent";
9525
+ "type": "i32";
9000
9526
  "index": false;
9001
9527
  },
9002
9528
  {
9003
- "name": "deltaProfitUsd";
9529
+ "name": "sizeAmount";
9004
9530
  "type": "u64";
9005
9531
  "index": false;
9006
9532
  },
9007
9533
  {
9008
- "name": "deltaLossUsd";
9534
+ "name": "sizeUsd";
9009
9535
  "type": "u64";
9010
9536
  "index": false;
9011
9537
  },
9012
9538
  {
9013
- "name": "feeAmount";
9539
+ "name": "collateralPrice";
9014
9540
  "type": "u64";
9015
9541
  "index": false;
9016
- }
9017
- ];
9018
- },
9019
- {
9020
- "name": "DecreaseSizeLogV3";
9021
- "fields": [
9022
- {
9023
- "name": "owner";
9024
- "type": "publicKey";
9025
- "index": false;
9026
9542
  },
9027
9543
  {
9028
- "name": "market";
9029
- "type": "publicKey";
9544
+ "name": "collateralPriceExponent";
9545
+ "type": "i32";
9030
9546
  "index": false;
9031
9547
  },
9032
9548
  {
9033
- "name": "entryPrice";
9549
+ "name": "collateralAmount";
9034
9550
  "type": "u64";
9035
9551
  "index": false;
9036
9552
  },
9037
9553
  {
9038
- "name": "entryPriceExponent";
9039
- "type": "i32";
9554
+ "name": "profitUsd";
9555
+ "type": "u64";
9040
9556
  "index": false;
9041
9557
  },
9042
9558
  {
9043
- "name": "duration";
9044
- "type": "i64";
9559
+ "name": "lossUsd";
9560
+ "type": "u64";
9045
9561
  "index": false;
9046
9562
  },
9047
9563
  {
9048
- "name": "exitPrice";
9564
+ "name": "feeAmount";
9049
9565
  "type": "u64";
9050
9566
  "index": false;
9051
9567
  },
9052
9568
  {
9053
- "name": "exitPriceExponent";
9054
- "type": "i32";
9569
+ "name": "feeRebateAmount";
9570
+ "type": "u64";
9055
9571
  "index": false;
9056
9572
  },
9057
9573
  {
9058
- "name": "deltaSizeAmount";
9574
+ "name": "exitFeeAmount";
9059
9575
  "type": "u64";
9060
9576
  "index": false;
9061
9577
  },
9062
9578
  {
9063
- "name": "deltaSizeUsd";
9064
- "type": "u64";
9579
+ "name": "oracleAccountTime";
9580
+ "type": "i64";
9581
+ "index": false;
9582
+ },
9583
+ {
9584
+ "name": "oracleAccountType";
9585
+ "type": "u8";
9586
+ "index": false;
9587
+ },
9588
+ {
9589
+ "name": "oracleAccountPrice";
9590
+ "type": "u64";
9591
+ "index": false;
9592
+ },
9593
+ {
9594
+ "name": "oracleAccountPriceExponent";
9595
+ "type": "i32";
9596
+ "index": false;
9597
+ }
9598
+ ];
9599
+ },
9600
+ {
9601
+ "name": "CollectStakeRewardLog";
9602
+ "fields": [
9603
+ {
9604
+ "name": "owner";
9605
+ "type": "publicKey";
9606
+ "index": false;
9607
+ },
9608
+ {
9609
+ "name": "poolName";
9610
+ "type": "string";
9611
+ "index": false;
9612
+ },
9613
+ {
9614
+ "name": "rewardAmount";
9615
+ "type": "u64";
9616
+ "index": false;
9617
+ },
9618
+ {
9619
+ "name": "rewardMint";
9620
+ "type": "publicKey";
9621
+ "index": false;
9622
+ }
9623
+ ];
9624
+ },
9625
+ {
9626
+ "name": "CollectStakeRewardLogV2";
9627
+ "fields": [
9628
+ {
9629
+ "name": "owner";
9630
+ "type": "publicKey";
9631
+ "index": false;
9632
+ },
9633
+ {
9634
+ "name": "poolName";
9635
+ "type": "string";
9636
+ "index": false;
9637
+ },
9638
+ {
9639
+ "name": "rewardAmount";
9640
+ "type": "u64";
9641
+ "index": false;
9642
+ },
9643
+ {
9644
+ "name": "rewardMint";
9645
+ "type": "publicKey";
9646
+ "index": false;
9647
+ },
9648
+ {
9649
+ "name": "rewardShare";
9650
+ "type": "u64";
9651
+ "index": false;
9652
+ }
9653
+ ];
9654
+ },
9655
+ {
9656
+ "name": "CompoundingFeesLog";
9657
+ "fields": [
9658
+ {
9659
+ "name": "poolName";
9660
+ "type": "string";
9661
+ "index": false;
9662
+ },
9663
+ {
9664
+ "name": "rewardAmount";
9665
+ "type": "u64";
9666
+ "index": false;
9667
+ },
9668
+ {
9669
+ "name": "rewardLpAmount";
9670
+ "type": "u64";
9671
+ "index": false;
9672
+ },
9673
+ {
9674
+ "name": "rewardPerLpStaked";
9675
+ "type": "u64";
9676
+ "index": false;
9677
+ },
9678
+ {
9679
+ "name": "lpPriceUsd";
9680
+ "type": "u64";
9681
+ "index": false;
9682
+ },
9683
+ {
9684
+ "name": "compoundingPriceUsd";
9685
+ "type": "u64";
9686
+ "index": false;
9687
+ }
9688
+ ];
9689
+ },
9690
+ {
9691
+ "name": "DecreaseSizeLog";
9692
+ "fields": [
9693
+ {
9694
+ "name": "owner";
9695
+ "type": "publicKey";
9696
+ "index": false;
9697
+ },
9698
+ {
9699
+ "name": "market";
9700
+ "type": "publicKey";
9701
+ "index": false;
9702
+ },
9703
+ {
9704
+ "name": "priceUsd";
9705
+ "type": "u64";
9706
+ "index": false;
9707
+ },
9708
+ {
9709
+ "name": "sizeDelta";
9710
+ "type": "u64";
9711
+ "index": false;
9712
+ },
9713
+ {
9714
+ "name": "sizeDeltaUsd";
9715
+ "type": "u64";
9716
+ "index": false;
9717
+ },
9718
+ {
9719
+ "name": "settledReturns";
9720
+ "type": "u64";
9721
+ "index": false;
9722
+ },
9723
+ {
9724
+ "name": "deltaProfitUsd";
9725
+ "type": "u64";
9726
+ "index": false;
9727
+ },
9728
+ {
9729
+ "name": "deltaLossUsd";
9730
+ "type": "u64";
9731
+ "index": false;
9732
+ },
9733
+ {
9734
+ "name": "feeAmount";
9735
+ "type": "u64";
9736
+ "index": false;
9737
+ }
9738
+ ];
9739
+ },
9740
+ {
9741
+ "name": "DecreaseSizeLogV2";
9742
+ "fields": [
9743
+ {
9744
+ "name": "owner";
9745
+ "type": "publicKey";
9746
+ "index": false;
9747
+ },
9748
+ {
9749
+ "name": "market";
9750
+ "type": "publicKey";
9751
+ "index": false;
9752
+ },
9753
+ {
9754
+ "name": "price";
9755
+ "type": "u64";
9756
+ "index": false;
9757
+ },
9758
+ {
9759
+ "name": "priceExponent";
9760
+ "type": "i32";
9761
+ "index": false;
9762
+ },
9763
+ {
9764
+ "name": "sizeDelta";
9765
+ "type": "u64";
9766
+ "index": false;
9767
+ },
9768
+ {
9769
+ "name": "sizeDeltaUsd";
9770
+ "type": "u64";
9771
+ "index": false;
9772
+ },
9773
+ {
9774
+ "name": "settledReturns";
9775
+ "type": "u64";
9776
+ "index": false;
9777
+ },
9778
+ {
9779
+ "name": "deltaProfitUsd";
9780
+ "type": "u64";
9781
+ "index": false;
9782
+ },
9783
+ {
9784
+ "name": "deltaLossUsd";
9785
+ "type": "u64";
9786
+ "index": false;
9787
+ },
9788
+ {
9789
+ "name": "feeAmount";
9790
+ "type": "u64";
9791
+ "index": false;
9792
+ }
9793
+ ];
9794
+ },
9795
+ {
9796
+ "name": "DecreaseSizeLogV3";
9797
+ "fields": [
9798
+ {
9799
+ "name": "owner";
9800
+ "type": "publicKey";
9801
+ "index": false;
9802
+ },
9803
+ {
9804
+ "name": "market";
9805
+ "type": "publicKey";
9806
+ "index": false;
9807
+ },
9808
+ {
9809
+ "name": "entryPrice";
9810
+ "type": "u64";
9811
+ "index": false;
9812
+ },
9813
+ {
9814
+ "name": "entryPriceExponent";
9815
+ "type": "i32";
9816
+ "index": false;
9817
+ },
9818
+ {
9819
+ "name": "duration";
9820
+ "type": "i64";
9821
+ "index": false;
9822
+ },
9823
+ {
9824
+ "name": "exitPrice";
9825
+ "type": "u64";
9826
+ "index": false;
9827
+ },
9828
+ {
9829
+ "name": "exitPriceExponent";
9830
+ "type": "i32";
9831
+ "index": false;
9832
+ },
9833
+ {
9834
+ "name": "deltaSizeAmount";
9835
+ "type": "u64";
9836
+ "index": false;
9837
+ },
9838
+ {
9839
+ "name": "deltaSizeUsd";
9840
+ "type": "u64";
9841
+ "index": false;
9842
+ },
9843
+ {
9844
+ "name": "finalSizeAmount";
9845
+ "type": "u64";
9846
+ "index": false;
9847
+ },
9848
+ {
9849
+ "name": "finalSizeUsd";
9850
+ "type": "u64";
9851
+ "index": false;
9852
+ },
9853
+ {
9854
+ "name": "collateralPrice";
9855
+ "type": "u64";
9856
+ "index": false;
9857
+ },
9858
+ {
9859
+ "name": "collateralPriceExponent";
9860
+ "type": "i32";
9861
+ "index": false;
9862
+ },
9863
+ {
9864
+ "name": "deltaCollateralAmount";
9865
+ "type": "u64";
9866
+ "index": false;
9867
+ },
9868
+ {
9869
+ "name": "profitUsd";
9870
+ "type": "u64";
9871
+ "index": false;
9872
+ },
9873
+ {
9874
+ "name": "lossUsd";
9875
+ "type": "u64";
9876
+ "index": false;
9877
+ },
9878
+ {
9879
+ "name": "feeAmount";
9880
+ "type": "u64";
9881
+ "index": false;
9882
+ },
9883
+ {
9884
+ "name": "feeRebateAmount";
9885
+ "type": "u64";
9886
+ "index": false;
9887
+ },
9888
+ {
9889
+ "name": "exitFeeAmount";
9890
+ "type": "u64";
9891
+ "index": false;
9892
+ },
9893
+ {
9894
+ "name": "oracleAccountTime";
9895
+ "type": "i64";
9896
+ "index": false;
9897
+ },
9898
+ {
9899
+ "name": "oracleAccountType";
9900
+ "type": "u8";
9901
+ "index": false;
9902
+ },
9903
+ {
9904
+ "name": "oracleAccountPrice";
9905
+ "type": "u64";
9906
+ "index": false;
9907
+ },
9908
+ {
9909
+ "name": "oracleAccountPriceExponent";
9910
+ "type": "i32";
9911
+ "index": false;
9912
+ }
9913
+ ];
9914
+ },
9915
+ {
9916
+ "name": "DepositStakeLog";
9917
+ "fields": [
9918
+ {
9919
+ "name": "poolName";
9920
+ "type": "string";
9921
+ "index": false;
9922
+ },
9923
+ {
9924
+ "name": "owner";
9925
+ "type": "publicKey";
9926
+ "index": false;
9927
+ },
9928
+ {
9929
+ "name": "lpTokens";
9930
+ "type": "u64";
9931
+ "index": false;
9932
+ }
9933
+ ];
9934
+ },
9935
+ {
9936
+ "name": "EditLimitOrderLog";
9937
+ "fields": [
9938
+ {
9939
+ "name": "owner";
9940
+ "type": "publicKey";
9941
+ "index": false;
9942
+ },
9943
+ {
9944
+ "name": "market";
9945
+ "type": "publicKey";
9946
+ "index": false;
9947
+ },
9948
+ {
9949
+ "name": "limitPrice";
9950
+ "type": "u64";
9951
+ "index": false;
9952
+ },
9953
+ {
9954
+ "name": "limitPriceExponent";
9955
+ "type": "i32";
9956
+ "index": false;
9957
+ },
9958
+ {
9959
+ "name": "sizeAmount";
9960
+ "type": "u64";
9961
+ "index": false;
9962
+ },
9963
+ {
9964
+ "name": "sizeUsd";
9965
+ "type": "u64";
9966
+ "index": false;
9967
+ },
9968
+ {
9969
+ "name": "reservePrice";
9970
+ "type": "u64";
9971
+ "index": false;
9972
+ },
9973
+ {
9974
+ "name": "reservePriceExponent";
9975
+ "type": "i32";
9976
+ "index": false;
9977
+ },
9978
+ {
9979
+ "name": "reserveAmount";
9980
+ "type": "u64";
9981
+ "index": false;
9982
+ },
9983
+ {
9984
+ "name": "reserveUsd";
9985
+ "type": "u64";
9986
+ "index": false;
9987
+ },
9988
+ {
9989
+ "name": "stopLossPrice";
9990
+ "type": "u64";
9991
+ "index": false;
9992
+ },
9993
+ {
9994
+ "name": "stopLossPriceExponent";
9995
+ "type": "i32";
9065
9996
  "index": false;
9066
9997
  },
9067
9998
  {
9068
- "name": "finalSizeAmount";
9999
+ "name": "takeProfitPrice";
9069
10000
  "type": "u64";
9070
10001
  "index": false;
9071
10002
  },
9072
10003
  {
9073
- "name": "finalSizeUsd";
10004
+ "name": "takeProfitPriceExponent";
10005
+ "type": "i32";
10006
+ "index": false;
10007
+ },
10008
+ {
10009
+ "name": "receiveCustodyId";
10010
+ "type": "u8";
10011
+ "index": false;
10012
+ },
10013
+ {
10014
+ "name": "oracleAccountTime";
10015
+ "type": "i64";
10016
+ "index": false;
10017
+ },
10018
+ {
10019
+ "name": "oracleAccountType";
10020
+ "type": "u8";
10021
+ "index": false;
10022
+ },
10023
+ {
10024
+ "name": "oracleAccountPrice";
9074
10025
  "type": "u64";
9075
10026
  "index": false;
9076
10027
  },
9077
10028
  {
9078
- "name": "collateralPrice";
10029
+ "name": "oracleAccountPriceExponent";
10030
+ "type": "i32";
10031
+ "index": false;
10032
+ }
10033
+ ];
10034
+ },
10035
+ {
10036
+ "name": "CancelLimitOrderLog";
10037
+ "fields": [
10038
+ {
10039
+ "name": "owner";
10040
+ "type": "publicKey";
10041
+ "index": false;
10042
+ },
10043
+ {
10044
+ "name": "market";
10045
+ "type": "publicKey";
10046
+ "index": false;
10047
+ },
10048
+ {
10049
+ "name": "limitPrice";
9079
10050
  "type": "u64";
9080
10051
  "index": false;
9081
10052
  },
9082
10053
  {
9083
- "name": "collateralPriceExponent";
10054
+ "name": "limitPriceExponent";
9084
10055
  "type": "i32";
9085
10056
  "index": false;
9086
10057
  },
9087
10058
  {
9088
- "name": "deltaCollateralAmount";
10059
+ "name": "sizeAmount";
9089
10060
  "type": "u64";
9090
10061
  "index": false;
9091
10062
  },
9092
10063
  {
9093
- "name": "profitUsd";
10064
+ "name": "sizeUsd";
9094
10065
  "type": "u64";
9095
10066
  "index": false;
9096
10067
  },
9097
10068
  {
9098
- "name": "lossUsd";
10069
+ "name": "reservePrice";
9099
10070
  "type": "u64";
9100
10071
  "index": false;
9101
10072
  },
9102
10073
  {
9103
- "name": "feeAmount";
10074
+ "name": "reservePriceExponent";
10075
+ "type": "i32";
10076
+ "index": false;
10077
+ },
10078
+ {
10079
+ "name": "reserveAmount";
9104
10080
  "type": "u64";
9105
10081
  "index": false;
9106
10082
  },
9107
10083
  {
9108
- "name": "feeRebateAmount";
10084
+ "name": "reserveUsd";
9109
10085
  "type": "u64";
9110
10086
  "index": false;
9111
10087
  },
9112
10088
  {
9113
- "name": "exitFeeAmount";
10089
+ "name": "stopLossPrice";
10090
+ "type": "u64";
10091
+ "index": false;
10092
+ },
10093
+ {
10094
+ "name": "stopLossPriceExponent";
10095
+ "type": "i32";
10096
+ "index": false;
10097
+ },
10098
+ {
10099
+ "name": "takeProfitPrice";
9114
10100
  "type": "u64";
9115
10101
  "index": false;
9116
10102
  },
10103
+ {
10104
+ "name": "takeProfitPriceExponent";
10105
+ "type": "i32";
10106
+ "index": false;
10107
+ },
10108
+ {
10109
+ "name": "receiveCustodyId";
10110
+ "type": "u8";
10111
+ "index": false;
10112
+ },
9117
10113
  {
9118
10114
  "name": "oracleAccountTime";
9119
10115
  "type": "i64";
@@ -9137,27 +10133,52 @@ export type Perpetuals = {
9137
10133
  ];
9138
10134
  },
9139
10135
  {
9140
- "name": "DepositStakeLog";
10136
+ "name": "EditTriggerOrderLog";
9141
10137
  "fields": [
9142
10138
  {
9143
- "name": "poolName";
9144
- "type": "string";
10139
+ "name": "owner";
10140
+ "type": "publicKey";
9145
10141
  "index": false;
9146
10142
  },
9147
10143
  {
9148
- "name": "owner";
10144
+ "name": "market";
9149
10145
  "type": "publicKey";
9150
10146
  "index": false;
9151
10147
  },
9152
10148
  {
9153
- "name": "lpTokens";
10149
+ "name": "price";
10150
+ "type": "u64";
10151
+ "index": false;
10152
+ },
10153
+ {
10154
+ "name": "priceExponent";
10155
+ "type": "i32";
10156
+ "index": false;
10157
+ },
10158
+ {
10159
+ "name": "sizeAmount";
10160
+ "type": "u64";
10161
+ "index": false;
10162
+ },
10163
+ {
10164
+ "name": "sizeUsd";
9154
10165
  "type": "u64";
9155
10166
  "index": false;
10167
+ },
10168
+ {
10169
+ "name": "receiveCustodyId";
10170
+ "type": "u8";
10171
+ "index": false;
10172
+ },
10173
+ {
10174
+ "name": "isStopLoss";
10175
+ "type": "bool";
10176
+ "index": false;
9156
10177
  }
9157
10178
  ];
9158
10179
  },
9159
10180
  {
9160
- "name": "EditLimitOrderLog";
10181
+ "name": "ExecuteLimitOrderLog";
9161
10182
  "fields": [
9162
10183
  {
9163
10184
  "name": "owner";
@@ -9170,12 +10191,12 @@ export type Perpetuals = {
9170
10191
  "index": false;
9171
10192
  },
9172
10193
  {
9173
- "name": "limitPrice";
10194
+ "name": "entryPrice";
9174
10195
  "type": "u64";
9175
10196
  "index": false;
9176
10197
  },
9177
10198
  {
9178
- "name": "limitPriceExponent";
10199
+ "name": "entryPriceExponent";
9179
10200
  "type": "i32";
9180
10201
  "index": false;
9181
10202
  },
@@ -9190,48 +10211,133 @@ export type Perpetuals = {
9190
10211
  "index": false;
9191
10212
  },
9192
10213
  {
9193
- "name": "reservePrice";
10214
+ "name": "collateralPrice";
9194
10215
  "type": "u64";
9195
10216
  "index": false;
9196
10217
  },
9197
10218
  {
9198
- "name": "reservePriceExponent";
10219
+ "name": "collateralPriceExponent";
9199
10220
  "type": "i32";
9200
10221
  "index": false;
9201
10222
  },
9202
10223
  {
9203
- "name": "reserveAmount";
10224
+ "name": "collateralAmount";
9204
10225
  "type": "u64";
9205
10226
  "index": false;
9206
10227
  },
9207
10228
  {
9208
- "name": "reserveUsd";
10229
+ "name": "collateralUsd";
9209
10230
  "type": "u64";
9210
10231
  "index": false;
9211
10232
  },
9212
10233
  {
9213
- "name": "stopLossPrice";
10234
+ "name": "feeAmount";
9214
10235
  "type": "u64";
9215
10236
  "index": false;
9216
10237
  },
9217
10238
  {
9218
- "name": "stopLossPriceExponent";
10239
+ "name": "oracleAccountTime";
10240
+ "type": "i64";
10241
+ "index": false;
10242
+ },
10243
+ {
10244
+ "name": "oracleAccountType";
10245
+ "type": "u8";
10246
+ "index": false;
10247
+ },
10248
+ {
10249
+ "name": "oracleAccountPrice";
10250
+ "type": "u64";
10251
+ "index": false;
10252
+ },
10253
+ {
10254
+ "name": "oracleAccountPriceExponent";
9219
10255
  "type": "i32";
9220
10256
  "index": false;
9221
10257
  },
9222
10258
  {
9223
- "name": "takeProfitPrice";
10259
+ "name": "limitPrice";
9224
10260
  "type": "u64";
9225
10261
  "index": false;
9226
10262
  },
9227
10263
  {
9228
- "name": "takeProfitPriceExponent";
10264
+ "name": "limitPriceExponent";
9229
10265
  "type": "i32";
9230
10266
  "index": false;
10267
+ }
10268
+ ];
10269
+ },
10270
+ {
10271
+ "name": "ExecuteLimitWithSwapLog";
10272
+ "fields": [
10273
+ {
10274
+ "name": "owner";
10275
+ "type": "publicKey";
10276
+ "index": false;
9231
10277
  },
9232
10278
  {
9233
- "name": "receiveCustodyId";
9234
- "type": "u8";
10279
+ "name": "market";
10280
+ "type": "publicKey";
10281
+ "index": false;
10282
+ },
10283
+ {
10284
+ "name": "entryPrice";
10285
+ "type": "u64";
10286
+ "index": false;
10287
+ },
10288
+ {
10289
+ "name": "entryPriceExponent";
10290
+ "type": "i32";
10291
+ "index": false;
10292
+ },
10293
+ {
10294
+ "name": "sizeAmount";
10295
+ "type": "u64";
10296
+ "index": false;
10297
+ },
10298
+ {
10299
+ "name": "sizeUsd";
10300
+ "type": "u64";
10301
+ "index": false;
10302
+ },
10303
+ {
10304
+ "name": "collateralPrice";
10305
+ "type": "u64";
10306
+ "index": false;
10307
+ },
10308
+ {
10309
+ "name": "collateralPriceExponent";
10310
+ "type": "i32";
10311
+ "index": false;
10312
+ },
10313
+ {
10314
+ "name": "collateralAmount";
10315
+ "type": "u64";
10316
+ "index": false;
10317
+ },
10318
+ {
10319
+ "name": "collateralUsd";
10320
+ "type": "u64";
10321
+ "index": false;
10322
+ },
10323
+ {
10324
+ "name": "feeAmount";
10325
+ "type": "u64";
10326
+ "index": false;
10327
+ },
10328
+ {
10329
+ "name": "reserveCustodyId";
10330
+ "type": "u64";
10331
+ "index": false;
10332
+ },
10333
+ {
10334
+ "name": "reserveAmount";
10335
+ "type": "u64";
10336
+ "index": false;
10337
+ },
10338
+ {
10339
+ "name": "swapFeeAmount";
10340
+ "type": "u64";
9235
10341
  "index": false;
9236
10342
  },
9237
10343
  {
@@ -9253,11 +10359,21 @@ export type Perpetuals = {
9253
10359
  "name": "oracleAccountPriceExponent";
9254
10360
  "type": "i32";
9255
10361
  "index": false;
10362
+ },
10363
+ {
10364
+ "name": "limitPrice";
10365
+ "type": "u64";
10366
+ "index": false;
10367
+ },
10368
+ {
10369
+ "name": "limitPriceExponent";
10370
+ "type": "i32";
10371
+ "index": false;
9256
10372
  }
9257
10373
  ];
9258
10374
  },
9259
10375
  {
9260
- "name": "CancelLimitOrderLog";
10376
+ "name": "ExecuteTriggerOrderLog";
9261
10377
  "fields": [
9262
10378
  {
9263
10379
  "name": "owner";
@@ -9270,12 +10386,27 @@ export type Perpetuals = {
9270
10386
  "index": false;
9271
10387
  },
9272
10388
  {
9273
- "name": "limitPrice";
10389
+ "name": "entryPrice";
10390
+ "type": "u64";
10391
+ "index": false;
10392
+ },
10393
+ {
10394
+ "name": "entryPriceExponent";
10395
+ "type": "i32";
10396
+ "index": false;
10397
+ },
10398
+ {
10399
+ "name": "duration";
10400
+ "type": "i64";
10401
+ "index": false;
10402
+ },
10403
+ {
10404
+ "name": "exitPrice";
9274
10405
  "type": "u64";
9275
10406
  "index": false;
9276
10407
  },
9277
10408
  {
9278
- "name": "limitPriceExponent";
10409
+ "name": "exitPriceExponent";
9279
10410
  "type": "i32";
9280
10411
  "index": false;
9281
10412
  },
@@ -9290,48 +10421,48 @@ export type Perpetuals = {
9290
10421
  "index": false;
9291
10422
  },
9292
10423
  {
9293
- "name": "reservePrice";
10424
+ "name": "collateralPrice";
9294
10425
  "type": "u64";
9295
10426
  "index": false;
9296
10427
  },
9297
10428
  {
9298
- "name": "reservePriceExponent";
10429
+ "name": "collateralPriceExponent";
9299
10430
  "type": "i32";
9300
10431
  "index": false;
9301
10432
  },
9302
10433
  {
9303
- "name": "reserveAmount";
10434
+ "name": "collateralAmount";
9304
10435
  "type": "u64";
9305
10436
  "index": false;
9306
10437
  },
9307
10438
  {
9308
- "name": "reserveUsd";
10439
+ "name": "profitUsd";
9309
10440
  "type": "u64";
9310
10441
  "index": false;
9311
10442
  },
9312
10443
  {
9313
- "name": "stopLossPrice";
10444
+ "name": "lossUsd";
9314
10445
  "type": "u64";
9315
10446
  "index": false;
9316
10447
  },
9317
10448
  {
9318
- "name": "stopLossPriceExponent";
9319
- "type": "i32";
10449
+ "name": "feeAmount";
10450
+ "type": "u64";
9320
10451
  "index": false;
9321
10452
  },
9322
10453
  {
9323
- "name": "takeProfitPrice";
10454
+ "name": "feeRebateAmount";
9324
10455
  "type": "u64";
9325
10456
  "index": false;
9326
10457
  },
9327
10458
  {
9328
- "name": "takeProfitPriceExponent";
9329
- "type": "i32";
10459
+ "name": "exitFeeAmount";
10460
+ "type": "u64";
9330
10461
  "index": false;
9331
10462
  },
9332
10463
  {
9333
- "name": "receiveCustodyId";
9334
- "type": "u8";
10464
+ "name": "isStopLoss";
10465
+ "type": "bool";
9335
10466
  "index": false;
9336
10467
  },
9337
10468
  {
@@ -9353,11 +10484,21 @@ export type Perpetuals = {
9353
10484
  "name": "oracleAccountPriceExponent";
9354
10485
  "type": "i32";
9355
10486
  "index": false;
10487
+ },
10488
+ {
10489
+ "name": "triggerPrice";
10490
+ "type": "u64";
10491
+ "index": false;
10492
+ },
10493
+ {
10494
+ "name": "triggerPriceExponent";
10495
+ "type": "i32";
10496
+ "index": false;
9356
10497
  }
9357
10498
  ];
9358
10499
  },
9359
10500
  {
9360
- "name": "EditTriggerOrderLog";
10501
+ "name": "ExecuteTriggerOrderLog";
9361
10502
  "fields": [
9362
10503
  {
9363
10504
  "name": "owner";
@@ -9370,93 +10511,83 @@ export type Perpetuals = {
9370
10511
  "index": false;
9371
10512
  },
9372
10513
  {
9373
- "name": "price";
10514
+ "name": "entryPrice";
9374
10515
  "type": "u64";
9375
10516
  "index": false;
9376
10517
  },
9377
10518
  {
9378
- "name": "priceExponent";
10519
+ "name": "entryPriceExponent";
9379
10520
  "type": "i32";
9380
10521
  "index": false;
9381
10522
  },
9382
10523
  {
9383
- "name": "sizeAmount";
9384
- "type": "u64";
10524
+ "name": "duration";
10525
+ "type": "i64";
9385
10526
  "index": false;
9386
10527
  },
9387
10528
  {
9388
- "name": "sizeUsd";
10529
+ "name": "exitPrice";
9389
10530
  "type": "u64";
9390
10531
  "index": false;
9391
10532
  },
9392
10533
  {
9393
- "name": "receiveCustodyId";
9394
- "type": "u8";
10534
+ "name": "exitPriceExponent";
10535
+ "type": "i32";
9395
10536
  "index": false;
9396
10537
  },
9397
10538
  {
9398
- "name": "isStopLoss";
9399
- "type": "bool";
9400
- "index": false;
9401
- }
9402
- ];
9403
- },
9404
- {
9405
- "name": "ExecuteLimitOrderLog";
9406
- "fields": [
9407
- {
9408
- "name": "owner";
9409
- "type": "publicKey";
10539
+ "name": "sizeAmount";
10540
+ "type": "u64";
9410
10541
  "index": false;
9411
10542
  },
9412
10543
  {
9413
- "name": "market";
9414
- "type": "publicKey";
10544
+ "name": "sizeUsd";
10545
+ "type": "u64";
9415
10546
  "index": false;
9416
10547
  },
9417
10548
  {
9418
- "name": "entryPrice";
10549
+ "name": "collateralPrice";
9419
10550
  "type": "u64";
9420
10551
  "index": false;
9421
10552
  },
9422
10553
  {
9423
- "name": "entryPriceExponent";
10554
+ "name": "collateralPriceExponent";
9424
10555
  "type": "i32";
9425
10556
  "index": false;
9426
10557
  },
9427
10558
  {
9428
- "name": "sizeAmount";
10559
+ "name": "collateralAmount";
9429
10560
  "type": "u64";
9430
10561
  "index": false;
9431
10562
  },
9432
10563
  {
9433
- "name": "sizeUsd";
10564
+ "name": "profitUsd";
9434
10565
  "type": "u64";
9435
10566
  "index": false;
9436
10567
  },
9437
10568
  {
9438
- "name": "collateralPrice";
10569
+ "name": "lossUsd";
9439
10570
  "type": "u64";
9440
10571
  "index": false;
9441
10572
  },
9442
10573
  {
9443
- "name": "collateralPriceExponent";
9444
- "type": "i32";
10574
+ "name": "feeAmount";
10575
+ "type": "u64";
9445
10576
  "index": false;
9446
10577
  },
9447
10578
  {
9448
- "name": "collateralAmount";
10579
+ "name": "feeRebateAmount";
9449
10580
  "type": "u64";
9450
10581
  "index": false;
9451
10582
  },
9452
10583
  {
9453
- "name": "collateralUsd";
10584
+ "name": "exitFeeAmount";
9454
10585
  "type": "u64";
9455
10586
  "index": false;
9456
10587
  },
9457
10588
  {
9458
- "name": "feeAmount";
9459
- "type": "u64";
10589
+ "name": "isStopLoss";
10590
+ "type": "bool";
9460
10591
  "index": false;
9461
10592
  },
9462
10593
  {
@@ -9480,19 +10611,19 @@ export type Perpetuals = {
9480
10611
  "index": false;
9481
10612
  },
9482
10613
  {
9483
- "name": "limitPrice";
10614
+ "name": "triggerPrice";
9484
10615
  "type": "u64";
9485
10616
  "index": false;
9486
10617
  },
9487
10618
  {
9488
- "name": "limitPriceExponent";
10619
+ "name": "triggerPriceExponent";
9489
10620
  "type": "i32";
9490
10621
  "index": false;
9491
10622
  }
9492
10623
  ];
9493
10624
  },
9494
10625
  {
9495
- "name": "ExecuteTriggerOrderLog";
10626
+ "name": "ExecuteTriggerWithSwapLog";
9496
10627
  "fields": [
9497
10628
  {
9498
10629
  "name": "owner";
@@ -9584,6 +10715,21 @@ export type Perpetuals = {
9584
10715
  "type": "bool";
9585
10716
  "index": false;
9586
10717
  },
10718
+ {
10719
+ "name": "receiveCustodyId";
10720
+ "type": "u64";
10721
+ "index": false;
10722
+ },
10723
+ {
10724
+ "name": "receiveAmount";
10725
+ "type": "u64";
10726
+ "index": false;
10727
+ },
10728
+ {
10729
+ "name": "swapFeeAmount";
10730
+ "type": "u64";
10731
+ "index": false;
10732
+ },
9587
10733
  {
9588
10734
  "name": "oracleAccountTime";
9589
10735
  "type": "i64";
@@ -10921,6 +12067,166 @@ export type Perpetuals = {
10921
12067
  }
10922
12068
  ];
10923
12069
  },
12070
+ {
12071
+ "name": "SwapAndOpenLog";
12072
+ "fields": [
12073
+ {
12074
+ "name": "poolName";
12075
+ "type": "string";
12076
+ "index": false;
12077
+ },
12078
+ {
12079
+ "name": "owner";
12080
+ "type": "publicKey";
12081
+ "index": false;
12082
+ },
12083
+ {
12084
+ "name": "receivingCustodyId";
12085
+ "type": "u64";
12086
+ "index": false;
12087
+ },
12088
+ {
12089
+ "name": "collateralCustodyId";
12090
+ "type": "u64";
12091
+ "index": false;
12092
+ },
12093
+ {
12094
+ "name": "targetCustodyId";
12095
+ "type": "u64";
12096
+ "index": false;
12097
+ },
12098
+ {
12099
+ "name": "amountIn";
12100
+ "type": "u64";
12101
+ "index": false;
12102
+ },
12103
+ {
12104
+ "name": "swapAmountOut";
12105
+ "type": "u64";
12106
+ "index": false;
12107
+ },
12108
+ {
12109
+ "name": "swapFeeAmount";
12110
+ "type": "u64";
12111
+ "index": false;
12112
+ },
12113
+ {
12114
+ "name": "market";
12115
+ "type": "publicKey";
12116
+ "index": false;
12117
+ },
12118
+ {
12119
+ "name": "entryPrice";
12120
+ "type": "u64";
12121
+ "index": false;
12122
+ },
12123
+ {
12124
+ "name": "entryPriceExponent";
12125
+ "type": "i32";
12126
+ "index": false;
12127
+ },
12128
+ {
12129
+ "name": "sizeAmount";
12130
+ "type": "u64";
12131
+ "index": false;
12132
+ },
12133
+ {
12134
+ "name": "sizeUsd";
12135
+ "type": "u64";
12136
+ "index": false;
12137
+ },
12138
+ {
12139
+ "name": "collateralPrice";
12140
+ "type": "u64";
12141
+ "index": false;
12142
+ },
12143
+ {
12144
+ "name": "collateralPriceExponent";
12145
+ "type": "i32";
12146
+ "index": false;
12147
+ },
12148
+ {
12149
+ "name": "collateralAmount";
12150
+ "type": "u64";
12151
+ "index": false;
12152
+ },
12153
+ {
12154
+ "name": "collateralUsd";
12155
+ "type": "u64";
12156
+ "index": false;
12157
+ },
12158
+ {
12159
+ "name": "positionFeeAmount";
12160
+ "type": "u64";
12161
+ "index": false;
12162
+ },
12163
+ {
12164
+ "name": "feeRebateAmount";
12165
+ "type": "u64";
12166
+ "index": false;
12167
+ },
12168
+ {
12169
+ "name": "receivingOracleAccountTime";
12170
+ "type": "i64";
12171
+ "index": false;
12172
+ },
12173
+ {
12174
+ "name": "receivingOracleAccountType";
12175
+ "type": "u8";
12176
+ "index": false;
12177
+ },
12178
+ {
12179
+ "name": "receivingOracleAccountPrice";
12180
+ "type": "u64";
12181
+ "index": false;
12182
+ },
12183
+ {
12184
+ "name": "receivingOracleAccountPriceExponent";
12185
+ "type": "i32";
12186
+ "index": false;
12187
+ },
12188
+ {
12189
+ "name": "collateralOracleAccountTime";
12190
+ "type": "i64";
12191
+ "index": false;
12192
+ },
12193
+ {
12194
+ "name": "collateralOracleAccountType";
12195
+ "type": "u8";
12196
+ "index": false;
12197
+ },
12198
+ {
12199
+ "name": "collateralOracleAccountPrice";
12200
+ "type": "u64";
12201
+ "index": false;
12202
+ },
12203
+ {
12204
+ "name": "collateralOracleAccountPriceExponent";
12205
+ "type": "i32";
12206
+ "index": false;
12207
+ },
12208
+ {
12209
+ "name": "targetOracleAccountTime";
12210
+ "type": "i64";
12211
+ "index": false;
12212
+ },
12213
+ {
12214
+ "name": "targetOracleAccountType";
12215
+ "type": "u8";
12216
+ "index": false;
12217
+ },
12218
+ {
12219
+ "name": "targetOracleAccountPrice";
12220
+ "type": "u64";
12221
+ "index": false;
12222
+ },
12223
+ {
12224
+ "name": "targetOracleAccountPriceExponent";
12225
+ "type": "i32";
12226
+ "index": false;
12227
+ }
12228
+ ];
12229
+ },
10924
12230
  {
10925
12231
  "name": "SwapFeeInternalLog";
10926
12232
  "fields": [
@@ -11291,7 +12597,7 @@ export type Perpetuals = {
11291
12597
  {
11292
12598
  "code": 6012;
11293
12599
  "name": "InvalidMarketState";
11294
- "msg": "Invalid custody state";
12600
+ "msg": "Invalid Market state";
11295
12601
  },
11296
12602
  {
11297
12603
  "code": 6013;