refactor(protocol): use npm to manage third-party solidity dependency (…

…#17881)
taikoxyz · Aug 6, 2024 · d524e69 · d524e69
1 parent 7bf7d69
commit d524e69
Show file tree

Hide file tree

Showing 22 changed files with 1,390 additions and 1,728 deletions.
diff --git a/packages/protocol/contracts/L2/Lib1559Math.sol b/packages/protocol/contracts/L2/Lib1559Math.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "../thirdparty/solmate/LibFixedPointMath.sol";
+import "@solady/src/utils/FixedPointMathLib.sol";
 import "../libs/LibMath.sol";
 
 /// @title Lib1559Math
@@ -12,6 +12,8 @@ import "../libs/LibMath.sol";
 library Lib1559Math {
     using LibMath for uint256;
 
+    uint128 public constant MAX_EXP_INPUT = 135_305_999_368_893_231_588;
+
     error EIP1559_INVALID_PARAMS();
 
     function calc1559BaseFee(
@@ -55,7 +57,7 @@ library Lib1559Math {
         if (_adjustmentFactor == 0) {
             revert EIP1559_INVALID_PARAMS();
         }
-        return _ethQty(_gasExcess, _adjustmentFactor) / LibFixedPointMath.SCALING_FACTOR;
+        return _ethQty(_gasExcess, _adjustmentFactor) / FixedPointMathLib.WAD;
     }
 
     /// @dev exp(gas_qty / TARGET / ADJUSTMENT_QUOTIENT)
@@ -67,10 +69,10 @@ library Lib1559Math {
         pure
         returns (uint256)
     {
-        uint256 input = _gasExcess * LibFixedPointMath.SCALING_FACTOR / _adjustmentFactor;
-        if (input > LibFixedPointMath.MAX_EXP_INPUT) {
-            input = LibFixedPointMath.MAX_EXP_INPUT;
+        uint256 input = _gasExcess * FixedPointMathLib.WAD / _adjustmentFactor;
+        if (input > MAX_EXP_INPUT) {
+            input = MAX_EXP_INPUT;
         }
-        return uint256(LibFixedPointMath.exp(int256(input)));
+        return uint256(FixedPointMathLib.expWad(int256(input)));
     }
 }
diff --git a/packages/protocol/contracts/libs/LibTrieProof.sol b/packages/protocol/contracts/libs/LibTrieProof.sol
@@ -6,9 +6,9 @@
 
 pragma solidity 0.8.24;
 
-import "../thirdparty/optimism/rlp/RLPReader.sol";
-import "../thirdparty/optimism/rlp/RLPWriter.sol";
-import "../thirdparty/optimism/trie/SecureMerkleTrie.sol";
+import "@optimism/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol";
+import "@optimism/packages/contracts-bedrock/src/libraries/rlp/RLPWriter.sol";
+import "@optimism/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol";
 
 /// @title LibTrieProof
 /// @custom:security-contact security@taiko.xyz

diff --git a/packages/protocol/contracts/thirdparty/README.md b/packages/protocol/contracts/thirdparty/README.md
diff --git a/packages/protocol/contracts/thirdparty/optimism/Bytes.sol b/packages/protocol/contracts/thirdparty/optimism/Bytes.sol