|
652 | 652 | } |
653 | 653 | ] |
654 | 654 | }, |
655 | | - { |
656 | | - "name": "depositIntoIsolatedPerpPosition", |
657 | | - "accounts": [ |
658 | | - { |
659 | | - "name": "state", |
660 | | - "isMut": false, |
661 | | - "isSigner": false |
662 | | - }, |
663 | | - { |
664 | | - "name": "user", |
665 | | - "isMut": true, |
666 | | - "isSigner": false |
667 | | - }, |
668 | | - { |
669 | | - "name": "userStats", |
670 | | - "isMut": true, |
671 | | - "isSigner": false |
672 | | - }, |
673 | | - { |
674 | | - "name": "authority", |
675 | | - "isMut": false, |
676 | | - "isSigner": true |
677 | | - }, |
678 | | - { |
679 | | - "name": "spotMarketVault", |
680 | | - "isMut": true, |
681 | | - "isSigner": false |
682 | | - }, |
683 | | - { |
684 | | - "name": "userTokenAccount", |
685 | | - "isMut": true, |
686 | | - "isSigner": false |
687 | | - }, |
688 | | - { |
689 | | - "name": "tokenProgram", |
690 | | - "isMut": false, |
691 | | - "isSigner": false |
692 | | - } |
693 | | - ], |
694 | | - "args": [ |
695 | | - { |
696 | | - "name": "spotMarketIndex", |
697 | | - "type": "u16" |
698 | | - }, |
699 | | - { |
700 | | - "name": "perpMarketIndex", |
701 | | - "type": "u16" |
702 | | - }, |
703 | | - { |
704 | | - "name": "amount", |
705 | | - "type": "u64" |
706 | | - } |
707 | | - ] |
708 | | - }, |
709 | | - { |
710 | | - "name": "transferIsolatedPerpPositionDeposit", |
711 | | - "accounts": [ |
712 | | - { |
713 | | - "name": "user", |
714 | | - "isMut": true, |
715 | | - "isSigner": false |
716 | | - }, |
717 | | - { |
718 | | - "name": "userStats", |
719 | | - "isMut": true, |
720 | | - "isSigner": false |
721 | | - }, |
722 | | - { |
723 | | - "name": "authority", |
724 | | - "isMut": false, |
725 | | - "isSigner": true |
726 | | - }, |
727 | | - { |
728 | | - "name": "state", |
729 | | - "isMut": false, |
730 | | - "isSigner": false |
731 | | - }, |
732 | | - { |
733 | | - "name": "spotMarketVault", |
734 | | - "isMut": false, |
735 | | - "isSigner": false |
736 | | - } |
737 | | - ], |
738 | | - "args": [ |
739 | | - { |
740 | | - "name": "spotMarketIndex", |
741 | | - "type": "u16" |
742 | | - }, |
743 | | - { |
744 | | - "name": "perpMarketIndex", |
745 | | - "type": "u16" |
746 | | - }, |
747 | | - { |
748 | | - "name": "amount", |
749 | | - "type": "i64" |
750 | | - } |
751 | | - ] |
752 | | - }, |
753 | | - { |
754 | | - "name": "withdrawFromIsolatedPerpPosition", |
755 | | - "accounts": [ |
756 | | - { |
757 | | - "name": "state", |
758 | | - "isMut": false, |
759 | | - "isSigner": false |
760 | | - }, |
761 | | - { |
762 | | - "name": "user", |
763 | | - "isMut": true, |
764 | | - "isSigner": false |
765 | | - }, |
766 | | - { |
767 | | - "name": "userStats", |
768 | | - "isMut": true, |
769 | | - "isSigner": false |
770 | | - }, |
771 | | - { |
772 | | - "name": "authority", |
773 | | - "isMut": false, |
774 | | - "isSigner": true |
775 | | - }, |
776 | | - { |
777 | | - "name": "spotMarketVault", |
778 | | - "isMut": true, |
779 | | - "isSigner": false |
780 | | - }, |
781 | | - { |
782 | | - "name": "driftSigner", |
783 | | - "isMut": false, |
784 | | - "isSigner": false |
785 | | - }, |
786 | | - { |
787 | | - "name": "userTokenAccount", |
788 | | - "isMut": true, |
789 | | - "isSigner": false |
790 | | - }, |
791 | | - { |
792 | | - "name": "tokenProgram", |
793 | | - "isMut": false, |
794 | | - "isSigner": false |
795 | | - } |
796 | | - ], |
797 | | - "args": [ |
798 | | - { |
799 | | - "name": "spotMarketIndex", |
800 | | - "type": "u16" |
801 | | - }, |
802 | | - { |
803 | | - "name": "perpMarketIndex", |
804 | | - "type": "u16" |
805 | | - }, |
806 | | - { |
807 | | - "name": "amount", |
808 | | - "type": "u64" |
809 | | - } |
810 | | - ] |
811 | | - }, |
812 | 655 | { |
813 | 656 | "name": "placePerpOrder", |
814 | 657 | "accounts": [ |
@@ -12032,13 +11875,13 @@ |
12032 | 11875 | "type": "u64" |
12033 | 11876 | }, |
12034 | 11877 | { |
12035 | | - "name": "isolatedPositionScaledBalance", |
| 11878 | + "name": "lastBaseAssetAmountPerLp", |
12036 | 11879 | "docs": [ |
12037 | 11880 | "The last base asset amount per lp the amm had", |
12038 | 11881 | "Used to settle the users lp position", |
12039 | | - "precision: SPOT_BALANCE_PRECISION" |
| 11882 | + "precision: BASE_PRECISION" |
12040 | 11883 | ], |
12041 | | - "type": "u64" |
| 11884 | + "type": "i64" |
12042 | 11885 | }, |
12043 | 11886 | { |
12044 | 11887 | "name": "lastQuoteAssetAmountPerLp", |
|
12077 | 11920 | "type": "u8" |
12078 | 11921 | }, |
12079 | 11922 | { |
12080 | | - "name": "positionFlag", |
12081 | | - "type": "u8" |
| 11923 | + "name": "perLpBase", |
| 11924 | + "type": "i8" |
12082 | 11925 | } |
12083 | 11926 | ] |
12084 | 11927 | } |
|
12729 | 12572 | ] |
12730 | 12573 | } |
12731 | 12574 | }, |
12732 | | - { |
12733 | | - "name": "LiquidationBitFlag", |
12734 | | - "type": { |
12735 | | - "kind": "enum", |
12736 | | - "variants": [ |
12737 | | - { |
12738 | | - "name": "IsolatedPosition" |
12739 | | - } |
12740 | | - ] |
12741 | | - } |
12742 | | - }, |
12743 | 12575 | { |
12744 | 12576 | "name": "SettlePnlExplanation", |
12745 | 12577 | "type": { |
|
12855 | 12687 | "kind": "enum", |
12856 | 12688 | "variants": [ |
12857 | 12689 | { |
12858 | | - "name": "Standard" |
| 12690 | + "name": "Standard", |
| 12691 | + "fields": [ |
| 12692 | + { |
| 12693 | + "name": "trackOpenOrdersFraction", |
| 12694 | + "type": "bool" |
| 12695 | + } |
| 12696 | + ] |
12859 | 12697 | }, |
12860 | 12698 | { |
12861 | 12699 | "name": "Liquidation", |
|
13429 | 13267 | ] |
13430 | 13268 | } |
13431 | 13269 | }, |
13432 | | - { |
13433 | | - "name": "PositionFlag", |
13434 | | - "type": { |
13435 | | - "kind": "enum", |
13436 | | - "variants": [ |
13437 | | - { |
13438 | | - "name": "IsolatedPosition" |
13439 | | - }, |
13440 | | - { |
13441 | | - "name": "BeingLiquidated" |
13442 | | - }, |
13443 | | - { |
13444 | | - "name": "Bankrupt" |
13445 | | - } |
13446 | | - ] |
13447 | | - } |
13448 | | - }, |
13449 | 13270 | { |
13450 | 13271 | "name": "ReferrerStatus", |
13451 | 13272 | "type": { |
|
14410 | 14231 | "defined": "SpotBankruptcyRecord" |
14411 | 14232 | }, |
14412 | 14233 | "index": false |
14413 | | - }, |
14414 | | - { |
14415 | | - "name": "bitFlags", |
14416 | | - "type": "u8", |
14417 | | - "index": false |
14418 | 14234 | } |
14419 | 14235 | ] |
14420 | 14236 | }, |
|
15851 | 15667 | }, |
15852 | 15668 | { |
15853 | 15669 | "code": 6094, |
15854 | | - "name": "CantUpdateSpotBalanceType", |
15855 | | - "msg": "CantUpdateSpotBalanceType" |
| 15670 | + "name": "CantUpdatePoolBalanceType", |
| 15671 | + "msg": "CantUpdatePoolBalanceType" |
15856 | 15672 | }, |
15857 | 15673 | { |
15858 | 15674 | "code": 6095, |
@@ -16966,46 +16782,41 @@ |
16966 | 16782 | }, |
16967 | 16783 | { |
16968 | 16784 | "code": 6317, |
16969 | | - "name": "InvalidIsolatedPerpMarket", |
16970 | | - "msg": "Invalid Isolated Perp Market" |
16971 | | - }, |
16972 | | - { |
16973 | | - "code": 6318, |
16974 | 16785 | "name": "InvalidRevenueShareResize", |
16975 | 16786 | "msg": "Invalid RevenueShare resize" |
16976 | 16787 | }, |
16977 | 16788 | { |
16978 | | - "code": 6319, |
| 16789 | + "code": 6318, |
16979 | 16790 | "name": "BuilderRevoked", |
16980 | 16791 | "msg": "Builder has been revoked" |
16981 | 16792 | }, |
16982 | 16793 | { |
16983 | | - "code": 6320, |
| 16794 | + "code": 6319, |
16984 | 16795 | "name": "InvalidBuilderFee", |
16985 | 16796 | "msg": "Builder fee is greater than max fee bps" |
16986 | 16797 | }, |
16987 | 16798 | { |
16988 | | - "code": 6321, |
| 16799 | + "code": 6320, |
16989 | 16800 | "name": "RevenueShareEscrowAuthorityMismatch", |
16990 | 16801 | "msg": "RevenueShareEscrow authority mismatch" |
16991 | 16802 | }, |
16992 | 16803 | { |
16993 | | - "code": 6322, |
| 16804 | + "code": 6321, |
16994 | 16805 | "name": "RevenueShareEscrowOrdersAccountFull", |
16995 | 16806 | "msg": "RevenueShareEscrow has too many active orders" |
16996 | 16807 | }, |
16997 | 16808 | { |
16998 | | - "code": 6323, |
| 16809 | + "code": 6322, |
16999 | 16810 | "name": "InvalidRevenueShareAccount", |
17000 | 16811 | "msg": "Invalid RevenueShareAccount" |
17001 | 16812 | }, |
17002 | 16813 | { |
17003 | | - "code": 6324, |
| 16814 | + "code": 6323, |
17004 | 16815 | "name": "CannotRevokeBuilderWithOpenOrders", |
17005 | 16816 | "msg": "Cannot revoke builder with open orders" |
17006 | 16817 | }, |
17007 | 16818 | { |
17008 | | - "code": 6325, |
| 16819 | + "code": 6324, |
17009 | 16820 | "name": "UnableToLoadRevenueShareAccount", |
17010 | 16821 | "msg": "Unable to load builder account" |
17011 | 16822 | } |
|
0 commit comments