diff --git a/core/contracts/Clearinghouse.sol b/core/contracts/Clearinghouse.sol index 28eb4bf..93ff67e 100644 --- a/core/contracts/Clearinghouse.sol +++ b/core/contracts/Clearinghouse.sol @@ -414,14 +414,6 @@ contract Clearinghouse is EndpointGated, ClearinghouseStorage, IClearinghouse { : IProductEngine.HealthType.INITIAL; require(getHealth(sender, healthType) >= 0, ERR_SUBACCT_HEALTH); - // TODO: remove this when we support wS spot. - if (productId == 145) { - ISpotEngine.Balance memory balance = spotEngine.getBalance( - productId, - sender - ); - require(balance.amount >= 0, ERR_SUBACCT_HEALTH); - } emit ModifyCollateral(amountRealized, sender, productId); } @@ -432,8 +424,6 @@ contract Clearinghouse is EndpointGated, ClearinghouseStorage, IClearinghouse { { require(!RiskHelper.isIsolatedSubaccount(txn.sender), ERR_UNAUTHORIZED); require(txn.productId != QUOTE_PRODUCT_ID); - // TODO: remove this when we support wS spot. - require(txn.productId != 145, ERR_INVALID_PRODUCT); productToEngine[txn.productId].mintLp( txn.productId, txn.sender, diff --git a/core/contracts/Endpoint.sol b/core/contracts/Endpoint.sol index 8447e2f..7bd89a3 100644 --- a/core/contracts/Endpoint.sol +++ b/core/contracts/Endpoint.sol @@ -285,10 +285,7 @@ contract Endpoint is IEndpoint, EIP712Upgradeable, OwnableUpgradeable { string memory referralCode ) public { require(bytes(referralCode).length != 0); - require( - !RiskHelper.isIsolatedSubaccount(subaccount) && productId != 145, - ERR_UNAUTHORIZED - ); + require(!RiskHelper.isIsolatedSubaccount(subaccount), ERR_UNAUTHORIZED); address sender = address(bytes20(subaccount)); diff --git a/core/contracts/OffchainExchange.sol b/core/contracts/OffchainExchange.sol index 3e1b23f..2a64419 100644 --- a/core/contracts/OffchainExchange.sol +++ b/core/contracts/OffchainExchange.sol @@ -938,7 +938,11 @@ contract OffchainExchange is // use the default fee rates. if (block.chainid == 80094 || block.chainid == 80084) { // defaults for Berachain maker: 2bps / taker: 5bps - userFeeRates = FeeRates(200_000_000_000_000, 500_000_000_000_000, 1); + userFeeRates = FeeRates( + 200_000_000_000_000, + 500_000_000_000_000, + 1 + ); } else { userFeeRates = FeeRates(0, 200_000_000_000_000, 1); } @@ -958,7 +962,11 @@ contract OffchainExchange is // use the default fee rates. if (block.chainid == 80094 || block.chainid == 80084) { // defaults for Berachain maker: 2bps / taker: 5bps - userFeeRates = FeeRates(200_000_000_000_000, 500_000_000_000_000, 1); + userFeeRates = FeeRates( + 200_000_000_000_000, + 500_000_000_000_000, + 1 + ); } else { userFeeRates = FeeRates(0, 200_000_000_000_000, 1); } diff --git a/core/package.json b/core/package.json index a4345bf..a0c0c66 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "vertex-core", - "version": "3.0.0", + "version": "3.0.1", "license": "UNLICENSED", "description": "EVM implementation of Vertex", "scripts": { diff --git a/lba/package.json b/lba/package.json index 20450fc..238877b 100644 --- a/lba/package.json +++ b/lba/package.json @@ -1,6 +1,6 @@ { "name": "vertex-lba", - "version": "3.0.0", + "version": "3.0.1", "license": "UNLICENSED", "description": "Vertex LBA contracts", "scripts": {