diff --git a/deployments/.berachain-bartio-v1.0.0.json b/deployments/.berachain-bartio-v1.0.0.json new file mode 100644 index 00000000..e015f77d --- /dev/null +++ b/deployments/.berachain-bartio-v1.0.0.json @@ -0,0 +1,7 @@ +{ + "deployments.callbacks.BatchCappedMerkleAllowlist": "0x98E7125E5763E05e62ef6DA691FAb74875798Dfb", + "deployments.callbacks.BatchMerkleAllowlist": "0x98537660E6e5699c51ae92F40f2F44C4173E1fD5", + "deployments.callbacks.BatchTokenAllowlist": "0x988143a01124F899d163b9868D3220AEBA02a599", + "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x981B55d72AaA7F7dBfaFeafa2DfFfd3971305ec6", + "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE64012Ff6ae44540dA3b47147dB5551f1cB25137" +} diff --git a/deployments/.berachain-v1.0.0.json b/deployments/.berachain-v1.0.0.json new file mode 100644 index 00000000..7eca52aa --- /dev/null +++ b/deployments/.berachain-v1.0.0.json @@ -0,0 +1,6 @@ +{ + "deployments.callbacks.BatchCappedMerkleAllowlist": "0x984754FbFEDD9e0F02f22E00dee3FFa344070fEa", + "deployments.callbacks.BatchMerkleAllowlist": "0x98fA5b8503bF37f130e9F6D728CF4c7C2a3F5990", + "deployments.callbacks.BatchTokenAllowlist": "0x9805C84c7ba37615a549644fFEbaBA752e21A7cE", + "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98487D56d7873E0BE148d3e3a5a85D465aD5Ed44" +} diff --git a/foundry.toml b/foundry.toml index c2e02bd0..aa269609 100644 --- a/foundry.toml +++ b/foundry.toml @@ -6,11 +6,13 @@ fs_permissions = [ {access = "read-write", path = "./bytecode/"}, {access = "read", path = "./script/"}, {access = "read-write", path = "./deployments/"}, - {access = "read", path = "./dependencies/axis-core-1.0.1/script/env.json"}, + {access = "read", path = "./dependencies/axis-core-1.0.4/script/env.json"}, ] ffi = true solc_version = "0.8.19" evm_version = "paris" +optimizer = true +optimizer_runs = 200 [fuzz] runs = 1024 @@ -37,10 +39,11 @@ ignore = [ [soldeer] remappings_generate = false # Disable replacing existing/custom remappings +remappings_regenerate = false [dependencies] forge-std = { version = "1.9.1" } -axis-core = { version = "1.0.1" } +axis-core = { version = "1.0.4" } "@openzeppelin-contracts" = { version = "4.9.2" } "@openzeppelin-contracts-upgradeable" = { version = "4.9.2" } "@uniswap-v2-core" = { version = "1.0.1" } @@ -48,6 +51,6 @@ axis-core = { version = "1.0.1" } g-uni-v1-core = { version = "0.9.9", git = "git@github.com:Axis-Fi/g-uni-v1-core.git", rev = "d6bcb6e811e86d36bc836c002eb2e9a2c73d29ca" } "@uniswap-v2-periphery" = { version = "1.0.1", git = "git@github.com:Axis-Fi/uniswap-v2-periphery.git", rev = "19be650786731dfe43cac3aac7a2d1f0731d18e2" } "@uniswap-v3-periphery" = { version = "1.4.2-solc-0.8", git = "git@github.com:Uniswap/v3-periphery.git", rev = "b325bb0905d922ae61fcc7df85ee802e8df5e96c" } -solmate = { version = "6.7.0", git = "git@github.com:transmissions11/solmate.git", rev = "c892309933b25c03d32b1b0d674df7ae292ba925" } +solmate = { version = "6.8.0" } clones-with-immutable-args = { version = "1.1.1", git = "git@github.com:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" } solady = { version = "0.0.124" } diff --git a/remappings.txt b/remappings.txt index ba0a6edd..15d8ebcc 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,8 +1,8 @@ @forge-std-1.9.1=dependencies/forge-std-1.9.1/src -@axis-core-1.0.1=dependencies/axis-core-1.0.1/src -@axis-core-1.0.1-script=dependencies/axis-core-1.0.1/script -@axis-core-1.0.1-test=dependencies/axis-core-1.0.1/test -@solmate-6.7.0=dependencies/solmate-6.7.0/src +@axis-core-1.0.4=dependencies/axis-core-1.0.4/src +@axis-core-1.0.4-script=dependencies/axis-core-1.0.4/script +@axis-core-1.0.4-test=dependencies/axis-core-1.0.4/test +@solmate-6.8.0=dependencies/solmate-6.8.0/src @clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src @openzeppelin-contracts-4.9.2=dependencies/@openzeppelin-contracts-4.9.2 @openzeppelin-contracts-upgradeable-4.9.2=dependencies/@openzeppelin-contracts-upgradeable-4.9.2 diff --git a/script/deploy/Deploy.s.sol b/script/deploy/Deploy.s.sol index a4dc43b1..3daf8570 100644 --- a/script/deploy/Deploy.s.sol +++ b/script/deploy/Deploy.s.sol @@ -8,12 +8,12 @@ import {WithSalts} from "../salts/WithSalts.s.sol"; import {WithDeploySequence} from "./WithDeploySequence.s.sol"; // axis-core -import {Keycode, keycodeFromVeecode} from "@axis-core-1.0.1/modules/Keycode.sol"; -import {Module} from "@axis-core-1.0.1/modules/Modules.sol"; -import {AtomicAuctionHouse} from "@axis-core-1.0.1/AtomicAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; -import {IFeeManager} from "@axis-core-1.0.1/interfaces/IFeeManager.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {Keycode, keycodeFromVeecode} from "@axis-core-1.0.4/modules/Keycode.sol"; +import {Module} from "@axis-core-1.0.4/modules/Modules.sol"; +import {AtomicAuctionHouse} from "@axis-core-1.0.4/AtomicAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; +import {IFeeManager} from "@axis-core-1.0.4/interfaces/IFeeManager.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; // Uniswap import {IUniswapV2Router02} from "@uniswap-v2-periphery-1.0.1/interfaces/IUniswapV2Router02.sol"; diff --git a/script/deploy/WithEnvironment.s.sol b/script/deploy/WithEnvironment.s.sol index 9e827cb6..c17488b5 100644 --- a/script/deploy/WithEnvironment.s.sol +++ b/script/deploy/WithEnvironment.s.sol @@ -20,7 +20,7 @@ abstract contract WithEnvironment is Script { // Load environment file env = vm.readFile("./script/env.json"); - envAxisCore = vm.readFile("dependencies/axis-core-1.0.1/script/env.json"); + envAxisCore = vm.readFile("dependencies/axis-core-1.0.4/script/env.json"); } /// @notice Get address from environment file diff --git a/script/env.json b/script/env.json index e5c2c97b..02381313 100644 --- a/script/env.json +++ b/script/env.json @@ -96,6 +96,41 @@ } } }, + "berachain": { + "constants": {}, + "deployments": { + "callbacks": { + "BatchAllocatedMerkleAllowlist": "0x98487D56d7873E0BE148d3e3a5a85D465aD5Ed44", + "BatchCappedMerkleAllowlist": "0x984754FbFEDD9e0F02f22E00dee3FFa344070fEa", + "BatchMerkleAllowlist": "0x98fA5b8503bF37f130e9F6D728CF4c7C2a3F5990", + "BatchTokenAllowlist": "0x9805C84c7ba37615a549644fFEbaBA752e21A7cE" + } + } + }, + "berachain-bartio": { + "constants": { + "gUni": { + "factory": "0x0000000000000000000000000000000000000000" + }, + "uniswapV2": { + "factory": "0xb08Bfed214ba87d5d5D07B7DA573010016C44488", + "router": "0x406846114B2A9b65a8A2Ab702C2C57d27784dBA2" + }, + "uniswapV3": { + "factory": "0x217Cd80795EfCa5025d47023da5c03a24fA95356" + } + }, + "deployments": { + "callbacks": { + "BatchAllocatedMerkleAllowlist": "0x981B55d72AaA7F7dBfaFeafa2DfFfd3971305ec6", + "BatchCappedMerkleAllowlist": "0x98E7125E5763E05e62ef6DA691FAb74875798Dfb", + "BatchMerkleAllowlist": "0x98537660E6e5699c51ae92F40f2F44C4173E1fD5", + "BatchTokenAllowlist": "0x988143a01124F899d163b9868D3220AEBA02a599", + "BatchUniswapV2DirectToLiquidity": "0xE64012Ff6ae44540dA3b47147dB5551f1cB25137", + "BatchUniswapV3DirectToLiquidity": "0x0000000000000000000000000000000000000000" + } + } + }, "blast": { "constants": { "gUni": { diff --git a/script/patch/baseline.patch b/script/patch/baseline.patch index ca0fda81..53a2c1cf 100644 --- a/script/patch/baseline.patch +++ b/script/patch/baseline.patch @@ -20,8 +20,8 @@ index 82aa5d7..d889bae 100644 +import {FixedPointMathLib} from "@solady-0.0.124/utils/FixedPointMathLib.sol"; + +import {Kernel, Module, Keycode, toKeycode} from "../Kernel.sol"; -+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 {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; +import {FixedPoint96} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/FixedPoint96.sol"; +import {IUniswapV3Pool} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Pool.sol"; @@ -41,7 +41,7 @@ index 2afa1c3..e920452 100644 +pragma solidity ^0.8.19; -import {ERC20} from "solmate/tokens/ERC20.sol"; -+import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; ++import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; -import "src/Kernel.sol"; -import {TimeslotLib} from "src/utils/TimeslotLib.sol"; @@ -68,9 +68,9 @@ index 0ee6fe1..966c622 100644 -import {ERC20} from "solmate/tokens/ERC20.sol"; -import {SafeTransferLib} from "solmate/utils/SafeTransferLib.sol"; -import {FixedPointMathLib} from "solady/utils/FixedPointMathLib.sol"; -+import {Owned} from "@solmate-6.7.0/auth/Owned.sol"; -+import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; -+import {SafeTransferLib} from "@solmate-6.7.0/utils/SafeTransferLib.sol"; ++import {Owned} from "@solmate-6.8.0/auth/Owned.sol"; ++import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; ++import {SafeTransferLib} from "@solmate-6.8.0/utils/SafeTransferLib.sol"; +import {FixedPointMathLib} from "@solady-0.0.124/utils/FixedPointMathLib.sol"; -import {FixedPoint96} from "@uniswap/v3-core/contracts/libraries/FixedPoint96.sol"; @@ -120,10 +120,10 @@ index 4b9eb25..de74542 100644 -import {CREDTv1} from "src/modules/CREDT.v1.sol"; -import {LOOPSv1} from "src/modules/LOOPS.v1.sol"; -import {BlastClaimer} from "src/utils/BlastClaimer.sol"; -+import {Owned} from "@solmate-6.7.0/auth/Owned.sol"; -+import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; ++import {Owned} from "@solmate-6.8.0/auth/Owned.sol"; ++import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; +import {FixedPointMathLib} from "@solady-0.0.124/utils/FixedPointMathLib.sol"; -+import {SafeTransferLib} from "@solmate-6.7.0/utils/SafeTransferLib.sol"; ++import {SafeTransferLib} from "@solmate-6.8.0/utils/SafeTransferLib.sol"; +import {LiquidityAmounts} from "@uniswap-v3-periphery-1.4.2-solc-0.8/libraries/LiquidityAmounts.sol"; + +import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; diff --git a/script/salts/allowlist/AllowlistSalts.s.sol b/script/salts/allowlist/AllowlistSalts.s.sol index b02e4ec6..05bf51c9 100644 --- a/script/salts/allowlist/AllowlistSalts.s.sol +++ b/script/salts/allowlist/AllowlistSalts.s.sol @@ -7,7 +7,7 @@ import {WithSalts} from "../WithSalts.s.sol"; import {WithDeploySequence} from "../../deploy/WithDeploySequence.s.sol"; // Libraries -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; // Callbacks import {MerkleAllowlist} from "../../../src/callbacks/allowlists/MerkleAllowlist.sol"; diff --git a/script/salts/salts.json b/script/salts/salts.json index 0a351ed6..3c5f5059 100644 --- a/script/salts/salts.json +++ b/script/salts/salts.json @@ -17,6 +17,25 @@ "0xc329d36cea27b1f8e044c99a5eda27503fd6087f50b6d27b7bb12ac4493507e1": "0xb724ad108002e85a8144c2b305013b4d302fb1ef4a39d477f6d18e96bc219a3d", "0xf4d7d42633353828c29211c77c068516380a9c75c942fba88b1c01215c1001a6": "0xb07de304d67101f3cef70ee4e023a361d50b19eb13b59729724ad64e1f6aa88b" }, + "BatchAllocatedMerkleAllowlist": { + "0x4d30b549c7212559fb363873d0a919519a777aa48b43283e6706c559feedbe3d": "0x5239f778999011aa5272759786baedab1600ba6d77f9ae4a2c934fb4b3d914f9", + "0xa8c6a91bdfb6546f51cb4aa105f0033bc67c7cbea412e807ff77a7943e3f8a0b": "0x33c92f276c4fd329524904a6a677d4443d4191c7436cda2bcbe5148d5969f29f" + }, + "BatchCappedMerkleAllowlist": { + "0x91fb78cf155765271aa45840b7fee1e273aaa140eb6a76a8d70a2e65a42a50df": "0xf95c0944057d768df0d0300e0098a8b0f8f3444454f3de51c7c756ca31927757", + "0xaeb77d3e4122b31a81198a272b5b8791e362466d3c99cbc47248e09e428c08f9": "0x4298970166a5b6faa47b138c5f1ece12038c8812e556b7fc474183696aeea168" + }, + "BatchMerkleAllowlist": { + "0x2c19e119bd4a994c65fcda725733cff6eb19f4ae363d567bed23049bd8d334d6": "0x4e870cf3c9e80c61e93be5acfa14cf7aaa087bd3db5934ccd719dee5bebb2add", + "0xcedd373f78cb0d3f0efca85cf6c2566e0a877105b03c388c6f51d9a323ac7640": "0x9d86a16449c28f2082978fe8755483c6024a2604233161d2668f08844037a814" + }, + "BatchTokenAllowlist": { + "0xcc20b1dc13a7fc04d8bac79c68a17ff3c45371eeb2411d79bf2aa78766e00074": "0x114dfe75f62eb9994c4e73ea5a6220cfd47dde4913d0309e4aa9ae70af435499", + "0xf0d3d4127d1999acced92664243371da76876de1970aa4af1df7ae7684a4f35f": "0x08e30edec3dbf13f94f3205552b878dd6fd9a7b237ece3fd72821528a12f6184" + }, + "BatchUniswapV2DirectToLiquidity": { + "0x5425c9b9254dc9126002dd9f7b17b6ff643b79c5aed0ed2f116b70af3e163500": "0x262dcec529815acf06c81b7e0845ece78296140a248524da0cdd182fa8133ee9" + }, "CappedMerkleAllowlist": { "0x0249dded8310d17581f166a526ea9ded65b81112ccac0ee8a144e9770d2b8432": "0xf5746fa34aeff9866dc5ec58712f7f47045aea15db39a0aabf4dadc9d35c8854", "0x0ae7777d88dd21a8b9ca3dd9212307295a83aed438fef9dad0b62d57fbaf1025": "0x1de5ae5b126bd2cee8eb4f083080f5c30baa692580cf823fa5f382a7bfc70ac5", @@ -61,51 +80,52 @@ "0xf758779927a94ce49a1ea7e126142cca8472adf8cc3133234411737bb193ce41": "0xe826d67a09b7f9d1da2beacf436b833ae46aae40524c788fd02a10b5c3258c9a" }, "Test_AllocatedMerkleAllowlist": { - "0xb50d93e7156ecaf7b8e01d292b66cea14cc1a7b6830f183fd6e72f561523e23b": "0x2a5f4703b3701216527004c2f617b17acb95440ca086eef1f6ee54bf6f09a984", - "0xfafe60b7eb7a21b3b9a1b72d01dddba667a59544624fcd58b2b6e02fea347d7f": "0x78e03f1906753cf0f03e02e6af8940b82fe6dd0d45b6b2861c8f9af6bb968696" + "0x41f8d0682c0c351c9a7e3be972b89a4a9b23553b934088f1e2101118121941a3": "0x3f313929af4b1deb40049bb39ad51e7f198813b18390df284fe496b09bdd642d", + "0x994ced537007c38ba21c810d7c0fdf023088a818d02ecad3cdc94b4a95cc3375": "0x6b63033d73610d76bf58dc8809586115ce1efaedc4b0baf47d729261f15448d1" }, "Test_BaselineAllocatedAllowlist": { - "0x14c064a34f48cb07b634f2f2a22f44b85187670899ace155d6c76f19671bc0de": "0x38e6b7d07ebaa7a83b12baca0dfec874309d560b222af66b4b5bfb80e21a9dcd" + "0x5412ed32372fa7e0c8212d5546300d8aaac1708e718fc1e28b9a6fde2f00c29c": "0x2642f239529f0d33043337522f0db56064be4b2f9f6c2c9cfc09d36f4930b293" }, "Test_BaselineAllowlist": { - "0x12327ec4f7c7e2ade50980ecde80f9434866c0735855db8e344578d4b9f3bc10": "0x167426f42873e7b12f7b3a1d825e3fff59434c287010c0413486b89ae60c5746" + "0x7ff91cb07667005944b41d30d1cf5e19b36a1dc0483d48a614b214c7e7993069": "0x92988881f5f3199b14f8d4a42b0288cc0b03a79203d5e1738a4a85c4350dac74" }, "Test_BaselineAxisLaunch": { - "0x59d2d6db2d34a526ebacede4500fb7c8c342a8d0c2882501e32080fca6f73b61": "0xf97aba82c1ac37fe4afd1be79837d9085993fe0fcc106f0c605c944ab1ee944d" + "0x015efa4d0b39ebe205ba61d345d7a03b24bc55c7c8f7b71a9f7a0310f21371c6": "0x6f68298618b6ad68ec9c1946483b1b2e3d66b7b69e9899446dcc07c7e8651d05" }, "Test_BaselineCappedAllowlist": { - "0x6fc7138eb2534fee64013e8ea53936af69ab8f99cd630527e4622c717971b116": "0x4782b9130b4ea961914662d9cdbb1ad141f2a92d075c1d98100305b4e3beba61" + "0x61519e45b65ed982ee364cbc91ece9f0030e8c8747995c16d485cfe2f09eb5b3": "0xd4e819a632dacb901e456cfd37f5569cf5ef94fedd7f1bf9202aa1443a8afe2c" }, "Test_BaselineTokenAllowlist": { - "0x983601112ae210e257e9d90660546499ee381661a9c1d0987b609f780849ff2b": "0x4d631375f5160105bfe68a840ee13036d0603f38e6292023ca656dade62413ed" + "0xf2c9339adb8fd9d466007a94d111eeece37731dcaa121bf965ca1bd14efc8880": "0x964741c1ea1b8b404c1f4b232c9d601e739e05d59950fcb5f80544079520bfd3" }, "Test_CappedMerkleAllowlist": { - "0x29dc229c79db0e97b991dc5816522298310d7167312ac507208acbfdf1dbf5b4": "0xb587e8409114393923bd3bc128bdbcfb7f09ccbd55f1213e94471ae03434c0a6", - "0x76de86550db7e3bd70f21a58c886217a8d9704918c88d409e8104a25013bd701": "0x70a0959d63ce03f2f1240d0a3f52c94748971250407c10095655b50773aa570a" + "0x8a937a02de69f5046e8e94209226bf7015b4343e59860dacbf566d6c4b31804d": "0xb4805f0fca79a90628ecd8767b58c247bb091972028eba1ef46598fba8c0bfe2", + "0xe06889fc2e4ca76544bbae409ee26361cedc9a5c91ab05d9080039bc93af72d5": "0x44868efcb3b1a0bbec6e19533da6a7d6dd8fa16cd464dcf866aba1c9e171932d" }, "Test_GUniFactory": { - "0x03be53080cca58d45da8875100a5b3067b67b0c2b3f8f7e3e5894546a47568d5": "0xff5f02edac96ba795efc3e991746f87c36a9484a58f542c8c6f10d71613b5c08" + "0xac0379a57b230656f7c27bcd0873b98d6b461e55d26a3d95bc9be762fb6d55a0": "0x579256a43d33d926e621b1189bc7e40f50e7e8c4f1df2408299048fb3374e547" }, "Test_QuoteToken": { + "0x09d9ae22bfbfa131d639f287ea0015bc1b140c3fe1cc1929c4866bfba4f2c653": "0x9929415f26b845329bcee53f8a72154bac28bd08fd2cd3c8f455d61333eb93b4", "0x444caed4e1704bd9e214cb6c8a562f99e8806c74185f0debc4dca8dda3002ebb": "0xc53b4a2c323d99618c23aad7238495234e5eaddba872f3d079aa082872e098c5", "0x58fea475f289c0e3fcddb49b7900555f1a11d4b36caf2f735992776e1d007bba": "0x312f8d3dce539794a883e359491df7844e21233914dd4343fb483c44eeea3709", "0xb24a3be6a8bdede031d12faa20163604d4e3ac83d74bd62343527c19d02d6bd7": "0x2cad71e04bcb4b291ee2c07deb5949371de1e15c0f0fe33b0d33ed63e8b10e44" }, "Test_TokenAllowlist": { - "0xb22d05b8215fd932a637c877eca1c05634bb8ac4d0726f28c60d6bbe35112903": "0x7fc4719d70338e0a09224c432a07d9a2a1505e860dfe55c66be17ecc0b697e3a", - "0xb789c4afd1a886c5cfeb88fbd8b09ae8ec1b3869e50a0b8527289817f2e25218": "0xe33f41bdf6be9ac2a67f006ff3fa86cf5974fba590d3b14514751adf8d1f63ac" + "0x1853ce437fe0aac47e6a27cf93d2340c89bbc9314a157f8b1385bc7647bcb1ce": "0x47e8d0004fab986ce099c83696d7c48700cab9e46fb0a08cedc5aa861783058c", + "0x71369782a004f899a09f30d15d07aea6e386231640ec5a67bf3f0ab2a7a335fe": "0xd546a781322897bd5be8fe859ddca634489f023edcc804545f0dc039f046cc2c" }, "Test_UniswapV2DirectToLiquidity": { - "0x73e92c9fa7edbd64b00a40b781f6c757025945f0a761bc0b75764a6e401c91db": "0x82cef4b767766ea17c0232cad10798847f9c23fd04774b19b72ccd443321d6cb" + "0xf2b190e690a84e7be857af56398803943b855c7d589c61a9bb7795689a1f4086": "0x1446d0144b25261ce97bd9dfb74f095481741349546de789031f8189b39b687f" }, "Test_UniswapV2Router": { - "0x874532e739feebacbbe36f8c61fa97ab6ab1e6f7316e48763abf915e4af90c02": "0x5e9f7ca3ee281335c8a4fe4a4f33b950a5359d6a95fdc81892d9103ffd689659" + "0x82202d1015ce048c53cd194a4407a02c152ee834d4b503f3dbd41d3799ee0dbb": "0x67226a40a6c0b7968e2cf7c37240a16ea7f3deb588c2421d67ce10cb4494de7e" }, "Test_UniswapV3DirectToLiquidity": { - "0x8b8a67c1a77b2a6e6498afcc953996805627b791b07b022b75e61e93977bea7b": "0xb3bb1bc05e789ba09ea8b4273381d883a2377423cb399c907700ddda448864dd" + "0x74a1f48af0886eb246c7a5ccd3fddc432320f2a6eab09cdeb998e4ea545bf8b4": "0x8d2eb44a9a6a44de1d0e1ccb0b9999633aaaf2bcf2b7b6671ec32b357939e645" }, "Test_UniswapV3Factory": { - "0x862fde1cd9de35dc112d759742b17a659781dfe0dddb8136e0b63fa9c2e00dab": "0x5fbe68e6c093ea70e56909c84fe99890a237a4af7f7599ace8471a48c78a8aae" + "0xa56c03532e32af77794962a9477657f2caf39ad7070587c208fbf10ad705cf85": "0x19b9379f4d7172b3d99ce2f2bef5f3be5de1a581ed516956adcdf2f887aed861" }, "TokenAllowlist": { "0x09db47d395a68db033a3b222b9d1a212cec8422b03aeafc313aa4d2813c6dd60": "0xe07a005213f35e1f050a4da040d6bc3cae2ad333647b51a6ffa2e7941980043a", diff --git a/script/salts/test/TestSalts.s.sol b/script/salts/test/TestSalts.s.sol index 309c547e..37b0ee8b 100644 --- a/script/salts/test/TestSalts.s.sol +++ b/script/salts/test/TestSalts.s.sol @@ -9,9 +9,9 @@ import {WithSalts} from "../WithSalts.s.sol"; import {TestConstants} from "../../../test/Constants.sol"; // Libraries -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol"; // Uniswap import {UniswapV3Factory} from "../../../test/lib/uniswap-v3/UniswapV3Factory.sol"; diff --git a/soldeer.lock b/soldeer.lock index 6def550e..b776b989 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -1,78 +1,79 @@ [[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" +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 = "@openzeppelin-contracts-upgradeable" version = "4.9.2" -source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/4_9_2_22-01-2024_13:15:04_contracts-upgradeable.zip" +url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/4_9_2_22-01-2024_13:15:04_contracts-upgradeable.zip" checksum = "33a161bf7799dcac1475d2470615b56a8f9a9387cb8eef921b49816dbbc61c2b" integrity = "93ffee03edd3f6b0cad1830d6cb1937c5c870fab9eccaaeabbf1b752c6d4e8f1" [[dependencies]] name = "@uniswap-v2-core" version = "1.0.1" -source = "https://soldeer-revisions.s3.amazonaws.com/@uniswap-v2-core/1_0_1_22-01-2024_13:18:30_v2-core.zip" +url = "https://soldeer-revisions.s3.amazonaws.com/@uniswap-v2-core/1_0_1_22-01-2024_13:18:30_v2-core.zip" checksum = "efebb89237048771c19f52d3ce87ec4d0c591279bf1977c49f9e70e5fff530f0" integrity = "fda4e18a2a0c21eeddd8b6af36439f394e4ff74eb75705409a87b8952c9e2972" [[dependencies]] name = "@uniswap-v2-periphery" version = "1.0.1" -source = "git@github.com:Axis-Fi/uniswap-v2-periphery.git" -checksum = "19be650786731dfe43cac3aac7a2d1f0731d18e2" +git = "git@github.com:Axis-Fi/uniswap-v2-periphery.git" +rev = "19be650786731dfe43cac3aac7a2d1f0731d18e2" [[dependencies]] name = "@uniswap-v3-core" version = "1.0.1-solc-0.8-simulate" -source = "https://soldeer-revisions.s3.amazonaws.com/@uniswap-v3-core/1_0_1-solc-0_8-simulate_22-01-2024_13:19:52_v3-core.zip" +url = "https://soldeer-revisions.s3.amazonaws.com/@uniswap-v3-core/1_0_1-solc-0_8-simulate_22-01-2024_13:19:52_v3-core.zip" checksum = "566fc479fe846f41b211a0ddd66f875cd37e2ccb86b3fc4f7fa18bd55266ec7d" integrity = "75f26f8cb2cd8179eace9cdc4b248fa75faae799fc19c3e5a1f8f1b9d58d3188" [[dependencies]] name = "@uniswap-v3-periphery" version = "1.4.2-solc-0.8" -source = "git@github.com:Uniswap/v3-periphery.git" -checksum = "b325bb0905d922ae61fcc7df85ee802e8df5e96c" +git = "git@github.com:Uniswap/v3-periphery.git" +rev = "b325bb0905d922ae61fcc7df85ee802e8df5e96c" [[dependencies]] name = "axis-core" -version = "1.0.1" -source = "https://soldeer-revisions.s3.amazonaws.com/axis-core/1_0_1_22-08-2024_01:53:20_axis-core.zip" -checksum = "90ee8eca451f4454ad911c52d014bebbbacc3e0ba2260ad19e56e32598ea9d21" -integrity = "381ce84e3d947c891a53aa651a59328bdcba27534116bf5c55f57833a5603962" +version = "1.0.4" +url = "https://soldeer-revisions.s3.amazonaws.com/axis-core/1_0_4_06-02-2025_15:08:51_axis-core.zip" +checksum = "55fd0320955c9db547327054a2f3bbd0ea3655387bb0e1bba982ea45038a622e" +integrity = "f4e2264ccfcdd763dcc0d73f7deb893da3f99afe0279e4d39dae508734b1c7fa" [[dependencies]] name = "clones-with-immutable-args" version = "1.1.1" -source = "git@github.com:wighawag/clones-with-immutable-args.git" -checksum = "f5ca191afea933d50a36d101009b5644dc28bc99" +git = "git@github.com: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" -integrity = "229fada41d3af5734ba5e8b2715734b99c7d70335f3dd5a103d2a2e1cae831ba" +integrity = "389f8bfe6b6aad01915b1e38e6d4839f8189e8d4792b42be4e10d0a96a358e3f" [[dependencies]] name = "g-uni-v1-core" version = "0.9.9" -source = "git@github.com:Axis-Fi/g-uni-v1-core.git" -checksum = "d6bcb6e811e86d36bc836c002eb2e9a2c73d29ca" +git = "git@github.com:Axis-Fi/g-uni-v1-core.git" +rev = "d6bcb6e811e86d36bc836c002eb2e9a2c73d29ca" [[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 = "solmate" -version = "6.7.0" -source = "git@github.com:transmissions11/solmate.git" -checksum = "c892309933b25c03d32b1b0d674df7ae292ba925" +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/callbacks/allowlists/AllocatedMerkleAllowlist.sol b/src/callbacks/allowlists/AllocatedMerkleAllowlist.sol index 71cc45bc..9ffbae66 100644 --- a/src/callbacks/allowlists/AllocatedMerkleAllowlist.sol +++ b/src/callbacks/allowlists/AllocatedMerkleAllowlist.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.19; import {MerkleProof} from "@openzeppelin-contracts-4.9.2/utils/cryptography/MerkleProof.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; import {MerkleAllowlist} from "./MerkleAllowlist.sol"; diff --git a/src/callbacks/allowlists/CappedMerkleAllowlist.sol b/src/callbacks/allowlists/CappedMerkleAllowlist.sol index df5f6ec3..321600a7 100644 --- a/src/callbacks/allowlists/CappedMerkleAllowlist.sol +++ b/src/callbacks/allowlists/CappedMerkleAllowlist.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.19; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; import {MerkleAllowlist} from "./MerkleAllowlist.sol"; diff --git a/src/callbacks/allowlists/MerkleAllowlist.sol b/src/callbacks/allowlists/MerkleAllowlist.sol index aa648511..aeb43dfc 100644 --- a/src/callbacks/allowlists/MerkleAllowlist.sol +++ b/src/callbacks/allowlists/MerkleAllowlist.sol @@ -3,10 +3,10 @@ pragma solidity 0.8.19; import {MerkleProof} from "@openzeppelin-contracts-4.9.2/utils/cryptography/MerkleProof.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; /// @title MerkleAllowlist /// @notice This contract implements a merkle tree-based allowlist for buyers to participate in an auction. diff --git a/src/callbacks/allowlists/TokenAllowlist.sol b/src/callbacks/allowlists/TokenAllowlist.sol index d9d31943..41bfc600 100644 --- a/src/callbacks/allowlists/TokenAllowlist.sol +++ b/src/callbacks/allowlists/TokenAllowlist.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.19; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; /// @notice Generic interface for tokens that implement a balanceOf function (includes ERC-20 and ERC-721) interface ITokenBalance { diff --git a/src/callbacks/liquidity/BaseDTL.sol b/src/callbacks/liquidity/BaseDTL.sol index 5cb638b2..40689d7b 100644 --- a/src/callbacks/liquidity/BaseDTL.sol +++ b/src/callbacks/liquidity/BaseDTL.sol @@ -2,18 +2,18 @@ pragma solidity ^0.8.19; // Libraries -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"; // Callbacks -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; // AuctionHouse -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; -import {AuctionHouse} from "@axis-core-1.0.1/bases/AuctionHouse.sol"; -import {Keycode, wrapVeecode} from "@axis-core-1.0.1/modules/Modules.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; +import {AuctionHouse} from "@axis-core-1.0.4/bases/AuctionHouse.sol"; +import {Keycode, wrapVeecode} from "@axis-core-1.0.4/modules/Modules.sol"; /// @notice Base contract for DirectToLiquidity callbacks /// @dev This contract is intended to be inherited by a callback contract that supports a particular liquidity platform, such as Uniswap V2 or V3. diff --git a/src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol b/src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol index 16aa6d24..dbcd691f 100644 --- a/src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol +++ b/src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol @@ -2,18 +2,18 @@ pragma solidity 0.8.19; // Axis dependencies -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; import { Keycode as AxisKeycode, keycodeFromVeecode, fromKeycode as fromAxisKeycode -} from "@axis-core-1.0.1/modules/Keycode.sol"; -import {Module as AxisModule} from "@axis-core-1.0.1/modules/Modules.sol"; -import {IFixedPriceBatch} from "@axis-core-1.0.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; -import {Transfer} from "@axis-core-1.0.1/lib/Transfer.sol"; +} from "@axis-core-1.0.4/modules/Keycode.sol"; +import {Module as AxisModule} from "@axis-core-1.0.4/modules/Modules.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.4/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {Transfer} from "@axis-core-1.0.4/lib/Transfer.sol"; // Baseline dependencies import { @@ -31,7 +31,7 @@ import {ILOOPSv1} from "./lib/ILOOPS.sol"; import {FixedPointMathLib} from "@solady-0.0.124/utils/FixedPointMathLib.sol"; import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; import {SqrtPriceMath} from "../../../lib/uniswap-v3/SqrtPriceMath.sol"; -import {Owned} from "@solmate-6.7.0/auth/Owned.sol"; +import {Owned} from "@solmate-6.8.0/auth/Owned.sol"; /// @notice Axis auction callback to initialize a Baseline token using proceeds from a batch auction. /// @dev This contract combines Baseline's InitializeProtocol Policy and Axis' Callback functionality to build an Axis auction callback specific to Baseline V2 token launches diff --git a/src/callbacks/liquidity/BaselineV2/lib/IBPOOL.sol b/src/callbacks/liquidity/BaselineV2/lib/IBPOOL.sol index 7a259f29..8630f38c 100644 --- a/src/callbacks/liquidity/BaselineV2/lib/IBPOOL.sol +++ b/src/callbacks/liquidity/BaselineV2/lib/IBPOOL.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.0; import {IUniswapV3Pool} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Pool.sol"; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; enum Range { FLOOR, diff --git a/src/callbacks/liquidity/BaselineV2/lib/ICREDT.sol b/src/callbacks/liquidity/BaselineV2/lib/ICREDT.sol index fe1ca22c..cc32ceb3 100644 --- a/src/callbacks/liquidity/BaselineV2/lib/ICREDT.sol +++ b/src/callbacks/liquidity/BaselineV2/lib/ICREDT.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.0; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; /// @notice Individual credit account information per user struct CreditAccount { diff --git a/src/callbacks/liquidity/UniswapV2DTL.sol b/src/callbacks/liquidity/UniswapV2DTL.sol index 0fde44cc..5ebaf33e 100644 --- a/src/callbacks/liquidity/UniswapV2DTL.sol +++ b/src/callbacks/liquidity/UniswapV2DTL.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.19; // Libraries -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; import {FullMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/FullMath.sol"; -import {SafeTransferLib} from "@solmate-6.7.0/utils/SafeTransferLib.sol"; +import {SafeTransferLib} from "@solmate-6.8.0/utils/SafeTransferLib.sol"; // Uniswap import {IUniswapV2Factory} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Factory.sol"; diff --git a/src/callbacks/liquidity/UniswapV3DTL.sol b/src/callbacks/liquidity/UniswapV3DTL.sol index 7455d27f..9ef7a4d8 100644 --- a/src/callbacks/liquidity/UniswapV3DTL.sol +++ b/src/callbacks/liquidity/UniswapV3DTL.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.19; // Libraries -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"; // Uniswap import {IUniswapV3Pool} from diff --git a/src/lib/uniswap-v3/SqrtPriceMath.sol b/src/lib/uniswap-v3/SqrtPriceMath.sol index 5ab9b94c..d51495e9 100644 --- a/src/lib/uniswap-v3/SqrtPriceMath.sol +++ b/src/lib/uniswap-v3/SqrtPriceMath.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; import {FullMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/FullMath.sol"; /// @notice Library to calculate sqrtPriceX96 from token amounts diff --git a/test/Constants.sol b/test/Constants.sol index 9e2d8f32..6d75548c 100644 --- a/test/Constants.sol +++ b/test/Constants.sol @@ -1,19 +1,19 @@ /// SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.19; -import {TestConstants as TestConstantsCore} from "@axis-core-1.0.1-test/Constants.sol"; +import {TestConstants as TestConstantsCore} from "@axis-core-1.0.4-test/Constants.sol"; abstract contract TestConstants is TestConstantsCore { address internal constant _UNISWAP_V2_FACTORY = address(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); address internal constant _UNISWAP_V2_ROUTER = - address(0xAA90Afc992900e395D77cBb02D22FF5ef04bC9b9); + address(0xAA063dB6d010722f4d29c000a8832f101b944570); address internal constant _UNISWAP_V3_FACTORY = - address(0xAA6e0bD8aA20a2Fb885f378d8d98088aFEf56faD); - address internal constant _GUNI_FACTORY = address(0xAAF4DB8Fc32Cb0Fee88cAA609466608C10e01940); + address(0xAA3023F92819f02180b25795a5797f69F3627Cb7); + address internal constant _GUNI_FACTORY = address(0xAA19F2E4084fd3e49C198e616e181B82332000D5); address internal constant _BASELINE_KERNEL = address(0xBB); address internal constant _BASELINE_QUOTE_TOKEN = - address(0xAA5962E03F408601D4044cb90592f9075772641F); + address(0xAABA4a4ef5c3C62a3F40e61BC675331662dB4D96); address internal constant _CREATE2_DEPLOYER = address(0x4e59b44847b379578588920cA78FbF26c0B4956C); diff --git a/test/callbacks/AllocatedMerkleAllowlistAtomic.t.sol b/test/callbacks/AllocatedMerkleAllowlistAtomic.t.sol index 47c2ce37..6e8c6803 100644 --- a/test/callbacks/AllocatedMerkleAllowlistAtomic.t.sol +++ b/test/callbacks/AllocatedMerkleAllowlistAtomic.t.sol @@ -2,17 +2,17 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {AtomicAuctionHouse} from "@axis-core-1.0.1/AtomicAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {AtomicAuctionHouse} from "@axis-core-1.0.4/AtomicAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {AllocatedMerkleAllowlist} from "../../src/callbacks/allowlists/AllocatedMerkleAllowlist.sol"; -import {toVeecode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {toVeecode} from "@axis-core-1.0.4/modules/Keycode.sol"; import {WithSalts} from "../lib/WithSalts.sol"; import {TestConstants} from "../Constants.sol"; diff --git a/test/callbacks/AllocatedMerkleAllowlistBatch.t.sol b/test/callbacks/AllocatedMerkleAllowlistBatch.t.sol index 4e5a03bc..85ae62c9 100644 --- a/test/callbacks/AllocatedMerkleAllowlistBatch.t.sol +++ b/test/callbacks/AllocatedMerkleAllowlistBatch.t.sol @@ -2,17 +2,17 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {AllocatedMerkleAllowlist} from "../../src/callbacks/allowlists/AllocatedMerkleAllowlist.sol"; -import {toVeecode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {toVeecode} from "@axis-core-1.0.4/modules/Keycode.sol"; import {WithSalts} from "../lib/WithSalts.sol"; import {TestConstants} from "../Constants.sol"; diff --git a/test/callbacks/CappedMerkleAllowlistAtomic.t.sol b/test/callbacks/CappedMerkleAllowlistAtomic.t.sol index 0f9ef4bd..50473a97 100644 --- a/test/callbacks/CappedMerkleAllowlistAtomic.t.sol +++ b/test/callbacks/CappedMerkleAllowlistAtomic.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {AtomicAuctionHouse} from "@axis-core-1.0.1/AtomicAuctionHouse.sol"; +import {AtomicAuctionHouse} from "@axis-core-1.0.4/AtomicAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {CappedMerkleAllowlist} from "../../src/callbacks/allowlists/CappedMerkleAllowlist.sol"; diff --git a/test/callbacks/CappedMerkleAllowlistBatch.t.sol b/test/callbacks/CappedMerkleAllowlistBatch.t.sol index e1a42e60..6a14afc8 100644 --- a/test/callbacks/CappedMerkleAllowlistBatch.t.sol +++ b/test/callbacks/CappedMerkleAllowlistBatch.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {CappedMerkleAllowlist} from "../../src/callbacks/allowlists/CappedMerkleAllowlist.sol"; diff --git a/test/callbacks/TokenAllowlistAtomic.t.sol b/test/callbacks/TokenAllowlistAtomic.t.sol index d02e2a7c..69e11ab0 100644 --- a/test/callbacks/TokenAllowlistAtomic.t.sol +++ b/test/callbacks/TokenAllowlistAtomic.t.sol @@ -2,18 +2,18 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {AtomicAuctionHouse} from "@axis-core-1.0.1/AtomicAuctionHouse.sol"; +import {AtomicAuctionHouse} from "@axis-core-1.0.4/AtomicAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {TokenAllowlist, ITokenBalance} from "../../src/callbacks/allowlists/TokenAllowlist.sol"; import {WithSalts} from "../lib/WithSalts.sol"; import {TestConstants} from "../Constants.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"; contract TokenAllowlistAtomicTest is Test, Permit2User, WithSalts, TestConstants { using Callbacks for TokenAllowlist; diff --git a/test/callbacks/TokenAllowlistBatch.t.sol b/test/callbacks/TokenAllowlistBatch.t.sol index c7ddefd6..7d6cc178 100644 --- a/test/callbacks/TokenAllowlistBatch.t.sol +++ b/test/callbacks/TokenAllowlistBatch.t.sol @@ -2,18 +2,18 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {TokenAllowlist, ITokenBalance} from "../../src/callbacks/allowlists/TokenAllowlist.sol"; import {WithSalts} from "../lib/WithSalts.sol"; import {TestConstants} from "../Constants.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"; contract TokenAllowlistBatchTest is Test, Permit2User, WithSalts, TestConstants { using Callbacks for TokenAllowlist; diff --git a/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onBid.t.sol b/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onBid.t.sol index f26eefe1..9793e385 100644 --- a/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onBid.t.sol +++ b/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onBid.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAllocatedAllowlistTest} from "./BaselineAllocatedAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BALwithAllocatedAllowlist} from "../../../../../src/callbacks/liquidity/BaselineV2/BALwithAllocatedAllowlist.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onCreate.t.sol b/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onCreate.t.sol index 4b627622..462244c6 100644 --- a/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onCreate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/AllocatedAllowlist/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAllocatedAllowlistTest} from "./BaselineAllocatedAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BALwithAllocatedAllowlist} from "../../../../../src/callbacks/liquidity/BaselineV2/BALwithAllocatedAllowlist.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/Allowlist/onBid.t.sol b/test/callbacks/liquidity/BaselineV2/Allowlist/onBid.t.sol index 46ce8154..235a85a8 100644 --- a/test/callbacks/liquidity/BaselineV2/Allowlist/onBid.t.sol +++ b/test/callbacks/liquidity/BaselineV2/Allowlist/onBid.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAllowlistTest} from "./BaselineAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; contract BaselineAllowlistOnBidTest is BaselineAllowlistTest { // Use the @openzeppelin/merkle-tree package or the scripts in axis-utils to generate the merkle tree diff --git a/test/callbacks/liquidity/BaselineV2/Allowlist/onCreate.t.sol b/test/callbacks/liquidity/BaselineV2/Allowlist/onCreate.t.sol index 827347e3..5204e985 100644 --- a/test/callbacks/liquidity/BaselineV2/Allowlist/onCreate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/Allowlist/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAllowlistTest} from "./BaselineAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BALwithAllowlist} from "../../../../../src/callbacks/liquidity/BaselineV2/BALwithAllowlist.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/BPOOLMinter.sol b/test/callbacks/liquidity/BaselineV2/BPOOLMinter.sol index 96078758..d8bb5787 100644 --- a/test/callbacks/liquidity/BaselineV2/BPOOLMinter.sol +++ b/test/callbacks/liquidity/BaselineV2/BPOOLMinter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED 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 {Kernel, Keycode, toKeycode, Policy, Permissions} from "@baseline/Kernel.sol"; import {BPOOLv1} from "@baseline/modules/BPOOL.v1.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/BaselineAxisLaunchTest.sol b/test/callbacks/liquidity/BaselineV2/BaselineAxisLaunchTest.sol index 3ca062e2..dcd1160c 100644 --- a/test/callbacks/liquidity/BaselineV2/BaselineAxisLaunchTest.sol +++ b/test/callbacks/liquidity/BaselineV2/BaselineAxisLaunchTest.sol @@ -4,28 +4,28 @@ pragma solidity 0.8.19; // Test scaffolding import {Test} from "@forge-std-1.9.1/Test.sol"; import {console2} from "@forge-std-1.9.1/console2.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; import {WithSalts} from "../../../lib/WithSalts.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 {IUniswapV3Factory} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Factory.sol"; import {UniswapV3Factory} from "../../../lib/uniswap-v3/UniswapV3Factory.sol"; import {ComputeAddress} from "../../../lib/ComputeAddress.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; import {TestConstants} from "../../../Constants.sol"; import {SqrtPriceMath} from "../../../../src/lib/uniswap-v3/SqrtPriceMath.sol"; import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; // Axis core -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; -import {EncryptedMarginalPrice} from "@axis-core-1.0.1/modules/auctions/batch/EMP.sol"; -import {IFixedPriceBatch} from "@axis-core-1.0.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; -import {FixedPriceBatch} from "@axis-core-1.0.1/modules/auctions/batch/FPB.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; +import {EncryptedMarginalPrice} from "@axis-core-1.0.4/modules/auctions/batch/EMP.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.4/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {FixedPriceBatch} from "@axis-core-1.0.4/modules/auctions/batch/FPB.sol"; // Callbacks -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; import {BaselineAxisLaunch} from "../../../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onBid.t.sol b/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onBid.t.sol index 414c0aae..b8bf96f1 100644 --- a/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onBid.t.sol +++ b/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onBid.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineCappedAllowlistTest} from "./BaselineCappedAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BALwithCappedAllowlist} from "../../../../../src/callbacks/liquidity/BaselineV2/BALwithCappedAllowlist.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onCreate.t.sol b/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onCreate.t.sol index 2f54c6b5..dfcb8260 100644 --- a/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onCreate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/CappedAllowlist/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineCappedAllowlistTest} from "./BaselineCappedAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BALwithCappedAllowlist} from "../../../../../src/callbacks/liquidity/BaselineV2/BALwithCappedAllowlist.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/BaselineTokenAllowlistTest.sol b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/BaselineTokenAllowlistTest.sol index 1c22d339..ffd04eda 100644 --- a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/BaselineTokenAllowlistTest.sol +++ b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/BaselineTokenAllowlistTest.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; // Test scaffolding import {BaselineAxisLaunchTest} from "../BaselineAxisLaunchTest.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"; // Axis import { diff --git a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onBid.t.sol b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onBid.t.sol index 48b291b1..0f7ca91f 100644 --- a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onBid.t.sol +++ b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onBid.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineTokenAllowlistTest} from "./BaselineTokenAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; contract BaselineTokenAllowlistOnBidTest is BaselineTokenAllowlistTest { uint64 internal constant _BID_ID = 1; diff --git a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onCreate.t.sol b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onCreate.t.sol index 208c1bdb..651ff12e 100644 --- a/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onCreate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/TokenAllowlist/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineTokenAllowlistTest} from "./BaselineTokenAllowlistTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import { BALwithTokenAllowlist, ITokenBalance diff --git a/test/callbacks/liquidity/BaselineV2/onCancel.t.sol b/test/callbacks/liquidity/BaselineV2/onCancel.t.sol index 2cd74d82..cf8c3bc7 100644 --- a/test/callbacks/liquidity/BaselineV2/onCancel.t.sol +++ b/test/callbacks/liquidity/BaselineV2/onCancel.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAxisLaunchTest} from "./BaselineAxisLaunchTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaselineAxisLaunch} from "../../../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/onCreate.t.sol b/test/callbacks/liquidity/BaselineV2/onCreate.t.sol index c3175142..8745b420 100644 --- a/test/callbacks/liquidity/BaselineV2/onCreate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/onCreate.t.sol @@ -5,7 +5,7 @@ import {BaselineAxisLaunchTest} from "./BaselineAxisLaunchTest.sol"; import {BaselineAxisLaunch} from "../../../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {Range} from "@baseline/modules/BPOOL.v1.sol"; import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; diff --git a/test/callbacks/liquidity/BaselineV2/onCurate.t.sol b/test/callbacks/liquidity/BaselineV2/onCurate.t.sol index 59ccf2b4..d26bbaf6 100644 --- a/test/callbacks/liquidity/BaselineV2/onCurate.t.sol +++ b/test/callbacks/liquidity/BaselineV2/onCurate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {BaselineAxisLaunchTest} from "./BaselineAxisLaunchTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; contract BaselineOnCurateTest is BaselineAxisLaunchTest { // ============ Modifiers ============ // diff --git a/test/callbacks/liquidity/BaselineV2/onSettle.t.sol b/test/callbacks/liquidity/BaselineV2/onSettle.t.sol index 5d6878e6..9dad3740 100644 --- a/test/callbacks/liquidity/BaselineV2/onSettle.t.sol +++ b/test/callbacks/liquidity/BaselineV2/onSettle.t.sol @@ -3,11 +3,11 @@ pragma solidity 0.8.19; import {BaselineAxisLaunchTest} from "./BaselineAxisLaunchTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaselineAxisLaunch} from "../../../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; import {Range} from "@baseline/modules/BPOOL.v1.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; import {IUniswapV3Pool} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Pool.sol"; import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; diff --git a/test/callbacks/liquidity/UniswapV2DTL/UniswapV2DTLTest.sol b/test/callbacks/liquidity/UniswapV2DTL/UniswapV2DTLTest.sol index 7f40c784..87f3accb 100644 --- a/test/callbacks/liquidity/UniswapV2DTL/UniswapV2DTLTest.sol +++ b/test/callbacks/liquidity/UniswapV2DTL/UniswapV2DTLTest.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; import {IUniswapV2Factory} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Factory.sol"; import {UniswapV2FactoryClone} from "../../../lib/uniswap-v2/UniswapV2FactoryClone.sol"; @@ -17,13 +17,13 @@ import {UniswapV2Router02} from "@uniswap-v2-periphery-1.0.1/UniswapV2Router02.s import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV2DirectToLiquidity} from "../../../../src/callbacks/liquidity/UniswapV2DTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; import {MockBatchAuctionModule} from - "@axis-core-1.0.1-test/modules/Auction/MockBatchAuctionModule.sol"; + "@axis-core-1.0.4-test/modules/Auction/MockBatchAuctionModule.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.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 {WithSalts} from "../../../lib/WithSalts.sol"; import {TestConstants} from "../../../Constants.sol"; diff --git a/test/callbacks/liquidity/UniswapV2DTL/onCancel.t.sol b/test/callbacks/liquidity/UniswapV2DTL/onCancel.t.sol index 8660a47f..507a8ff0 100644 --- a/test/callbacks/liquidity/UniswapV2DTL/onCancel.t.sol +++ b/test/callbacks/liquidity/UniswapV2DTL/onCancel.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV2DirectToLiquidityTest} from "./UniswapV2DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; contract UniswapV2DirectToLiquidityOnCancelTest is UniswapV2DirectToLiquidityTest { diff --git a/test/callbacks/liquidity/UniswapV2DTL/onCreate.t.sol b/test/callbacks/liquidity/UniswapV2DTL/onCreate.t.sol index e8caafc2..68debc21 100644 --- a/test/callbacks/liquidity/UniswapV2DTL/onCreate.t.sol +++ b/test/callbacks/liquidity/UniswapV2DTL/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV2DirectToLiquidityTest} from "./UniswapV2DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV2DirectToLiquidity} from "../../../../src/callbacks/liquidity/UniswapV2DTL.sol"; diff --git a/test/callbacks/liquidity/UniswapV2DTL/onCurate.t.sol b/test/callbacks/liquidity/UniswapV2DTL/onCurate.t.sol index 787b82d7..2b5c6e21 100644 --- a/test/callbacks/liquidity/UniswapV2DTL/onCurate.t.sol +++ b/test/callbacks/liquidity/UniswapV2DTL/onCurate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV2DirectToLiquidityTest} from "./UniswapV2DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; contract UniswapV2DirectToLiquidityOnCurateTest is UniswapV2DirectToLiquidityTest { diff --git a/test/callbacks/liquidity/UniswapV2DTL/onSettle.t.sol b/test/callbacks/liquidity/UniswapV2DTL/onSettle.t.sol index 0c914b46..63c535cd 100644 --- a/test/callbacks/liquidity/UniswapV2DTL/onSettle.t.sol +++ b/test/callbacks/liquidity/UniswapV2DTL/onSettle.t.sol @@ -4,16 +4,16 @@ pragma solidity 0.8.19; import {UniswapV2DirectToLiquidityTest} from "./UniswapV2DTLTest.sol"; // Libraries -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; // Uniswap import {IUniswapV2Pair} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Pair.sol"; // AuctionHouse -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {console2} from "@forge-std-1.9.1/console2.sol"; diff --git a/test/callbacks/liquidity/UniswapV3DTL/UniswapV3DTLTest.sol b/test/callbacks/liquidity/UniswapV3DTL/UniswapV3DTLTest.sol index 0a8944b6..eb2c0561 100644 --- a/test/callbacks/liquidity/UniswapV3DTL/UniswapV3DTLTest.sol +++ b/test/callbacks/liquidity/UniswapV3DTL/UniswapV3DTLTest.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; import {GUniFactory} from "@g-uni-v1-core-0.9.9/GUniFactory.sol"; import {GUniPool} from "@g-uni-v1-core-0.9.9/GUniPool.sol"; @@ -18,13 +18,13 @@ import {UniswapV3Factory} from "../../../lib/uniswap-v3/UniswapV3Factory.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV3DirectToLiquidity} from "../../../../src/callbacks/liquidity/UniswapV3DTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; import {MockBatchAuctionModule} from - "@axis-core-1.0.1-test/modules/Auction/MockBatchAuctionModule.sol"; + "@axis-core-1.0.4-test/modules/Auction/MockBatchAuctionModule.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.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 {WithSalts} from "../../../lib/WithSalts.sol"; import {console2} from "@forge-std-1.9.1/console2.sol"; diff --git a/test/callbacks/liquidity/UniswapV3DTL/onCancel.t.sol b/test/callbacks/liquidity/UniswapV3DTL/onCancel.t.sol index ccaa7e35..afa3008d 100644 --- a/test/callbacks/liquidity/UniswapV3DTL/onCancel.t.sol +++ b/test/callbacks/liquidity/UniswapV3DTL/onCancel.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV3DirectToLiquidityTest} from "./UniswapV3DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; contract UniswapV3DirectToLiquidityOnCancelTest is UniswapV3DirectToLiquidityTest { diff --git a/test/callbacks/liquidity/UniswapV3DTL/onCreate.t.sol b/test/callbacks/liquidity/UniswapV3DTL/onCreate.t.sol index 458680f9..73ba7872 100644 --- a/test/callbacks/liquidity/UniswapV3DTL/onCreate.t.sol +++ b/test/callbacks/liquidity/UniswapV3DTL/onCreate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV3DirectToLiquidityTest} from "./UniswapV3DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV3DirectToLiquidity} from "../../../../src/callbacks/liquidity/UniswapV3DTL.sol"; diff --git a/test/callbacks/liquidity/UniswapV3DTL/onCurate.t.sol b/test/callbacks/liquidity/UniswapV3DTL/onCurate.t.sol index b84315af..7ff8103b 100644 --- a/test/callbacks/liquidity/UniswapV3DTL/onCurate.t.sol +++ b/test/callbacks/liquidity/UniswapV3DTL/onCurate.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.19; import {UniswapV3DirectToLiquidityTest} from "./UniswapV3DTLTest.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; contract UniswapV3DirectToLiquidityOnCurateTest is UniswapV3DirectToLiquidityTest { diff --git a/test/callbacks/liquidity/UniswapV3DTL/onSettle.t.sol b/test/callbacks/liquidity/UniswapV3DTL/onSettle.t.sol index 1cdc3a62..c0baab11 100644 --- a/test/callbacks/liquidity/UniswapV3DTL/onSettle.t.sol +++ b/test/callbacks/liquidity/UniswapV3DTL/onSettle.t.sol @@ -4,8 +4,8 @@ pragma solidity 0.8.19; import {UniswapV3DirectToLiquidityTest} from "./UniswapV3DTLTest.sol"; // Libraries -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; // Uniswap import {IUniswapV3Pool} from @@ -17,10 +17,10 @@ import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickM import {GUniPool} from "@g-uni-v1-core-0.9.9/GUniPool.sol"; // AuctionHouse -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; import {BaseDirectToLiquidity} from "../../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV3DirectToLiquidity} from "../../../../src/callbacks/liquidity/UniswapV3DTL.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {console2} from "@forge-std-1.9.1/console2.sol"; diff --git a/test/invariant/Setup.sol b/test/invariant/Setup.sol index 2ab4dbe6..c1b62db3 100644 --- a/test/invariant/Setup.sol +++ b/test/invariant/Setup.sol @@ -2,15 +2,15 @@ pragma solidity 0.8.19; import {Test} from "@forge-std-1.9.1/Test.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; -import {EncryptedMarginalPrice} from "@axis-core-1.0.1/modules/auctions/batch/EMP.sol"; -import {IFixedPriceBatch} from "@axis-core-1.0.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; -import {FixedPriceBatch} from "@axis-core-1.0.1/modules/auctions/batch/FPB.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; +import {EncryptedMarginalPrice} from "@axis-core-1.0.4/modules/auctions/batch/EMP.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.4/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {FixedPriceBatch} from "@axis-core-1.0.4/modules/auctions/batch/FPB.sol"; import {IUniswapV2Factory} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Factory.sol"; import {UniswapV2FactoryClone} from "../lib/uniswap-v2/UniswapV2FactoryClone.sol"; @@ -26,25 +26,25 @@ import {IUniswapV3Factory} from import {UniswapV3Factory} from "../lib/uniswap-v3/UniswapV3Factory.sol"; import {WETH9} from "./modules/WETH.sol"; import {SwapRouter} from "./modules/uniswapv3-periphery/SwapRouter.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; import {SqrtPriceMath} from "../../src/lib/uniswap-v3/SqrtPriceMath.sol"; import {TickMath} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/libraries/TickMath.sol"; import {BaseDirectToLiquidity} from "../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV2DirectToLiquidity} from "../../src/callbacks/liquidity/UniswapV2DTL.sol"; import {UniswapV3DirectToLiquidity} from "../../src/callbacks/liquidity/UniswapV3DTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; import {MockBatchAuctionModule} from - "@axis-core-1.0.1-test/modules/Auction/MockBatchAuctionModule.sol"; + "@axis-core-1.0.4-test/modules/Auction/MockBatchAuctionModule.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.sol"; import {BaselineAxisLaunch} from "../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; // Baseline import {Kernel, Actions, Module, toKeycode as toBaselineKeycode} from "@baseline/Kernel.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 {BPOOLv1, Range, Position} from "@baseline/modules/BPOOL.v1.sol"; import {BPOOLMinter} from "./modules/BPOOLMinter.sol"; import {CREDTMinter} from "./modules/CREDTMinter.sol"; diff --git a/test/invariant/handlers/BaselineDTLHandler.sol b/test/invariant/handlers/BaselineDTLHandler.sol index fb7b89c5..c5b112d9 100644 --- a/test/invariant/handlers/BaselineDTLHandler.sol +++ b/test/invariant/handlers/BaselineDTLHandler.sol @@ -4,14 +4,14 @@ pragma solidity ^0.8.0; import {BeforeAfter} from "../helpers/BeforeAfter.sol"; import {Assertions} from "../helpers/Assertions.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; -import {IFixedPriceBatch} from "@axis-core-1.0.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.4/interfaces/modules/auctions/IFixedPriceBatch.sol"; import {GUniFactory} from "@g-uni-v1-core-0.9.9/GUniFactory.sol"; import {GUniPool} from "@g-uni-v1-core-0.9.9/GUniPool.sol"; @@ -21,22 +21,22 @@ import {IUniswapV3Factory} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Factory.sol"; import {SqrtPriceMath} from "../../../src/lib/uniswap-v3/SqrtPriceMath.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaselineAxisLaunch} from "../../../src/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; import {BaseDirectToLiquidity} from "../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV3DirectToLiquidity} from "../../../src/callbacks/liquidity/UniswapV3DTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; import {MockBatchAuctionModule} from - "@axis-core-1.0.1-test/modules/Auction/MockBatchAuctionModule.sol"; + "@axis-core-1.0.4-test/modules/Auction/MockBatchAuctionModule.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; -import {Veecode} from "@axis-core-1.0.1/modules/Modules.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.sol"; +import {Veecode} from "@axis-core-1.0.4/modules/Modules.sol"; import {BPOOLv1, Range, Position} from "@baseline/modules/BPOOL.v1.sol"; -import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; abstract contract BaselineDTLHandler is BeforeAfter, Assertions { /*////////////////////////////////////////////////////////////////////////// diff --git a/test/invariant/handlers/BaselinePoolHandler.sol b/test/invariant/handlers/BaselinePoolHandler.sol index 25bdd21c..08be6e44 100644 --- a/test/invariant/handlers/BaselinePoolHandler.sol +++ b/test/invariant/handlers/BaselinePoolHandler.sol @@ -8,7 +8,7 @@ import {IUniswapV3Pool} from "../../../lib/baseline-v2/lib/v3-core/contracts/interfaces/IUniswapV3Pool.sol"; import {ISwapRouter} from "../modules/uniswapv3-periphery/interfaces/ISwapRouter.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"; abstract contract BaselinePoolHandler is BeforeAfter, Assertions { function BaselinePoolHandler_donate(uint256 tokenIndexSeed, uint256 amount) public { diff --git a/test/invariant/handlers/UniswapV2DTLHandler.sol b/test/invariant/handlers/UniswapV2DTLHandler.sol index bf148c6a..ea5d5398 100644 --- a/test/invariant/handlers/UniswapV2DTLHandler.sol +++ b/test/invariant/handlers/UniswapV2DTLHandler.sol @@ -4,19 +4,19 @@ pragma solidity ^0.8.0; import {BeforeAfter} from "../helpers/BeforeAfter.sol"; import {Assertions} from "../helpers/Assertions.sol"; -import {UniswapV2DirectToLiquidity} from "../../../src//callbacks/liquidity/UniswapV2DTL.sol"; -import {BaseDirectToLiquidity} from "../../../src//callbacks/liquidity/BaseDTL.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {UniswapV2DirectToLiquidity} from "../../../src/callbacks/liquidity/UniswapV2DTL.sol"; +import {BaseDirectToLiquidity} from "../../../src/callbacks/liquidity/BaseDTL.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {IUniswapV2Pair} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Pair.sol"; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; import {IUniswapV2Pair} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Pair.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; abstract contract UniswapV2DTLHandler is BeforeAfter, Assertions { /*////////////////////////////////////////////////////////////////////////// diff --git a/test/invariant/handlers/UniswapV3DTLHandler.sol b/test/invariant/handlers/UniswapV3DTLHandler.sol index bc6367b5..2694ceb2 100644 --- a/test/invariant/handlers/UniswapV3DTLHandler.sol +++ b/test/invariant/handlers/UniswapV3DTLHandler.sol @@ -4,13 +4,13 @@ pragma solidity ^0.8.0; import {BeforeAfter} from "../helpers/BeforeAfter.sol"; import {Assertions} from "../helpers/Assertions.sol"; -import {Callbacks} from "@axis-core-1.0.1/lib/Callbacks.sol"; -import {Permit2User} from "@axis-core-1.0.1-test/lib/permit2/Permit2User.sol"; +import {Callbacks} from "@axis-core-1.0.4/lib/Callbacks.sol"; +import {Permit2User} from "@axis-core-1.0.4-test/lib/permit2/Permit2User.sol"; -import {IAuction} from "@axis-core-1.0.1/interfaces/modules/IAuction.sol"; -import {IAuctionHouse} from "@axis-core-1.0.1/interfaces/IAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; -import {ILinearVesting} from "@axis-core-1.0.1/interfaces/modules/derivatives/ILinearVesting.sol"; +import {IAuction} from "@axis-core-1.0.4/interfaces/modules/IAuction.sol"; +import {IAuctionHouse} from "@axis-core-1.0.4/interfaces/IAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; +import {ILinearVesting} from "@axis-core-1.0.4/interfaces/modules/derivatives/ILinearVesting.sol"; import {GUniFactory} from "@g-uni-v1-core-0.9.9/GUniFactory.sol"; import {GUniPool} from "@g-uni-v1-core-0.9.9/GUniPool.sol"; @@ -21,19 +21,19 @@ import {IUniswapV3Factory} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Factory.sol"; import {SqrtPriceMath} from "../../../src/lib/uniswap-v3/SqrtPriceMath.sol"; -import {BaseDirectToLiquidity} from "../../../src//callbacks/liquidity/BaseDTL.sol"; -import {BaseCallback} from "@axis-core-1.0.1/bases/BaseCallback.sol"; +import {BaseDirectToLiquidity} from "../../../src/callbacks/liquidity/BaseDTL.sol"; +import {BaseCallback} from "@axis-core-1.0.4/bases/BaseCallback.sol"; import {BaseDirectToLiquidity} from "../../../src/callbacks/liquidity/BaseDTL.sol"; import {UniswapV3DirectToLiquidity} from "../../../src/callbacks/liquidity/UniswapV3DTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; import {MockBatchAuctionModule} from - "@axis-core-1.0.1-test/modules/Auction/MockBatchAuctionModule.sol"; + "@axis-core-1.0.4-test/modules/Auction/MockBatchAuctionModule.sol"; -import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.1/modules/Keycode.sol"; +import {keycodeFromVeecode, toKeycode} from "@axis-core-1.0.4/modules/Keycode.sol"; -import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol"; -import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; -import {FixedPointMathLib} from "@solmate-6.7.0/utils/FixedPointMathLib.sol"; +import {MockERC20} from "@solmate-6.8.0/test/utils/mocks/MockERC20.sol"; +import {ERC20} from "@solmate-6.8.0/tokens/ERC20.sol"; +import {FixedPointMathLib} from "@solmate-6.8.0/utils/FixedPointMathLib.sol"; abstract contract UniswapV3DTLHandler is BeforeAfter, Assertions { /*////////////////////////////////////////////////////////////////////////// diff --git a/test/invariant/handlers/V2PoolHandler.sol b/test/invariant/handlers/V2PoolHandler.sol index 00dd7236..1daaebac 100644 --- a/test/invariant/handlers/V2PoolHandler.sol +++ b/test/invariant/handlers/V2PoolHandler.sol @@ -6,7 +6,7 @@ import {Assertions} from "../helpers/Assertions.sol"; import {IUniswapV2Pair} from "@uniswap-v2-core-1.0.1/interfaces/IUniswapV2Pair.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"; abstract contract V2PoolHandler is BeforeAfter, Assertions { function V2PoolHandler_donate(uint256 tokenIndexSeed, uint256 amount) public { diff --git a/test/invariant/handlers/V3PoolHandler.sol b/test/invariant/handlers/V3PoolHandler.sol index 97b44267..df39604d 100644 --- a/test/invariant/handlers/V3PoolHandler.sol +++ b/test/invariant/handlers/V3PoolHandler.sol @@ -7,7 +7,7 @@ import {Assertions} from "../helpers/Assertions.sol"; import {IUniswapV3Pool} from "@uniswap-v3-core-1.0.1-solc-0.8-simulate/interfaces/IUniswapV3Pool.sol"; import {ISwapRouter} from "../modules/uniswapv3-periphery/interfaces/ISwapRouter.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"; abstract contract V3PoolHandler is BeforeAfter, Assertions { function V3PoolHandler_donate(uint256 tokenIndexSeed, uint256 amount) public { diff --git a/test/invariant/helpers/BeforeAfter.sol b/test/invariant/helpers/BeforeAfter.sol index 7b87dda3..ff09b22f 100644 --- a/test/invariant/helpers/BeforeAfter.sol +++ b/test/invariant/helpers/BeforeAfter.sol @@ -3,10 +3,10 @@ pragma solidity ^0.8.0; import {Setup} from "../Setup.sol"; -import {Veecode} from "@axis-core-1.0.1/modules/Keycode.sol"; -import {ICallback} from "@axis-core-1.0.1/interfaces/ICallback.sol"; +import {Veecode} from "@axis-core-1.0.4/modules/Keycode.sol"; +import {ICallback} from "@axis-core-1.0.4/interfaces/ICallback.sol"; import {BaseDirectToLiquidity} from "../../../src/callbacks/liquidity/BaseDTL.sol"; -import {LinearVesting} from "@axis-core-1.0.1/modules/derivatives/LinearVesting.sol"; +import {LinearVesting} from "@axis-core-1.0.4/modules/derivatives/LinearVesting.sol"; abstract contract BeforeAfter is Setup { struct Vars { diff --git a/test/invariant/mocks/MockBatchAuctionHouse.sol b/test/invariant/mocks/MockBatchAuctionHouse.sol index 93a6856c..4af143d2 100644 --- a/test/invariant/mocks/MockBatchAuctionHouse.sol +++ b/test/invariant/mocks/MockBatchAuctionHouse.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.19; -import {BatchAuctionHouse} from "@axis-core-1.0.1/BatchAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.4/BatchAuctionHouse.sol"; -import {Veecode} from "@axis-core-1.0.1/modules/Modules.sol"; +import {Veecode} from "@axis-core-1.0.4/modules/Modules.sol"; contract MockBatchAuctionHouse is BatchAuctionHouse { constructor( diff --git a/test/invariant/modules/BPOOLMinter.sol b/test/invariant/modules/BPOOLMinter.sol index e8c8eac6..61c9ddb2 100644 --- a/test/invariant/modules/BPOOLMinter.sol +++ b/test/invariant/modules/BPOOLMinter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED 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 {Kernel, Keycode, toKeycode, Policy, Permissions} from "@baseline/Kernel.sol"; import {BPOOLv1} from "@baseline/modules/BPOOL.v1.sol"; diff --git a/test/invariant/modules/CREDTMinter.sol b/test/invariant/modules/CREDTMinter.sol index 28d0e7d1..1f7764ee 100644 --- a/test/invariant/modules/CREDTMinter.sol +++ b/test/invariant/modules/CREDTMinter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.0; -import {Owned} from "@solmate-6.7.0/auth/Owned.sol"; +import {Owned} from "@solmate-6.8.0/auth/Owned.sol"; import {Kernel, Keycode, toKeycode, Policy} from "@baseline/Kernel.sol"; import {CREDTv1} from "@baseline/modules/CREDT.v1.sol";