@drift-labs/sdk 0.2.0-master.25 → 0.2.0-master.27

package/src/idl/clearing_house.json

@@ -54,20 +54,20 @@
       ]
     },
     {
-      "name": "initializeBank",
+      "name": "initializeSpotMarket",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "bankMint",
+          "name": "spotMarketMint",
           "isMut": false,
           "isSigner": false
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -157,6 +157,72 @@
         }
       ]
     },
+    {
+      "name": "initializeSerumFulfillmentConfig",
+      "accounts": [
+        {
+          "name": "baseSpotMarket",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "quoteSpotMarket",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "serumProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "serumMarket",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "serumOpenOrders",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "clearingHouseSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "serumFulfillmentConfig",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "initializeMarket",
       "accounts": [
@@ -252,7 +318,7 @@
           "isSigner": true
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -269,7 +335,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         },
         {
@@ -306,7 +372,7 @@
           "isSigner": true
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -328,7 +394,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         },
         {
@@ -372,7 +438,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         },
         {
@@ -382,16 +448,32 @@
       ]
     },
     {
-      "name": "updateBankCumulativeInterest",
+      "name": "updateSpotMarketCumulativeInterest",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
       ],
       "args": []
     },
+    {
+      "name": "updateSpotMarketExpiry",
+      "accounts": [
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "expiryTs",
+          "type": "i64"
+        }
+      ]
+    },
     {
       "name": "settleLp",
       "accounts": [
@@ -721,6 +803,122 @@
         }
       ]
     },
+    {
+      "name": "triggerSpotOrder",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "orderId",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "placeSpotOrder",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "OrderParams"
+          }
+        }
+      ]
+    },
+    {
+      "name": "fillSpotOrder",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "fillerStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "orderId",
+          "type": {
+            "option": "u64"
+          }
+        },
+        {
+          "name": "fulfillmentType",
+          "type": {
+            "option": {
+              "defined": "SpotFulfillmentType"
+            }
+          }
+        },
+        {
+          "name": "makerOrderId",
+          "type": {
+            "option": "u64"
+          }
+        }
+      ]
+    },
     {
       "name": "updateAmms",
       "accounts": [
@@ -773,6 +971,53 @@
         }
       ]
     },
+    {
+      "name": "settleExpiredMarket",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "settleExpiredPosition",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "liquidatePerp",
       "accounts": [
@@ -844,11 +1089,11 @@
       ],
       "args": [
         {
-          "name": "assetBankIndex",
+          "name": "assetMarketIndex",
           "type": "u64"
         },
         {
-          "name": "liabilityBankIndex",
+          "name": "liabilityMarketIndex",
           "type": "u64"
         },
         {
@@ -887,7 +1132,7 @@
           "type": "u64"
         },
         {
-          "name": "liabilityBankIndex",
+          "name": "spotMarketIndex",
           "type": "u64"
         },
         {
@@ -926,7 +1171,7 @@
           "type": "u64"
         },
         {
-          "name": "assetBankIndex",
+          "name": "spotMarketIndex",
           "type": "u64"
         },
         {
@@ -936,7 +1181,7 @@
       ]
     },
     {
-      "name": "resolvePerpBankruptcy",
+      "name": "resolvePerpPnlDeficit",
       "accounts": [
         {
           "name": "state",
@@ -949,17 +1194,7 @@
           "isSigner": true
         },
         {
-          "name": "liquidator",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "user",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -981,17 +1216,17 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "spotMarketIndex",
           "type": "u64"
         },
         {
-          "name": "marketIndex",
+          "name": "perpMarketIndex",
           "type": "u64"
         }
       ]
     },
     {
-      "name": "resolveBorrowBankruptcy",
+      "name": "resolvePerpBankruptcy",
       "accounts": [
         {
           "name": "state",
@@ -1014,7 +1249,7 @@
           "isSigner": false
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -1036,13 +1271,17 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "quoteSpotMarketIndex",
+          "type": "u64"
+        },
+        {
+          "name": "marketIndex",
           "type": "u64"
         }
       ]
     },
     {
-      "name": "moveAmmPrice",
+      "name": "resolveBorrowBankruptcy",
       "accounts": [
         {
           "name": "state",
@@ -1050,15 +1289,66 @@
           "isSigner": false
         },
         {
-          "name": "admin",
+          "name": "authority",
           "isMut": false,
           "isSigner": true
         },
         {
-          "name": "market",
+          "name": "liquidator",
           "isMut": true,
           "isSigner": false
-        }
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "insuranceFundVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "clearingHouseSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "moveAmmPrice",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
       ],
       "args": [
         {
@@ -1068,9 +1358,85 @@
         {
           "name": "quoteAssetReserve",
           "type": "u128"
+        },
+        {
+          "name": "sqrtK",
+          "type": "u128"
+        }
+      ]
+    },
+    {
+      "name": "updateMarketExpiry",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "expiryTs",
+          "type": "i64"
         }
       ]
     },
+    {
+      "name": "settleExpiredMarketPoolsToRevenuePool",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "clearingHouseSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "recipient",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "withdrawFromMarketToInsuranceVault",
       "accounts": [
@@ -1085,12 +1451,12 @@
           "isSigner": true
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -1100,7 +1466,7 @@
           "isSigner": false
         },
         {
-          "name": "market",
+          "name": "perpMarket",
           "isMut": true,
           "isSigner": false
         },
@@ -1192,12 +1558,12 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "quoteSpotMarket",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -1388,6 +1754,61 @@
       ],
       "args": []
     },
+    {
+      "name": "updateUserName",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "userId",
+          "type": "u8"
+        },
+        {
+          "name": "name",
+          "type": {
+            "array": [
+              "u8",
+              32
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "name": "updateUserCustomMarginRatio",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "userId",
+          "type": "u8"
+        },
+        {
+          "name": "marginRatio",
+          "type": "u32"
+        }
+      ]
+    },
     {
       "name": "settleFundingPayment",
       "accounts": [
@@ -1492,7 +1913,7 @@
       ]
     },
     {
-      "name": "updateMarketMaxRevenueWithdrawPerPeriod",
+      "name": "updateMarketMaxImbalances",
       "accounts": [
         {
           "name": "admin",
@@ -1511,9 +1932,17 @@
         }
       ],
       "args": [
+        {
+          "name": "unrealizedMaxImbalance",
+          "type": "u128"
+        },
         {
           "name": "maxRevenueWithdrawPerPeriod",
           "type": "u128"
+        },
+        {
+          "name": "quoteMaxInsurance",
+          "type": "u128"
         }
       ]
     },
@@ -1538,13 +1967,17 @@
       ],
       "args": [
         {
-          "name": "liquidationFee",
+          "name": "liquidatorFee",
+          "type": "u128"
+        },
+        {
+          "name": "ifLiquidationFee",
           "type": "u128"
         }
       ]
     },
     {
-      "name": "updateBankInsuranceWithdrawEscrowPeriod",
+      "name": "updateInsuranceWithdrawEscrowPeriod",
       "accounts": [
         {
           "name": "admin",
@@ -1557,7 +1990,7 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
@@ -1570,7 +2003,7 @@
       ]
     },
     {
-      "name": "updateBankLiquidationFee",
+      "name": "updateSpotMarketLiquidationFee",
       "accounts": [
         {
           "name": "admin",
@@ -1583,20 +2016,24 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
       ],
       "args": [
         {
-          "name": "liquidationFee",
+          "name": "liquidatorFee",
+          "type": "u128"
+        },
+        {
+          "name": "ifLiquidationFee",
           "type": "u128"
         }
       ]
     },
     {
-      "name": "updateBankWithdrawGuardThreshold",
+      "name": "updateWithdrawGuardThreshold",
       "accounts": [
         {
           "name": "admin",
@@ -1609,7 +2046,7 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
@@ -1622,7 +2059,7 @@
       ]
     },
     {
-      "name": "updateBankIfFactor",
+      "name": "updateSpotMarketIfFactor",
       "accounts": [
         {
           "name": "admin",
@@ -1635,14 +2072,14 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "spotMarketIndex",
           "type": "u64"
         },
         {
@@ -1652,15 +2089,11 @@
         {
           "name": "totalIfFactor",
           "type": "u32"
-        },
-        {
-          "name": "liquidationIfFactor",
-          "type": "u32"
         }
       ]
     },
     {
-      "name": "updateBankRevenueSettlePeriod",
+      "name": "updateSpotMarketRevenueSettlePeriod",
       "accounts": [
         {
           "name": "admin",
@@ -1673,7 +2106,7 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": true,
           "isSigner": false
         }
@@ -1733,16 +2166,16 @@
       "args": [
         {
           "name": "unrealizedInitialAssetWeight",
-          "type": "u8"
+          "type": "u32"
         },
         {
           "name": "unrealizedMaintenanceAssetWeight",
-          "type": "u8"
+          "type": "u32"
         }
       ]
     },
     {
-      "name": "updateCurveUpdateIntensity",
+      "name": "updateConcentrationCoef",
       "accounts": [
         {
           "name": "admin",
@@ -1762,13 +2195,13 @@
       ],
       "args": [
         {
-          "name": "curveUpdateIntensity",
-          "type": "u8"
+          "name": "concentrationScale",
+          "type": "u128"
         }
       ]
     },
     {
-      "name": "updateLpCooldownTime",
+      "name": "updateCurveUpdateIntensity",
       "accounts": [
         {
           "name": "admin",
@@ -1788,13 +2221,13 @@
       ],
       "args": [
         {
-          "name": "lpCooldownTime",
-          "type": "i64"
+          "name": "curveUpdateIntensity",
+          "type": "u8"
         }
       ]
     },
     {
-      "name": "updatePartialLiquidationClosePercentage",
+      "name": "updateLpCooldownTime",
       "accounts": [
         {
           "name": "admin",
@@ -1803,23 +2236,24 @@
         },
         {
           "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "market",
           "isMut": true,
           "isSigner": false
         }
       ],
       "args": [
         {
-          "name": "numerator",
-          "type": "u128"
-        },
-        {
-          "name": "denominator",
-          "type": "u128"
+          "name": "lpCooldownTime",
+          "type": "i64"
         }
       ]
     },
     {
-      "name": "updatePartialLiquidationPenaltyPercentage",
+      "name": "updateFee",
       "accounts": [
         {
           "name": "admin",
@@ -1834,17 +2268,15 @@
       ],
       "args": [
         {
-          "name": "numerator",
-          "type": "u128"
-        },
-        {
-          "name": "denominator",
-          "type": "u128"
+          "name": "fees",
+          "type": {
+            "defined": "FeeStructure"
+          }
         }
       ]
     },
     {
-      "name": "updateFullLiquidationPenaltyPercentage",
+      "name": "updateOrderFillerRewardStructure",
       "accounts": [
         {
           "name": "admin",
@@ -1859,17 +2291,15 @@
       ],
       "args": [
         {
-          "name": "numerator",
-          "type": "u128"
-        },
-        {
-          "name": "denominator",
-          "type": "u128"
+          "name": "orderFillerRewardStructure",
+          "type": {
+            "defined": "OrderFillerRewardStructure"
+          }
         }
       ]
     },
     {
-      "name": "updatePartialLiquidationLiquidatorShareDenominator",
+      "name": "updateOracleGuardRails",
       "accounts": [
         {
           "name": "admin",
@@ -1884,13 +2314,15 @@
       ],
       "args": [
         {
-          "name": "denominator",
-          "type": "u64"
+          "name": "oracleGuardRails",
+          "type": {
+            "defined": "OracleGuardRails"
+          }
         }
       ]
     },
     {
-      "name": "updateFullLiquidationLiquidatorShareDenominator",
+      "name": "updateMarketOracle",
       "accounts": [
         {
           "name": "admin",
@@ -1899,120 +2331,30 @@
         },
         {
           "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "market",
           "isMut": true,
           "isSigner": false
         }
       ],
       "args": [
         {
-          "name": "denominator",
-          "type": "u64"
+          "name": "oracle",
+          "type": "publicKey"
+        },
+        {
+          "name": "oracleSource",
+          "type": {
+            "defined": "OracleSource"
+          }
         }
       ]
     },
     {
-      "name": "updateFee",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "fees",
-          "type": {
-            "defined": "FeeStructure"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateOrderFillerRewardStructure",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "orderFillerRewardStructure",
-          "type": {
-            "defined": "OrderFillerRewardStructure"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateOracleGuardRails",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "oracleGuardRails",
-          "type": {
-            "defined": "OracleGuardRails"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateMarketOracle",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "market",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "oracle",
-          "type": "publicKey"
-        },
-        {
-          "name": "oracleSource",
-          "type": {
-            "defined": "OracleSource"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateMarketMinimumQuoteAssetTradeSize",
+      "name": "updateMarketMinimumQuoteAssetTradeSize",
       "accounts": [
         {
           "name": "admin",
@@ -2315,7 +2657,7 @@
       ]
     },
     {
-      "name": "updateAuctionDuration",
+      "name": "updatePerpAuctionDuration",
       "accounts": [
         {
           "name": "admin",
@@ -2330,11 +2672,28 @@
       ],
       "args": [
         {
-          "name": "minAuctionDuration",
+          "name": "minPerpAuctionDuration",
           "type": "u8"
+        }
+      ]
+    },
+    {
+      "name": "updateSpotAuctionDuration",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          "name": "maxAuctionDuration",
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "defaultSpotAuctionDuration",
           "type": "u8"
         }
       ]
@@ -2343,7 +2702,7 @@
       "name": "initializeInsuranceFundStake",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
@@ -2385,7 +2744,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         }
       ]
@@ -2399,12 +2758,12 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
         {
-          "name": "bankVault",
+          "name": "spotMarketVault",
           "isMut": true,
           "isSigner": false
         },
@@ -2426,7 +2785,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         }
       ]
@@ -2435,7 +2794,7 @@
       "name": "addInsuranceFundStake",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
@@ -2472,7 +2831,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         },
         {
@@ -2485,7 +2844,7 @@
       "name": "requestRemoveInsuranceFundStake",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
@@ -2512,7 +2871,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         },
         {
@@ -2525,7 +2884,7 @@
       "name": "cancelRequestRemoveInsuranceFundStake",
       "accounts": [
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
@@ -2552,7 +2911,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         }
       ]
@@ -2566,7 +2925,7 @@
           "isSigner": false
         },
         {
-          "name": "bank",
+          "name": "spotMarket",
           "isMut": false,
           "isSigner": false
         },
@@ -2608,7 +2967,7 @@
       ],
       "args": [
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64"
         }
       ]
@@ -2616,18 +2975,220 @@
   ],
   "accounts": [
     {
-      "name": "Bank",
+      "name": "InsuranceFundStake",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "authority",
+            "type": "publicKey"
+          },
+          {
+            "name": "marketIndex",
+            "type": "u64"
+          },
+          {
+            "name": "ifShares",
+            "type": "u128"
+          },
+          {
+            "name": "ifBase",
+            "type": "u128"
+          },
+          {
+            "name": "lastValidTs",
+            "type": "i64"
+          },
+          {
+            "name": "lastWithdrawRequestShares",
+            "type": "u128"
+          },
+          {
+            "name": "lastWithdrawRequestValue",
+            "type": "u64"
+          },
+          {
+            "name": "lastWithdrawRequestTs",
+            "type": "i64"
+          },
+          {
+            "name": "costBasis",
+            "type": "i64"
+          }
+        ]
+      }
+    },
+    {
+      "name": "PerpMarket",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "marketIndex",
+            "type": "u64"
+          },
+          {
+            "name": "pubkey",
+            "type": "publicKey"
+          },
+          {
+            "name": "status",
+            "type": {
+              "defined": "MarketStatus"
+            }
+          },
+          {
+            "name": "contractType",
+            "type": {
+              "defined": "ContractType"
+            }
+          },
+          {
+            "name": "settlementPrice",
+            "type": "i128"
+          },
+          {
+            "name": "expiryTs",
+            "type": "i64"
+          },
+          {
+            "name": "amm",
+            "type": {
+              "defined": "AMM"
+            }
+          },
+          {
+            "name": "baseAssetAmountLong",
+            "type": "i128"
+          },
+          {
+            "name": "baseAssetAmountShort",
+            "type": "i128"
+          },
+          {
+            "name": "openInterest",
+            "type": "u128"
+          },
+          {
+            "name": "marginRatioInitial",
+            "type": "u32"
+          },
+          {
+            "name": "marginRatioMaintenance",
+            "type": "u32"
+          },
+          {
+            "name": "nextFillRecordId",
+            "type": "u64"
+          },
+          {
+            "name": "nextFundingRateRecordId",
+            "type": "u64"
+          },
+          {
+            "name": "nextCurveRecordId",
+            "type": "u64"
+          },
+          {
+            "name": "pnlPool",
+            "type": {
+              "defined": "PoolBalance"
+            }
+          },
+          {
+            "name": "revenueWithdrawSinceLastSettle",
+            "type": "u128"
+          },
+          {
+            "name": "maxRevenueWithdrawPerPeriod",
+            "type": "u128"
+          },
+          {
+            "name": "lastRevenueWithdrawTs",
+            "type": "i64"
+          },
+          {
+            "name": "imfFactor",
+            "type": "u128"
+          },
+          {
+            "name": "unrealizedInitialAssetWeight",
+            "type": "u32"
+          },
+          {
+            "name": "unrealizedMaintenanceAssetWeight",
+            "type": "u32"
+          },
+          {
+            "name": "unrealizedImfFactor",
+            "type": "u128"
+          },
+          {
+            "name": "unrealizedMaxImbalance",
+            "type": "u128"
+          },
+          {
+            "name": "liquidatorFee",
+            "type": "u128"
+          },
+          {
+            "name": "ifLiquidationFee",
+            "type": "u128"
+          },
+          {
+            "name": "quoteMaxInsurance",
+            "type": "u128"
+          },
+          {
+            "name": "quoteSettledInsurance",
+            "type": "u128"
+          },
+          {
+            "name": "padding0",
+            "type": "u32"
+          },
+          {
+            "name": "padding1",
+            "type": "u128"
+          },
+          {
+            "name": "padding2",
+            "type": "u128"
+          },
+          {
+            "name": "padding3",
+            "type": "u128"
+          },
+          {
+            "name": "padding4",
+            "type": "u128"
+          }
+        ]
+      }
+    },
+    {
+      "name": "SpotMarket",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "bankIndex",
+            "name": "marketIndex",
             "type": "u64"
           },
           {
             "name": "pubkey",
             "type": "publicKey"
           },
+          {
+            "name": "status",
+            "type": {
+              "defined": "MarketStatus"
+            }
+          },
+          {
+            "name": "expiryTs",
+            "type": "i64"
+          },
           {
             "name": "oracle",
             "type": "publicKey"
@@ -2761,176 +3322,102 @@
             "type": "u128"
           },
           {
-            "name": "liquidationFee",
+            "name": "liquidatorFee",
             "type": "u128"
           },
           {
-            "name": "liquidationIfFactor",
-            "type": "u32"
-          },
-          {
-            "name": "withdrawGuardThreshold",
+            "name": "ifLiquidationFee",
             "type": "u128"
-          }
-        ]
-      }
-    },
-    {
-      "name": "InsuranceFundStake",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "authority",
-            "type": "publicKey"
           },
           {
-            "name": "bankIndex",
-            "type": "u64"
-          },
-          {
-            "name": "ifShares",
-            "type": "u128"
-          },
-          {
-            "name": "ifBase",
+            "name": "withdrawGuardThreshold",
             "type": "u128"
           },
           {
-            "name": "lastValidTs",
-            "type": "i64"
-          },
-          {
-            "name": "lastWithdrawRequestShares",
+            "name": "orderStepSize",
             "type": "u128"
           },
           {
-            "name": "lastWithdrawRequestValue",
+            "name": "nextFillRecordId",
             "type": "u64"
           },
           {
-            "name": "lastWithdrawRequestTs",
-            "type": "i64"
+            "name": "totalSpotFee",
+            "type": "u128"
           },
           {
-            "name": "costBasis",
-            "type": "i64"
+            "name": "spotFeePool",
+            "type": {
+              "defined": "PoolBalance"
+            }
           }
         ]
       }
     },
     {
-      "name": "Market",
+      "name": "SerumV3FulfillmentConfig",
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "marketIndex",
-            "type": "u64"
-          },
           {
             "name": "pubkey",
             "type": "publicKey"
           },
           {
-            "name": "initialized",
-            "type": "bool"
-          },
-          {
-            "name": "amm",
+            "name": "fulfillmentType",
             "type": {
-              "defined": "AMM"
+              "defined": "SpotFulfillmentType"
             }
           },
           {
-            "name": "baseAssetAmountLong",
-            "type": "i128"
-          },
-          {
-            "name": "baseAssetAmountShort",
-            "type": "i128"
-          },
-          {
-            "name": "openInterest",
-            "type": "u128"
-          },
-          {
-            "name": "marginRatioInitial",
-            "type": "u32"
-          },
-          {
-            "name": "marginRatioMaintenance",
-            "type": "u32"
-          },
-          {
-            "name": "nextFillRecordId",
-            "type": "u64"
-          },
-          {
-            "name": "nextFundingRateRecordId",
-            "type": "u64"
-          },
-          {
-            "name": "nextCurveRecordId",
-            "type": "u64"
-          },
-          {
-            "name": "pnlPool",
+            "name": "status",
             "type": {
-              "defined": "PoolBalance"
+              "defined": "SpotFulfillmentStatus"
             }
           },
           {
-            "name": "revenueWithdrawSinceLastSettle",
-            "type": "u128"
-          },
-          {
-            "name": "maxRevenueWithdrawPerPeriod",
-            "type": "u128"
-          },
-          {
-            "name": "lastRevenueWithdrawTs",
-            "type": "i64"
+            "name": "marketIndex",
+            "type": "u64"
           },
           {
-            "name": "imfFactor",
-            "type": "u128"
+            "name": "serumProgramId",
+            "type": "publicKey"
           },
           {
-            "name": "unrealizedInitialAssetWeight",
-            "type": "u8"
+            "name": "serumMarket",
+            "type": "publicKey"
           },
           {
-            "name": "unrealizedMaintenanceAssetWeight",
-            "type": "u8"
+            "name": "serumRequestQueue",
+            "type": "publicKey"
           },
           {
-            "name": "unrealizedImfFactor",
-            "type": "u128"
+            "name": "serumEventQueue",
+            "type": "publicKey"
           },
           {
-            "name": "liquidationFee",
-            "type": "u128"
+            "name": "serumBids",
+            "type": "publicKey"
           },
           {
-            "name": "padding0",
-            "type": "u32"
+            "name": "serumAsks",
+            "type": "publicKey"
           },
           {
-            "name": "padding1",
-            "type": "u128"
+            "name": "serumBaseVault",
+            "type": "publicKey"
           },
           {
-            "name": "padding2",
-            "type": "u128"
+            "name": "serumQuoteVault",
+            "type": "publicKey"
           },
           {
-            "name": "padding3",
-            "type": "u128"
+            "name": "serumOpenOrders",
+            "type": "publicKey"
           },
           {
-            "name": "padding4",
-            "type": "u128"
+            "name": "serumSignerNonce",
+            "type": "u64"
           }
         ]
       }
@@ -2961,51 +3448,13 @@
             "type": "publicKey"
           },
           {
-            "name": "marginRatioInitial",
-            "type": "u128"
-          },
-          {
-            "name": "marginRatioMaintenance",
-            "type": "u128"
-          },
-          {
-            "name": "marginRatioPartial",
-            "type": "u128"
-          },
-          {
-            "name": "partialLiquidationClosePercentageNumerator",
-            "type": "u128"
-          },
-          {
-            "name": "partialLiquidationClosePercentageDenominator",
-            "type": "u128"
-          },
-          {
-            "name": "partialLiquidationPenaltyPercentageNumerator",
-            "type": "u128"
-          },
-          {
-            "name": "partialLiquidationPenaltyPercentageDenominator",
-            "type": "u128"
-          },
-          {
-            "name": "fullLiquidationPenaltyPercentageNumerator",
-            "type": "u128"
-          },
-          {
-            "name": "fullLiquidationPenaltyPercentageDenominator",
-            "type": "u128"
-          },
-          {
-            "name": "partialLiquidationLiquidatorShareDenominator",
-            "type": "u64"
-          },
-          {
-            "name": "fullLiquidationLiquidatorShareDenominator",
-            "type": "u64"
+            "name": "perpFeeStructure",
+            "type": {
+              "defined": "FeeStructure"
+            }
           },
           {
-            "name": "feeStructure",
+            "name": "spotFeeStructure",
             "type": {
               "defined": "FeeStructure"
             }
@@ -3029,7 +3478,7 @@
             "type": "u64"
           },
           {
-            "name": "numberOfBanks",
+            "name": "numberOfSpotMarkets",
             "type": "u64"
           },
           {
@@ -3037,32 +3486,32 @@
             "type": "u128"
           },
           {
-            "name": "minAuctionDuration",
+            "name": "minPerpAuctionDuration",
             "type": "u8"
           },
           {
-            "name": "maxAuctionDuration",
+            "name": "defaultMarketOrderTimeInForce",
             "type": "u8"
           },
           {
-            "name": "liquidationMarginBufferRatio",
+            "name": "defaultSpotAuctionDuration",
             "type": "u8"
           },
           {
-            "name": "signer",
-            "type": "publicKey"
+            "name": "liquidationMarginBufferRatio",
+            "type": "u32"
           },
           {
-            "name": "signerNonce",
-            "type": "u8"
+            "name": "settlementDuration",
+            "type": "u16"
           },
           {
-            "name": "padding0",
-            "type": "u128"
+            "name": "signer",
+            "type": "publicKey"
           },
           {
-            "name": "padding1",
-            "type": "u128"
+            "name": "signerNonce",
+            "type": "u8"
           }
         ]
       }
@@ -3090,11 +3539,11 @@
             }
           },
           {
-            "name": "bankBalances",
+            "name": "spotPositions",
             "type": {
               "array": [
                 {
-                  "defined": "UserBankBalance"
+                  "defined": "SpotPosition"
                 },
                 8
               ]
@@ -3105,11 +3554,11 @@
             "type": "u64"
           },
           {
-            "name": "positions",
+            "name": "perpPositions",
             "type": {
               "array": [
                 {
-                  "defined": "MarketPosition"
+                  "defined": "PerpPosition"
                 },
                 5
               ]
@@ -3137,6 +3586,10 @@
           {
             "name": "bankrupt",
             "type": "bool"
+          },
+          {
+            "name": "customMarginRatio",
+            "type": "u32"
           }
         ]
       }
@@ -3164,7 +3617,7 @@
           },
           {
             "name": "totalReferrerReward",
-            "type": "u128"
+            "type": "u64"
           },
           {
             "name": "fees",
@@ -3216,6 +3669,12 @@
               "defined": "OrderType"
             }
           },
+          {
+            "name": "marketType",
+            "type": {
+              "defined": "MarketType"
+            }
+          },
           {
             "name": "direction",
             "type": {
@@ -3260,47 +3719,27 @@
               "defined": "OrderTriggerCondition"
             }
           },
-          {
-            "name": "optionalAccounts",
-            "type": {
-              "defined": "OrderParamsOptionalAccounts"
-            }
-          },
-          {
-            "name": "positionLimit",
-            "type": "u128"
-          },
           {
             "name": "oraclePriceOffset",
             "type": "i128"
           },
           {
             "name": "auctionDuration",
-            "type": "u8"
-          },
-          {
-            "name": "padding0",
-            "type": "bool"
+            "type": {
+              "option": "u8"
+            }
           },
           {
-            "name": "padding1",
-            "type": "bool"
-          }
-        ]
-      }
-    },
-    {
-      "name": "OrderParamsOptionalAccounts",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "discountToken",
-            "type": "bool"
+            "name": "timeInForce",
+            "type": {
+              "option": "u8"
+            }
           },
           {
-            "name": "referrer",
-            "type": "bool"
+            "name": "auctionStartPrice",
+            "type": {
+              "option": "u128"
+            }
           }
         ]
       }
@@ -3314,16 +3753,6 @@
             "name": "marketIndex",
             "type": "u64"
           },
-          {
-            "name": "orderIds",
-            "type": {
-              "vec": "u64"
-            }
-          },
-          {
-            "name": "canceledOrdersFee",
-            "type": "u128"
-          },
           {
             "name": "oraclePrice",
             "type": "i128"
@@ -3359,6 +3788,10 @@
           {
             "name": "liquidatorOrderId",
             "type": "u64"
+          },
+          {
+            "name": "ifFee",
+            "type": "u64"
           }
         ]
       }
@@ -3369,7 +3802,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "assetBankIndex",
+            "name": "assetMarketIndex",
             "type": "u64"
           },
           {
@@ -3381,7 +3814,7 @@
             "type": "u128"
           },
           {
-            "name": "liabilityBankIndex",
+            "name": "liabilityMarketIndex",
             "type": "u64"
           },
           {
@@ -3391,6 +3824,10 @@
           {
             "name": "liabilityTransfer",
             "type": "u128"
+          },
+          {
+            "name": "ifFee",
+            "type": "u64"
           }
         ]
       }
@@ -3401,7 +3838,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "marketIndex",
+            "name": "perpMarketIndex",
             "type": "u64"
           },
           {
@@ -3413,7 +3850,7 @@
             "type": "u128"
           },
           {
-            "name": "liabilityBankIndex",
+            "name": "liabilityMarketIndex",
             "type": "u64"
           },
           {
@@ -3433,7 +3870,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "marketIndex",
+            "name": "perpMarketIndex",
             "type": "u64"
           },
           {
@@ -3445,7 +3882,7 @@
             "type": "u128"
           },
           {
-            "name": "assetBankIndex",
+            "name": "assetMarketIndex",
             "type": "u64"
           },
           {
@@ -3489,7 +3926,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "bankIndex",
+            "name": "marketIndex",
             "type": "u64"
           },
           {
@@ -3574,6 +4011,10 @@
             "name": "quoteAssetReserve",
             "type": "u128"
           },
+          {
+            "name": "concentrationCoef",
+            "type": "u128"
+          },
           {
             "name": "minBaseAssetReserve",
             "type": "u128"
@@ -3629,7 +4070,7 @@
           {
             "name": "marketPositionPerLp",
             "type": {
-              "defined": "MarketPosition"
+              "defined": "PerpPosition"
             }
           },
           {
@@ -3672,6 +4113,10 @@
             "name": "cumulativeRepegRebateShort",
             "type": "u128"
           },
+          {
+            "name": "cumulativeSocialLoss",
+            "type": "i128"
+          },
           {
             "name": "markStd",
             "type": "u64"
@@ -3707,7 +4152,7 @@
           {
             "name": "marketPosition",
             "type": {
-              "defined": "MarketPosition"
+              "defined": "PerpPosition"
             }
           },
           {
@@ -3794,6 +4239,10 @@
             "name": "netRevenueSinceLastFunding",
             "type": "i64"
           },
+          {
+            "name": "totalLiquidationFee",
+            "type": "u128"
+          },
           {
             "name": "feePool",
             "type": {
@@ -3927,7 +4376,7 @@
             }
           },
           {
-            "name": "cancelOrderFee",
+            "name": "flatFillerFee",
             "type": "u128"
           }
         ]
@@ -4040,7 +4489,7 @@
           },
           {
             "name": "totalLpFees",
-            "type": "u128"
+            "type": "u64"
           },
           {
             "name": "totalFeeRebate",
@@ -4048,39 +4497,51 @@
           },
           {
             "name": "totalTokenDiscount",
-            "type": "u128"
+            "type": "u64"
           },
           {
             "name": "totalRefereeDiscount",
-            "type": "u128"
+            "type": "u64"
           }
         ]
       }
     },
     {
-      "name": "UserBankBalance",
+      "name": "SpotPosition",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "bankIndex",
+            "name": "marketIndex",
             "type": "u64"
           },
           {
             "name": "balanceType",
             "type": {
-              "defined": "BankBalanceType"
+              "defined": "SpotBalanceType"
             }
           },
           {
             "name": "balance",
             "type": "u128"
+          },
+          {
+            "name": "openOrders",
+            "type": "u8"
+          },
+          {
+            "name": "openBids",
+            "type": "i128"
+          },
+          {
+            "name": "openAsks",
+            "type": "i128"
           }
         ]
       }
     },
     {
-      "name": "MarketPosition",
+      "name": "PerpPosition",
       "type": {
         "kind": "struct",
         "fields": [
@@ -4132,6 +4593,10 @@
             "name": "lpShares",
             "type": "u128"
           },
+          {
+            "name": "remainderBaseAssetAmount",
+            "type": "i128"
+          },
           {
             "name": "lastNetBaseAssetAmountPerLp",
             "type": "i128"
@@ -4184,6 +4649,12 @@
               "defined": "OrderType"
             }
           },
+          {
+            "name": "marketType",
+            "type": {
+              "defined": "MarketType"
+            }
+          },
           {
             "name": "ts",
             "type": "i64"
@@ -4279,13 +4750,22 @@
             "type": "u8"
           },
           {
-            "name": "padding",
-            "type": {
-              "array": [
-                "u16",
-                3
-              ]
-            }
+            "name": "timeInForce",
+            "type": "u8"
+          }
+        ]
+      }
+    },
+    {
+      "name": "SpotFulfillmentType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "SerumV3"
+          },
+          {
+            "name": "None"
           }
         ]
       }
@@ -4383,20 +4863,6 @@
         ]
       }
     },
-    {
-      "name": "BankBalanceType",
-      "type": {
-        "kind": "enum",
-        "variants": [
-          {
-            "name": "Deposit"
-          },
-          {
-            "name": "Borrow"
-          }
-        ]
-      }
-    },
     {
       "name": "DepositDirection",
       "type": {
@@ -4452,7 +4918,7 @@
             "name": "MarketOrderFilledToLimitPrice"
           },
           {
-            "name": "MarketOrderAuctionExpired"
+            "name": "OrderExpired"
           },
           {
             "name": "CanceledForLiquidation"
@@ -4530,7 +4996,7 @@
       }
     },
     {
-      "name": "FulfillmentMethod",
+      "name": "PerpFulfillmentMethod",
       "type": {
         "kind": "enum",
         "variants": [
@@ -4543,6 +5009,54 @@
         ]
       }
     },
+    {
+      "name": "SpotFulfillmentMethod",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "SerumV3"
+          },
+          {
+            "name": "Match"
+          }
+        ]
+      }
+    },
+    {
+      "name": "MarketStatus",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Initialized"
+          },
+          {
+            "name": "ReduceOnly"
+          },
+          {
+            "name": "Settlement"
+          },
+          {
+            "name": "Delisted"
+          }
+        ]
+      }
+    },
+    {
+      "name": "ContractType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Perpetual"
+          },
+          {
+            "name": "Future"
+          }
+        ]
+      }
+    },
     {
       "name": "OracleSource",
       "type": {
@@ -4560,6 +5074,48 @@
         ]
       }
     },
+    {
+      "name": "SpotBalanceType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Deposit"
+          },
+          {
+            "name": "Borrow"
+          }
+        ]
+      }
+    },
+    {
+      "name": "SpotFulfillmentStatus",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Enabled"
+          },
+          {
+            "name": "Disabled"
+          }
+        ]
+      }
+    },
+    {
+      "name": "AssetType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Base"
+          },
+          {
+            "name": "Quote"
+          }
+        ]
+      }
+    },
     {
       "name": "OrderStatus",
       "type": {
@@ -4613,6 +5169,20 @@
           }
         ]
       }
+    },
+    {
+      "name": "MarketType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Spot"
+          },
+          {
+            "name": "Perp"
+          }
+        ]
+      }
     }
   ],
   "events": [
@@ -4687,7 +5257,7 @@
           "index": false
         },
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64",
           "index": false
         },
@@ -4996,6 +5566,13 @@
           "type": "u64",
           "index": false
         },
+        {
+          "name": "marketType",
+          "type": {
+            "defined": "MarketType"
+          },
+          "index": false
+        },
         {
           "name": "filler",
           "type": {
@@ -5101,6 +5678,15 @@
           },
           "index": false
         },
+        {
+          "name": "takerOrderDirection",
+          "type": {
+            "option": {
+              "defined": "PositionDirection"
+            }
+          },
+          "index": false
+        },
         {
           "name": "takerOrderBaseAssetAmount",
           "type": {
@@ -5129,6 +5715,13 @@
           },
           "index": false
         },
+        {
+          "name": "spotFulfillmentMethodFee",
+          "type": {
+            "option": "u64"
+          },
+          "index": false
+        },
         {
           "name": "maker",
           "type": {
@@ -5143,6 +5736,15 @@
           },
           "index": false
         },
+        {
+          "name": "makerOrderDirection",
+          "type": {
+            "option": {
+              "defined": "PositionDirection"
+            }
+          },
+          "index": false
+        },
         {
           "name": "makerOrderBaseAssetAmount",
           "type": {
@@ -5270,6 +5872,13 @@
           "type": "bool",
           "index": false
         },
+        {
+          "name": "canceledOrderIds",
+          "type": {
+            "vec": "u64"
+          },
+          "index": false
+        },
         {
           "name": "liquidatePerp",
           "type": {
@@ -5368,7 +5977,12 @@
           "index": false
         },
         {
-          "name": "bankIndex",
+          "name": "spotMarketIndex",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "perpMarketIndex",
           "type": "u64",
           "index": false
         },
@@ -5383,7 +5997,7 @@
           "index": false
         },
         {
-          "name": "bankVaultAmountBefore",
+          "name": "vaultAmountBefore",
           "type": "u64",
           "index": false
         },
@@ -5404,7 +6018,7 @@
         },
         {
           "name": "amount",
-          "type": "u64",
+          "type": "i64",
           "index": false
         }
       ]
@@ -5435,7 +6049,7 @@
           "index": false
         },
         {
-          "name": "bankIndex",
+          "name": "marketIndex",
           "type": "u64",
           "index": false
         },
@@ -5480,8 +6094,8 @@
   "errors": [
     {
       "code": 6000,
-      "name": "InvalidBankAuthority",
-      "msg": "Invalid Bank Authority"
+      "name": "InvalidSpotMarketAuthority",
+      "msg": "Invalid Spot Market Authority"
     },
     {
       "code": 6001,
@@ -5560,8 +6174,8 @@
     },
     {
       "code": 6016,
-      "name": "TradeSizeTooSmall",
-      "msg": "Trade Size Too Small"
+      "name": "OrderSizeTooSmall",
+      "msg": "Order Size Too Small"
     },
     {
       "code": 6017,
@@ -5820,53 +6434,53 @@
     },
     {
       "code": 6068,
-      "name": "CouldNotFindBankBalance",
-      "msg": "CouldNotFindBankBalance"
+      "name": "CouldNotFindSpotPosition",
+      "msg": "CouldNotFindSpotPosition"
     },
     {
       "code": 6069,
-      "name": "NoUserBankBalanceAvailable",
-      "msg": "NoUserBankBalanceAvailable"
+      "name": "NoSpotPositionAvailable",
+      "msg": "NoSpotPositionAvailable"
     },
     {
       "code": 6070,
-      "name": "InvalidBankInitialization",
-      "msg": "InvalidBankInitialization"
+      "name": "InvalidSpotMarketInitialization",
+      "msg": "InvalidSpotMarketInitialization"
     },
     {
       "code": 6071,
-      "name": "CouldNotLoadBankData",
-      "msg": "CouldNotLoadBankData"
+      "name": "CouldNotLoadSpotMarketData",
+      "msg": "CouldNotLoadSpotMarketData"
     },
     {
       "code": 6072,
-      "name": "BankNotFound",
-      "msg": "BankNotFound"
+      "name": "SpotMarketNotFound",
+      "msg": "SpotMarketNotFound"
     },
     {
       "code": 6073,
-      "name": "InvalidBankAccount",
-      "msg": "InvalidBankAccount"
+      "name": "InvalidSpotMarketAccount",
+      "msg": "InvalidSpotMarketAccount"
     },
     {
       "code": 6074,
-      "name": "UnableToLoadBankAccount",
-      "msg": "UnableToLoadBankAccount"
+      "name": "UnableToLoadSpotMarketAccount",
+      "msg": "UnableToLoadSpotMarketAccount"
     },
     {
       "code": 6075,
-      "name": "BankWrongMutability",
-      "msg": "BankWrongMutability"
+      "name": "SpotMarketWrongMutability",
+      "msg": "SpotMarketWrongMutability"
     },
     {
       "code": 6076,
-      "name": "BankInterestNotUpToDate",
-      "msg": "BankInterestNotUpToDate"
+      "name": "SpotMarketInterestNotUpToDate",
+      "msg": "SpotInterestNotUpToDate"
     },
     {
       "code": 6077,
-      "name": "BankInsufficientDeposits",
-      "msg": "BankInsufficientDeposits"
+      "name": "SpotMarketInsufficientDeposits",
+      "msg": "SpotMarketInsufficientDeposits"
     },
     {
       "code": 6078,
@@ -6000,8 +6614,8 @@
     },
     {
       "code": 6104,
-      "name": "WrongBankBalanceType",
-      "msg": "WrongBankBalanceType"
+      "name": "WrongSpotBalanceType",
+      "msg": "WrongSpotBalanceType"
     },
     {
       "code": 6105,
@@ -6045,8 +6659,8 @@
     },
     {
       "code": 6113,
-      "name": "BankDailyWithdrawLimit",
-      "msg": "BankDailyWithdrawLimit"
+      "name": "DailyWithdrawLimit",
+      "msg": "DailyWithdrawLimit"
     },
     {
       "code": 6114,
@@ -6060,7 +6674,7 @@
     },
     {
       "code": 6116,
-      "name": "CantLPWithMarketPosition",
+      "name": "CantLPWithPerpPosition",
       "msg": "Cant LP with a market position"
     },
     {
@@ -6075,8 +6689,43 @@
     },
     {
       "code": 6119,
-      "name": "InvalidBankState",
-      "msg": "Invalid Bank State"
+      "name": "InvalidSpotMarketVault",
+      "msg": "Invalid Spot Market Vault"
+    },
+    {
+      "code": 6120,
+      "name": "InvalidSpotMarketState",
+      "msg": "Invalid Spot Market State"
+    },
+    {
+      "code": 6121,
+      "name": "InvalidSerumProgram",
+      "msg": "InvalidSerumProgram"
+    },
+    {
+      "code": 6122,
+      "name": "InvalidSerumMarket",
+      "msg": "InvalidSerumMarket"
+    },
+    {
+      "code": 6123,
+      "name": "InvalidSerumOpenOrders",
+      "msg": "InvalidSerumOpenOrders"
+    },
+    {
+      "code": 6124,
+      "name": "FailedSerumCPI",
+      "msg": "FailedSerumCPI"
+    },
+    {
+      "code": 6125,
+      "name": "FailedToFillOnSerum",
+      "msg": "FailedToFillOnSerum"
+    },
+    {
+      "code": 6126,
+      "name": "InvalidSerumFulfillmentConfig",
+      "msg": "InvalidSerumFulfillmentConfig"
     }
   ]
 }