perf: assorted optimizations (#254)

* perf: optimize data.length checks

* perf: cheaper cast

* perf: faster lock

* perf: faster sqrtu from solmate

* perf: optimize > to !=

* perf: optimize locked

* fix: lock operator mixup

* fix: return name in sqrtu

* fix: make sqrtu return uint128 again

* perf: unchecked in factory

* feat: restore abdk

* ci: fix

* ci: remove lint

Author: transmissions11

Diff for: .github/workflows/ci.yaml

@@ -6,6 +6,7 @@ on:
       - '**'
     branches:
       - 'main'
+  pull_request:
 
 jobs:
   lint-test:
@@ -23,14 +24,6 @@ jobs:
 
       - run: yarn install --ignore-scripts
 
-      - name: Lint
-        uses: wearerequired/lint-action@v1
-        with:
-          github_token: ${{ secrets.github_token }}
-          prettier: true
-          auto_fix: true
-          prettier_extensions: 'css,html,js,json,jsx,md,sass,scss,ts,tsx,vue,yaml,yml,sol'
-
       - name: Typechain
         run: yarn typechain
 

Diff for: contracts/PrimitiveEngine.sol

@@ -62,7 +62,7 @@ contract PrimitiveEngine is IPrimitiveEngine {
     /// @inheritdoc IPrimitiveEngineView
     address public immutable override stable;
     /// @dev Reentrancy guard initialized to state
-    uint8 private unlocked = 1;
+    uint256 private locked = 1;
     /// @inheritdoc IPrimitiveEngineView
     mapping(bytes32 => Calibration) public override calibrations;
     /// @inheritdoc IPrimitiveEngineView
@@ -73,11 +73,11 @@ contract PrimitiveEngine is IPrimitiveEngine {
     mapping(address => mapping(bytes32 => uint256)) public override liquidity;
 
     modifier lock() {
-        if (unlocked != 1) revert LockedError();
+        if (locked != 1) revert LockedError();
 
-        unlocked = 0;
+        locked = 2;
         _;
-        unlocked = 1;
+        locked = 1;
     }
 
     /// @notice Deploys an Engine with two tokens, a 'Risky' and 'Stable'
@@ -91,7 +91,7 @@ contract PrimitiveEngine is IPrimitiveEngine {
         (bool success, bytes memory data) = risky.staticcall(
             abi.encodeWithSelector(IERC20.balanceOf.selector, address(this))
         );
-        if (!success || data.length < 32) revert BalanceError();
+        if (!success || data.length != 32) revert BalanceError();
         return abi.decode(data, (uint256));
     }
 
@@ -100,7 +100,7 @@ contract PrimitiveEngine is IPrimitiveEngine {
         (bool success, bytes memory data) = stable.staticcall(
             abi.encodeWithSelector(IERC20.balanceOf.selector, address(this))
         );
-        if (!success || data.length < 32) revert BalanceError();
+        if (!success || data.length != 32) revert BalanceError();
         return abi.decode(data, (uint256));
     }
 
@@ -210,11 +210,11 @@ contract PrimitiveEngine is IPrimitiveEngine {
 
         uint256 balRisky;
         uint256 balStable;
-        if (delRisky > 0) balRisky = balanceRisky();
-        if (delStable > 0) balStable = balanceStable();
+        if (delRisky != 0) balRisky = balanceRisky();
+        if (delStable != 0) balStable = balanceStable();
         IPrimitiveDepositCallback(msg.sender).depositCallback(delRisky, delStable, data); // agnostic payment
-        if (delRisky > 0) checkRiskyBalance(balRisky + delRisky);
-        if (delStable > 0) checkStableBalance(balStable + delStable);
+        if (delRisky != 0) checkRiskyBalance(balRisky + delRisky);
+        if (delStable != 0) checkStableBalance(balStable + delStable);
         emit Deposit(msg.sender, recipient, delRisky, delStable);
     }
 
@@ -226,8 +226,8 @@ contract PrimitiveEngine is IPrimitiveEngine {
     ) external override lock {
         if (delRisky == 0 && delStable == 0) revert ZeroDeltasError();
         margins.withdraw(delRisky, delStable); // state update
-        if (delRisky > 0) IERC20(risky).safeTransfer(recipient, delRisky);
-        if (delStable > 0) IERC20(stable).safeTransfer(recipient, delStable);
+        if (delRisky != 0) IERC20(risky).safeTransfer(recipient, delRisky);
+        if (delStable != 0) IERC20(stable).safeTransfer(recipient, delStable);
         emit Withdraw(msg.sender, recipient, delRisky, delStable);
     }
 

Diff for: contracts/PrimitiveFactory.sol

@@ -77,18 +77,21 @@ contract PrimitiveFactory is IPrimitiveFactory {
         if (riskyDecimals > 18 || riskyDecimals < 6) revert DecimalsError(riskyDecimals);
         if (stableDecimals > 18 || stableDecimals < 6) revert DecimalsError(stableDecimals);
 
-        uint256 scaleFactorRisky = 10**(18 - riskyDecimals);
-        uint256 scaleFactorStable = 10**(18 - stableDecimals);
-        uint256 lowestDecimals = (riskyDecimals > stableDecimals ? stableDecimals : riskyDecimals);
-        uint256 minLiquidity = 10**(lowestDecimals / MIN_LIQUIDITY_FACTOR);
-        args = Args({
-            factory: factory,
-            risky: risky,
-            stable: stable,
-            scaleFactorRisky: scaleFactorRisky,
-            scaleFactorStable: scaleFactorStable,
-            minLiquidity: minLiquidity
-        }); // Engines call this to get constructor args
+        unchecked {
+            uint256 scaleFactorRisky = 10**(18 - riskyDecimals);
+            uint256 scaleFactorStable = 10**(18 - stableDecimals);
+            uint256 lowestDecimals = (riskyDecimals > stableDecimals ? stableDecimals : riskyDecimals);
+            uint256 minLiquidity = 10**(lowestDecimals / MIN_LIQUIDITY_FACTOR);
+            args = Args({
+                factory: factory,
+                risky: risky,
+                stable: stable,
+                scaleFactorRisky: scaleFactorRisky,
+                scaleFactorStable: scaleFactorStable,
+                minLiquidity: minLiquidity
+            }); // Engines call this to get constructor args
+        }
+        
         engine = address(new PrimitiveEngine{salt: keccak256(abi.encode(risky, stable))}());
         delete args;
     }

Diff for: contracts/libraries/Margin.sol

@@ -23,8 +23,8 @@ library Margin {
         uint256 delRisky,
         uint256 delStable
     ) internal {
-        if (delRisky > 0) margin.balanceRisky += delRisky.toUint128();
-        if (delStable > 0) margin.balanceStable += delStable.toUint128();
+        if (delRisky != 0) margin.balanceRisky += delRisky.toUint128();
+        if (delStable != 0) margin.balanceStable += delStable.toUint128();
     }
 
     /// @notice             Removes risky and stable token balance from `msg.sender`'s internal margin account
@@ -38,7 +38,7 @@ library Margin {
         uint256 delStable
     ) internal returns (Data storage margin) {
         margin = margins[msg.sender];
-        if (delRisky > 0) margin.balanceRisky -= delRisky.toUint128();
-        if (delStable > 0) margin.balanceStable -= delStable.toUint128();
+        if (delRisky != 0) margin.balanceRisky -= delRisky.toUint128();
+        if (delStable != 0) margin.balanceStable -= delStable.toUint128();
     }
 }

Diff for: contracts/libraries/Reserve.sol

@@ -34,7 +34,7 @@ library Reserve {
     function update(Data storage res, uint32 blockTimestamp) internal {
         uint32 deltaTime = blockTimestamp - res.blockTimestamp;
         // overflow is desired
-        if (deltaTime > 0) {
+        if (deltaTime != 0) {
             unchecked {
                 res.cumulativeRisky += uint256(res.reserveRisky) * deltaTime;
                 res.cumulativeStable += uint256(res.reserveStable) * deltaTime;

Diff for: contracts/libraries/SafeCast.sol

@@ -5,6 +5,7 @@ pragma solidity >=0.5.0;
 library SafeCast {
     /// @notice reverts if x > type(uint128).max
     function toUint128(uint256 x) internal pure returns (uint128 z) {
-        require((z = uint128(x)) == x);
+        require(x <= type(uint128).max);
+        z = uint128(x);
     }
 }

Diff for: contracts/test/callbacks/TestSwapCallback.sol

@@ -17,7 +17,7 @@ abstract contract TestSwapCallback is Scenarios {
         address token0 = risky();
         address token1 = stable();
         address from = getCaller();
-        if (delRisky > 0) IERC20(token0).transferFrom(from, msg.sender, delRisky);
-        if (delStable > 0) IERC20(token1).transferFrom(from, msg.sender, delStable);
+        if (delRisky != 0) IERC20(token0).transferFrom(from, msg.sender, delRisky);
+        if (delStable != 0) IERC20(token1).transferFrom(from, msg.sender, delStable);
     }
 }