Merge branch 'master' of https://github.com/axis-fi/axis-core

Axis-Fi · Nov 27, 2024 · 6798a87 · 6798a87
2 parents c8e03f4 + 458c859
commit 6798a87
Show file tree

Hide file tree

Showing 35 changed files with 86 additions and 83 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -26,8 +26,8 @@ ignore = [
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 
 [dependencies]
-forge-std = { version = "1.9.1" }
-solmate = { version = "6.7.0", url = "[email protected]:transmissions11/solmate.git", commit = "c892309933b25c03d32b1b0d674df7ae292ba925" }
-solady = { version = "0.0.124" }
-"@openzeppelin-contracts" = { version = "4.9.2" }
+forge-std = "1.9.1"
+solmate = "6.8.0"
+solady = "0.0.124"
+"@openzeppelin-contracts" = "4.9.2"
 clones-with-immutable-args = { version = "1.1.1", git = "[email protected]:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" }
diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,5 @@
+@clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src
 @forge-std-1.9.1=dependencies/forge-std-1.9.1/src
-@solmate-6.7.0=dependencies/solmate-6.7.0/src
-@solady-0.0.124=dependencies/solady-0.0.124/src
 @openzeppelin-contracts-4.9.2=dependencies/@openzeppelin-contracts-4.9.2
-@clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src
+@solady-0.0.124=dependencies/solady-0.0.124/src
+@solmate-6.8.0=dependencies/solmate-6.8.0/src
diff --git a/script/salts/salts.json b/script/salts/salts.json
@@ -26,23 +26,23 @@
     "0xf877dc218ee7538ffb3ad6f8fd1b4694cbb6f38d9e0b7a4d9a19ace3c24830a2": "0xad2a1f39589d55fd4fb667bda19d168106901d33100bb9c50fc57b1735024bcd"
   },
   "Test_MockCallback": {
-    "0x01841051d995f193994d87cc5321c5e0b180a226c6f951ab3f5c56176924b0cf": "0x9d8de47a5460a81aef092c4b61c9f2a9fd0f54c97274e392a9555e9d2d1e1710",
-    "0x06cf9ff7a063a7fc1e0b4a7d18212b17834e88a6b3fc550a62877f0cd405d85b": "0xd2ec65ab90d963102d6e7874beb98a42784a34417675e47bddcf503c6858b987",
-    "0x17606ccfd3f57516c9b03d3b81affabde9c64a206e808373b8aa36aff4b002c9": "0x97c30d3b95ed3817655f5868ba43c8cce64028f596c46779cef1beb6d6e4d407",
-    "0x26ced0c667f25d41c7eca6f22e6ca7ac8973443efef73c5f71f64118d3b5b711": "0x201969779bdc1d837056538c70f34c0aeb1d5df46ec1ad12826fed468ece068d",
-    "0x319a3731827c0a9841ca032b6f68775ccb2c0ceaf5528e914b42454a8e92eca6": "0xe14afdc6ad14fa8237e00a115bfa70f729d4cb63b566b55e184ca3248ad718bc",
-    "0x321e36c7755f0c0174dafae1f53661efcb802b8643e0793992713d73f9e85bb4": "0x7107f71a5f167cc15d36d5f4efeac4deaa9289e4b02a989ecd37c8308e26710d",
-    "0x3aadf72f8d2c5f6f7c74f7657d125aab00a19bf0a608b5738368d440ee6d6cd8": "0x4a5d9cdb5916177c82a0930839a2442ebad34b7ec15f61d91e2f348ac0eaa8d6",
-    "0x48a666de441ed423f11614aa6c0867bd32a9d77bfec36a5d8a31ce6d1781c381": "0xf2fe90d36d281706b431835743fc3d86606cf79b7597052e9a026f1ae7a2e3d4",
-    "0x6981e018db3125d14ca54c7c658ac16aa032b4739d01992b3e3ec1c42c857f7e": "0xbf6b3b727d6134587a377f175b9df1585f0e0eccc2bf3af7c6b20656a018668e",
-    "0x7091f552e5e92800b15a36997ca6294118351724cc7c58fa249405580eed1dae": "0x13b315f0f8c481fed5bb27bf913a2b642eefd230d8da1a86bc60af04f7f9b25d",
-    "0x772fc41a79c386cec03e58c6cfdef24eaa74628d1419d83965d76e5ac2bd9621": "0xacfca0ddb3de0d280ea48d2e78223aba782a0207b3c2056c0d3c867b0b084e52",
-    "0x7aff7199ffe5a50443a1dbe43fd6ad7791c7837003c5e57c5b630e6b9092491b": "0x3108223651eaa1fd79433ba0c9c932c31c1707a2149b59e81e6a6c65a1eafd0a",
-    "0x9a071a61820d44365b51755858759fbdb78a29feb70bac5f02ede7ad71622219": "0x1fb685cccf345205bb1917b2a3305428c26f629ab8fff078a9f6d99c898816ef",
-    "0xc247e7a2a55fbcd8c361ec133eb9a696af8ae510b454d9e42b314cbb5dcf37d1": "0xd7293cb870687d2f863dfe79892931908c7a76d20e9fec96358349a8787a2e96",
-    "0xc88879b36b5bc9b856491ea74b98eb1c7b8158933c11faafeecaf40ceb79e800": "0x1b433833ae2acfa6790776c2bdb7da39cc50a0106393da7264306ac132b29dc0",
-    "0xca89e73f7a2c70d2af4bc7384f4911ae1b1e7cec1f16a46d566adfcedbd5bb83": "0xebb91f13f82d8855e1ffedeb8ac8f35f4d4ece7ebbaa4fc27802403a908c2d36",
-    "0xd641570f656540d0a9c13bbb9feb07c10bbc3997ecfcb2e2a76753a55c1f10b1": "0x5488d2fad36f14ae33fe5c251756ea699a7f4fcd10a4519ffb65d532e54b8fa5",
-    "0xe2ebb96968e3cb4a4b3425e3f012c052293c38c0ebec9112ec26b6f345c1fe48": "0x64fabcd82cc78669e55741bdf0fde6bf1e60ffbed5f3345b6e93dd86b77cbe36"
+    "0x122b7366cd1ef2d5b4e5301e1905912ec0fe8b73e77aee436d38421a86d15313": "0x0a9151c7b46dc91425f2a34eb6b2fb33ee191550a9165830ae27877b3f4ca221",
+    "0x31839cd002be9d58c711006d802d11286e56601f846dda258f2e3a3d6312e9d5": "0x413ec56e5cda12c513a637af386dc614c6d8d4cd3332147aa3c1e8a384357a78",
+    "0x3906ecd77f3b4704ca6c6d5a06ecf7039c68312b200ade661f6d2a28098049e1": "0xe9927b53dc310098994a46e7f6c2cd5104b776f99b91115eece80ec5f8acebe8",
+    "0x525f9fb7cb93f53509d24ec2f82f9d832e21209c45978e2e315915d6ff8c6a7f": "0xe900d098e9a5d9bb11ba2a3667b6b1eeae83814fe553bb76e514cf5b3fa7a2ac",
+    "0x54a5ad7b0937b5a5876975ca86a146047356b10210457afbbe77c13e6f5dd954": "0x8c917d14c4e8991eb770603f76c7a2ee6ec9938465f1b8e3c4bc144066179dac",
+    "0x6205fbf29817ca90fa2498c5b1187af9359d49f9386e35ba328382bcaa131cc3": "0x360e652e5304ee51b6e45d13472e12154037096162a58739e9407aae45926f01",
+    "0x678385a33025444b4cc1bb4114e4f2b91518f7b62874b3dc9c42cc273c353cb9": "0x55c1bb8e1768f6374b0d715192f3a4623af7018e5c4ccfae641766ff58ef6f53",
+    "0x780f4d36b46e5c008598b23b91a1a33d3a6d9a009ab4e7d1ec6c4fd0b96ae27e": "0x2e795045262fbbed80e54de0ee9a59506de844b46ffdcbf2fbfe6d2cb7bf6247",
+    "0x7dceb7e223c0a4949e5e2af68c3896c5549e9d942a7c0a2f82de4b4f1048467f": "0x384c9eafa40ee73af86d2d4fafdfd1ee31e06696f2c23a0c1d18b0e8785b6ce1",
+    "0x7fdc727348e9937fdf4d1ce371e33669ccd01a66514298047926c8cf38059721": "0x67567fd2ac4f9e05bda2cd306f73bb75aec8f0ce6ea6a60f00665b3ba7440b62",
+    "0x804b4adedbf071a753a22b7f14d78b78c9417097e5826cae690132d4b0d1598b": "0x8bb2239f825595560b0a31bb2bf07b18cd578df9dfb500b00c386eac3fd8b609",
+    "0x97c630af696c3e707d37a9df6f374aa2de8cbad3b57d70fd716c420aff85ee21": "0x32dbea5832194b7fa3c189f428b3abd9be5dc93d536c7799e7dbe122f0b9da89",
+    "0xb7e994be576e566138244c31d8ed1a61a2c2326f7850970f250734441540ba47": "0x3c1a8efebca923e4a1cdc651c554d06a3548e7929d0c7971866bf59b7d6571b3",
+    "0xb8efc6c465a7b9a95be1d788850dc2fc5372dc35032c8128b1ffec136000ed33": "0xb31bd2f0dada0bf7ceae9b37708c9329967684b9b73b7cc4a99027477b46b132",
+    "0xbc04d3cb883befcd89fc74569e56a84bf7adb63ae3864cbd1c11314d21c1355a": "0x4783fc51f9862eb57357966692ae70dd540e68ea0848903b77500534194b7f1c",
+    "0xc0c056f15966bf95b1fe024d064fdf5dc1ff953912a563bc162ff480bb29829d": "0x2eaeb172f8893ca0778cc5470e73f871ffc45825607e7fc37e15db3c369898a8",
+    "0xc51d6c63ad7dee6c11da98be8f32ac5ca7df37533c82928856a61da22d2e15dd": "0x19ce56b3efb04248482e4368f2063c9ea6f0ca1cedaced0737fa06ece52c43e1",
+    "0xdf57220126314faa7501d1bf9080691a765b85dcd73ddbc413ad43a5981beb82": "0x4be72c05d6c702b486af22bf4f9a29e0c0c466b036fee37355e9e7fb7c67b66d"
   }
 }
diff --git a/soldeer.lock b/soldeer.lock
@@ -1,30 +1,33 @@
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "4.9.2"
+url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_2_22-01-2024_13:13:52_contracts.zip"
+checksum = "0f4450671798ea5659e6391876a3cf443ca50a696d9b556ac622ec7660bce306"
+integrity = "f69bd90f264280204b2a1172a02a2d20f3611f5993a61e5215647bec696a8420"
+
+[[dependencies]]
+name = "clones-with-immutable-args"
+version = "1.1.1"
+git = "[email protected]:wighawag/clones-with-immutable-args.git"
+rev = "f5ca191afea933d50a36d101009b5644dc28bc99"
 
 [[dependencies]]
 name = "forge-std"
 version = "1.9.1"
-source = "https://soldeer-revisions.s3.amazonaws.com/forge-std/v1_9_1_03-07-2024_14:44:59_forge-std-v1.9.1.zip"
+url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/v1_9_1_03-07-2024_14:44:59_forge-std-v1.9.1.zip"
 checksum = "110b35ad3604d91a919c521c71206c18cd07b29c750bd90b5cbbaf37288c9636"
-
-[[dependencies]]
-name = "solmate"
-version = "6.7.0"
-source = "[email protected]:transmissions11/solmate.git"
-checksum = "97bdb2003b70382996a79a406813f76417b1cf90"
+integrity = "389f8bfe6b6aad01915b1e38e6d4839f8189e8d4792b42be4e10d0a96a358e3f"
 
 [[dependencies]]
 name = "solady"
 version = "0.0.124"
-source = "https://soldeer-revisions.s3.amazonaws.com/solady/0_0_124_22-01-2024_13:28:04_solady.zip"
+url = "https://soldeer-revisions.s3.amazonaws.com/solady/0_0_124_22-01-2024_13:28:04_solady.zip"
 checksum = "9342385eaad08f9bb5408be0b41b241dd2b974c001f7da8c3b1ac552b52ce16b"
+integrity = "29d93e52694d8e858cf5a737257f4a6f21aefccaf803174fd00b9d686172ab27"
 
 [[dependencies]]
-name = "@openzeppelin-contracts"
-version = "4.9.2"
-source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_2_22-01-2024_13:13:52_contracts.zip"
-checksum = "0f4450671798ea5659e6391876a3cf443ca50a696d9b556ac622ec7660bce306"
-
-[[dependencies]]
-name = "clones-with-immutable-args"
-version = "1.1.1"
-source = "[email protected]:wighawag/clones-with-immutable-args.git"
-checksum = "f5ca191afea933d50a36d101009b5644dc28bc99"
+name = "solmate"
+version = "6.8.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/solmate/6_8_0_29-10-2024_19:01:45_solmate.zip"
+checksum = "e3ec0f0182cb3bbedecf8a0bcc39897266534a795ec732b2b03dafa285d78a5b"
+integrity = "a22e5a352de0231f671ee8adf5667bbe83c50012670083987bd1099a69feb429"
diff --git a/src/AtomicAuctionHouse.sol b/src/AtomicAuctionHouse.sol
@@ -7,7 +7,7 @@ import {IAtomicAuctionHouse} from "./interfaces/IAtomicAuctionHouse.sol";
 import {ICallback} from "./interfaces/ICallback.sol";
 
 // External libraries
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 
 // Internal libaries
 import {Transfer} from "./lib/Transfer.sol";

diff --git a/src/BatchAuctionHouse.sol b/src/BatchAuctionHouse.sol
@@ -12,7 +12,7 @@ import {Transfer} from "./lib/Transfer.sol";
 import {Callbacks} from "./lib/Callbacks.sol";
 
 // External libraries
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 
 // Auctions
 import {AuctionHouse} from "./bases/AuctionHouse.sol";

diff --git a/src/bases/AuctionHouse.sol b/src/bases/AuctionHouse.sol
@@ -13,8 +13,8 @@ import {Transfer} from "../lib/Transfer.sol";
 import {Callbacks} from "../lib/Callbacks.sol";
 
 // External libraries
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
-import {ReentrancyGuard} from "@solmate-6.7.0/utils/ReentrancyGuard.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
+import {ReentrancyGuard} from "@solmate-6.8.0/utils/ReentrancyGuard.sol";
 
 // Internal dependencies
 import {

diff --git a/src/bases/FeeManager.sol b/src/bases/FeeManager.sol
@@ -8,9 +8,9 @@ import {IFeeManager} from "../interfaces/IFeeManager.sol";
 import {Transfer} from "../lib/Transfer.sol";
 
 // External libraries
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
-import {ReentrancyGuard} from "@solmate-6.7.0/utils/ReentrancyGuard.sol";
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
+import {ReentrancyGuard} from "@solmate-6.8.0/utils/ReentrancyGuard.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 import {Keycode} from "../modules/Keycode.sol";
 

diff --git a/src/lib/Transfer.sol b/src/lib/Transfer.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity 0.8.19;
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
-import {SafeTransferLib} from "@solmate-6.7.0/utils/SafeTransferLib.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
+import {SafeTransferLib} from "@solmate-6.8.0/utils/SafeTransferLib.sol";
 import {IPermit2} from "./permit2/interfaces/IPermit2.sol";
 
 library Transfer {

diff --git a/src/modules/Derivative.sol b/src/modules/Derivative.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSL-1.1
 pragma solidity 0.8.19;
 
-import {ERC6909} from "@solmate-6.7.0/tokens/ERC6909.sol";
+import {ERC6909} from "@solmate-6.8.0/tokens/ERC6909.sol";
 import {ERC6909Metadata} from "../lib/ERC6909Metadata.sol";
 import {Module} from "./Modules.sol";
 import {IDerivative} from "../interfaces/modules/IDerivative.sol";

diff --git a/src/modules/Modules.sol b/src/modules/Modules.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity 0.8.19;
 
-import {Owned} from "@solmate-6.7.0/auth/Owned.sol";
+import {Owned} from "@solmate-6.8.0/auth/Owned.sol";
 import "./Keycode.sol";
 
 /// @notice    Abstract contract that provides functionality for installing and interacting with modules.

diff --git a/src/modules/auctions/atomic/FPS.sol b/src/modules/auctions/atomic/FPS.sol
@@ -12,7 +12,7 @@ import {Veecode, toVeecode} from "../../Modules.sol";
 import {AtomicAuctionModule} from "../AtomicAuctionModule.sol";
 
 // External libraries
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 /// @title  FixedPriceSale
 /// @notice A module for creating fixed price sale (atomic) auctions

diff --git a/src/modules/derivatives/CliffVesting.sol b/src/modules/derivatives/CliffVesting.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 // import {ClonesWithImmutableArgs} from "@clones-with-immutable-args-1.1.1/ClonesWithImmutableArgs.sol";
-// import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+// import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 // import "./Derivative.sol";
 
 // // TODO this only uses the ERC20 clones, need to convert to ERC6909 with optional ERC20 via wrapping the ERC6909

diff --git a/src/modules/derivatives/LinearVesting.sol b/src/modules/derivatives/LinearVesting.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSL-1.1
 pragma solidity 0.8.19;
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
-import {SafeTransferLib} from "@solmate-6.7.0/utils/SafeTransferLib.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
+import {SafeTransferLib} from "@solmate-6.8.0/utils/SafeTransferLib.sol";
 import {ClonesWithImmutableArgs} from
     "@clones-with-immutable-args-1.1.1/ClonesWithImmutableArgs.sol";
-import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 import {Base64} from "@openzeppelin-contracts-4.9.2/utils/Base64.sol";
 
 import {Timestamp} from "../../lib/Timestamp.sol";

diff --git a/src/modules/derivatives/SoulboundCloneERC20.sol b/src/modules/derivatives/SoulboundCloneERC20.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSL-1.1
 pragma solidity 0.8.19;
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 
 import {CloneERC20} from "../../lib/clones/CloneERC20.sol";
 

diff --git a/test/AtomicAuctionHouse/AuctionHouseTest.sol b/test/AtomicAuctionHouse/AuctionHouseTest.sol
@@ -14,7 +14,7 @@ import {Transfer} from "../../src/lib/Transfer.sol";
 
 // External libraries
 import {Test} from "@forge-std-1.9.1/Test.sol";
-import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 // Mocks
 import {MockAtomicAuctionModule} from "../modules/Auction/MockAtomicAuctionModule.sol";

diff --git a/test/AtomicAuctionHouse/auction.t.sol b/test/AtomicAuctionHouse/auction.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.19;
 import {AtomicAuctionHouseTest} from "./AuctionHouseTest.sol";
 
 // Mocks
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 import {MockBatchAuctionModule} from "../modules/Auction/MockBatchAuctionModule.sol";
 
 import {IAuctionHouse} from "../../src/interfaces/IAuctionHouse.sol";

diff --git a/test/AuctionHouse/MockAuctionHouse.sol b/test/AuctionHouse/MockAuctionHouse.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import {IAuction} from "../../src/interfaces/modules/IAuction.sol";
 import {IAuctionHouse} from "../../src/interfaces/IAuctionHouse.sol";
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 import {Transfer} from "../../src/lib/Transfer.sol";
 
 import {AuctionHouse} from "../../src/bases/AuctionHouse.sol";

diff --git a/test/AuctionHouse/sendPayout.t.sol b/test/AuctionHouse/sendPayout.t.sol
@@ -12,7 +12,7 @@ import {MockFeeOnTransferERC20} from "../lib/mocks/MockFeeOnTransferERC20.sol";
 import {Permit2User} from "../lib/permit2/Permit2User.sol";
 import {MockWrappedDerivative} from "../lib/mocks/MockWrappedDerivative.sol";
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 import {ICallback} from "../../src/interfaces/ICallback.sol";
 import {IAuctionHouse} from "../../src/interfaces/IAuctionHouse.sol";
 

diff --git a/test/AuctionHouse/setCondenser.t.sol b/test/AuctionHouse/setCondenser.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.19;
 import {Test} from "@forge-std-1.9.1/Test.sol";
 
 // Mocks
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 import {MockAuctionHouse} from "./MockAuctionHouse.sol";
 import {MockAtomicAuctionModule} from "../modules/Auction/MockAtomicAuctionModule.sol";
 import {MockDerivativeModule} from "../modules/derivatives/mocks/MockDerivativeModule.sol";

diff --git a/test/BatchAuctionHouse/AuctionHouseTest.sol b/test/BatchAuctionHouse/AuctionHouseTest.sol
@@ -14,7 +14,7 @@ import {Transfer} from "../../src/lib/Transfer.sol";
 
 // External libraries
 import {Test} from "@forge-std-1.9.1/Test.sol";
-import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 // Mocks
 import {MockBatchAuctionModule} from "../modules/Auction/MockBatchAuctionModule.sol";

diff --git a/test/BatchAuctionHouse/auction.t.sol b/test/BatchAuctionHouse/auction.t.sol
@@ -7,7 +7,7 @@ import {Transfer} from "../../src/lib/Transfer.sol";
 
 // Mocks
 import {MockAtomicAuctionModule} from "../modules/Auction/MockAtomicAuctionModule.sol";
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 
 import {IAuction} from "../../src/interfaces/modules/IAuction.sol";
 import {IAuctionHouse} from "../../src/interfaces/IAuctionHouse.sol";

diff --git a/test/callbacks/MockCallback.sol b/test/callbacks/MockCallback.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
 
 import {BaseCallback} from "../../src/bases/BaseCallback.sol";
 import {Callbacks} from "../../src/lib/Callbacks.sol";

diff --git a/test/lib/mocks/MockFeeOnTransferERC20.sol b/test/lib/mocks/MockFeeOnTransferERC20.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 
 contract MockFeeOnTransferERC20 is MockERC20 {
     uint256 public transferFee;

diff --git a/test/lib/mocks/MockWrappedDerivative.sol b/test/lib/mocks/MockWrappedDerivative.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol";
-import {ERC6909} from "@solmate-6.7.0/tokens/ERC6909.sol";
+import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol";
+import {ERC6909} from "@solmate-6.8.0/tokens/ERC6909.sol";
 
 import {Clone} from "@clones-with-immutable-args-1.1.1/Clone.sol";
 

diff --git a/test/modules/Auction/auction.t.sol b/test/modules/Auction/auction.t.sol
@@ -6,7 +6,7 @@ import {Test} from "@forge-std-1.9.1/Test.sol";
 import {console2} from "@forge-std-1.9.1/console2.sol";
 
 // Mocks
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 import {MockAtomicAuctionModule} from "./MockAtomicAuctionModule.sol";
 import {Permit2User} from "../../lib/permit2/Permit2User.sol";
 

diff --git a/test/modules/Auction/cancel.t.sol b/test/modules/Auction/cancel.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.19;
 import {Test} from "@forge-std-1.9.1/Test.sol";
 
 // Mocks
-import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol";
+import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol";
 import {MockAtomicAuctionModule} from "./MockAtomicAuctionModule.sol";
 import {Permit2User} from "../../lib/permit2/Permit2User.sol";
 

diff --git a/test/modules/auctions/EMP/settle.t.sol b/test/modules/auctions/EMP/settle.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 import {Module} from "../../../../src/modules/Modules.sol";
 import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol";

diff --git a/test/modules/auctions/FPB/FPBTest.sol b/test/modules/auctions/FPB/FPBTest.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.19;
 
 // Libraries
 import {Test} from "@forge-std-1.9.1/Test.sol";
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 // Mocks
 import {Permit2User} from "../../../lib/permit2/Permit2User.sol";

diff --git a/test/modules/auctions/FPS/FPSTest.sol b/test/modules/auctions/FPS/FPSTest.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.19;
 
 // Libraries
 import {Test} from "@forge-std-1.9.1/Test.sol";
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 // Mocks
 import {Permit2User} from "../../../lib/permit2/Permit2User.sol";

diff --git a/test/modules/auctions/FPS/auction.t.sol b/test/modules/auctions/FPS/auction.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {FixedPointMathLib as Math} from "@solmate-6.7.0/utils/FixedPointMathLib.sol";
+import {FixedPointMathLib as Math} from "@solmate-6.8.0/utils/FixedPointMathLib.sol";
 
 import {Module} from "../../../../src/modules/Modules.sol";
 import {IAuction} from "../../../../src/interfaces/modules/IAuction.sol";