From 4e990dfad027dc5ca60fdf8d155910b7d7f490fb Mon Sep 17 00:00:00 2001 From: Jem <0x0xjem@gmail.com> Date: Thu, 18 Jul 2024 15:38:25 +0400 Subject: [PATCH 1/2] Update axis-core and axis-periphery versions --- packages/axis-utils/foundry.toml | 4 ++-- packages/axis-utils/remappings.txt | 8 ++++---- .../developer-guide/atomic/purchase.s.sol | 4 ++-- .../script/developer-guide/batch/abort.s.sol | 2 +- .../developer-guide/batch/bid-cancel.s.sol | 4 ++-- .../developer-guide/batch/bid-claim.s.sol | 2 +- .../developer-guide/batch/bid-submit.s.sol | 6 +++--- .../script/developer-guide/batch/settle.s.sol | 6 +++--- .../developer-guide/cancel-auction.s.sol | 2 +- .../developer-guide/create-auction.s.sol | 12 +++++------ .../script/developer-guide/curation.s.sol | 6 +++--- .../developer-guide/using-derivatives.s.sol | 16 +++++++-------- .../EncryptedMarginalPrice/TestData.s.sol | 10 +++++----- .../FixedPriceBatch-BaseDTL/TestData.s.sol | 20 +++++++++---------- .../test/FixedPriceBatch/TestData.s.sol | 20 +++++++++---------- packages/axis-utils/soldeer.lock | 10 +++++----- .../src/lib/EncryptedMarginalPriceBid.sol | 2 +- 17 files changed, 67 insertions(+), 67 deletions(-) diff --git a/packages/axis-utils/foundry.toml b/packages/axis-utils/foundry.toml index 0dae0e0..0850f38 100644 --- a/packages/axis-utils/foundry.toml +++ b/packages/axis-utils/foundry.toml @@ -27,8 +27,8 @@ ignore = [ [dependencies] forge-std = "1.9.1" solmate = { version = "6.7.0", url = "git@github.com:transmissions11/solmate.git", commit = "c892309933b25c03d32b1b0d674df7ae292ba925" } -axis-core = { version = "0.5.1", git = "git@github.com:Axis-Fi/axis-core.git", rev = "d07b3311771ea3162d99aa68689e40f4f4bd8135" } -axis-periphery = { version = "0.5.1", git = "git@github.com:Axis-Fi/axis-periphery.git", rev = "fffb93ada5fe5d6f6529f0030d1c16a623ab4782" } +axis-core = { version = "1.0.0" } +axis-periphery = { version = "0.9.0", git = "git@github.com:Axis-Fi/axis-periphery.git", rev = "c514e6096280e564af05664c193095578ab2f4bf" } solady = { version = "0.0.124" } clones-with-immutable-args = { version = "1.1.1", git = "git@github.com:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" } "@openzeppelin-contracts" = { version = "4.9.2" } diff --git a/packages/axis-utils/remappings.txt b/packages/axis-utils/remappings.txt index eb3c40a..29673fb 100644 --- a/packages/axis-utils/remappings.txt +++ b/packages/axis-utils/remappings.txt @@ -1,9 +1,9 @@ @forge-std-1.9.1=dependencies/forge-std-1.9.1/src -@axis-core-0.5.1=dependencies/axis-core-0.5.1/src +@axis-core-1.0.0=dependencies/axis-core-1.0.0/src @solmate-6.7.0=dependencies/solmate-6.7.0/src -@axis-periphery-0.5.1=dependencies/axis-periphery-0.5.1/src -@axis-periphery-0.5.1-script=dependencies/axis-periphery-0.5.1/script -@axis-periphery-0.5.1-test=dependencies/axis-periphery-0.5.1/test +@axis-periphery-0.9.0=dependencies/axis-periphery-0.9.0/src +@axis-periphery-0.9.0-script=dependencies/axis-periphery-0.9.0/script +@axis-periphery-0.9.0-test=dependencies/axis-periphery-0.9.0/test @solady-0.0.124=dependencies/solady-0.0.124/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 diff --git a/packages/axis-utils/script/developer-guide/atomic/purchase.s.sol b/packages/axis-utils/script/developer-guide/atomic/purchase.s.sol index 8bdd662..ee88aa0 100644 --- a/packages/axis-utils/script/developer-guide/atomic/purchase.s.sol +++ b/packages/axis-utils/script/developer-guide/atomic/purchase.s.sol @@ -10,8 +10,8 @@ import {Constants} from "../constants.s.sol"; import {MockERC20} from "../../../test/mocks/MockERC20.sol"; // Axis contracts -import {IAtomicAuctionHouse} from "@axis-core-0.5.1/interfaces/IAtomicAuctionHouse.sol"; -import {IFixedPriceSale} from "@axis-core-0.5.1/interfaces/modules/auctions/IFixedPriceSale.sol"; +import {IAtomicAuctionHouse} from "@axis-core-1.0.0/interfaces/IAtomicAuctionHouse.sol"; +import {IFixedPriceSale} from "@axis-core-1.0.0/interfaces/modules/auctions/IFixedPriceSale.sol"; contract PurchaseScript is Script, Constants { function run(bool usePermit2_) public { diff --git a/packages/axis-utils/script/developer-guide/batch/abort.s.sol b/packages/axis-utils/script/developer-guide/batch/abort.s.sol index 986d743..c6ceb02 100644 --- a/packages/axis-utils/script/developer-guide/batch/abort.s.sol +++ b/packages/axis-utils/script/developer-guide/batch/abort.s.sol @@ -7,7 +7,7 @@ import {console2} from "@forge-std-1.9.1/console2.sol"; import {Constants} from "../constants.s.sol"; // Axis contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; contract AbortScript is Script, Constants { function run() public { diff --git a/packages/axis-utils/script/developer-guide/batch/bid-cancel.s.sol b/packages/axis-utils/script/developer-guide/batch/bid-cancel.s.sol index cfbdfc1..c6c2998 100644 --- a/packages/axis-utils/script/developer-guide/batch/bid-cancel.s.sol +++ b/packages/axis-utils/script/developer-guide/batch/bid-cancel.s.sol @@ -7,8 +7,8 @@ import {console2} from "@forge-std-1.9.1/console2.sol"; import {Constants} from "../constants.s.sol"; // Axis contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; -import {IBatchAuction} from "@axis-core-0.5.1/interfaces/modules/IBatchAuction.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; +import {IBatchAuction} from "@axis-core-1.0.0/interfaces/modules/IBatchAuction.sol"; contract BidCancelScript is Script, Constants { function run() public { diff --git a/packages/axis-utils/script/developer-guide/batch/bid-claim.s.sol b/packages/axis-utils/script/developer-guide/batch/bid-claim.s.sol index 2542520..9f24f6f 100644 --- a/packages/axis-utils/script/developer-guide/batch/bid-claim.s.sol +++ b/packages/axis-utils/script/developer-guide/batch/bid-claim.s.sol @@ -7,7 +7,7 @@ import {console2} from "@forge-std-1.9.1/console2.sol"; import {Constants} from "../constants.s.sol"; // Axis contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; contract BidClaimScript is Script, Constants { function run() public { diff --git a/packages/axis-utils/script/developer-guide/batch/bid-submit.s.sol b/packages/axis-utils/script/developer-guide/batch/bid-submit.s.sol index 12d611d..d775f8b 100644 --- a/packages/axis-utils/script/developer-guide/batch/bid-submit.s.sol +++ b/packages/axis-utils/script/developer-guide/batch/bid-submit.s.sol @@ -10,12 +10,12 @@ import {Constants} from "../constants.s.sol"; import {MockERC20} from "../../../test/mocks/MockERC20.sol"; // Axis contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; import {IEncryptedMarginalPrice} from - "@axis-core-0.5.1/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; + "@axis-core-1.0.0/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; // Libraries -import {ECIES, Point} from "@axis-core-0.5.1/lib/ECIES.sol"; +import {ECIES, Point} from "@axis-core-1.0.0/lib/ECIES.sol"; import {EncryptedMarginalPriceBid} from "../../../src/lib/EncryptedMarginalPriceBid.sol"; contract BidSubmitScript is Script, Constants { diff --git a/packages/axis-utils/script/developer-guide/batch/settle.s.sol b/packages/axis-utils/script/developer-guide/batch/settle.s.sol index f4be756..7364802 100644 --- a/packages/axis-utils/script/developer-guide/batch/settle.s.sol +++ b/packages/axis-utils/script/developer-guide/batch/settle.s.sol @@ -7,10 +7,10 @@ import {console2} from "@forge-std-1.9.1/console2.sol"; import {Constants} from "../constants.s.sol"; // Axis contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; import {IEncryptedMarginalPrice} from - "@axis-core-0.5.1/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; -import {IBatchAuction} from "@axis-core-0.5.1/interfaces/modules/IBatchAuction.sol"; + "@axis-core-1.0.0/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; +import {IBatchAuction} from "@axis-core-1.0.0/interfaces/modules/IBatchAuction.sol"; contract SettleScript is Script, Constants { function run() public { diff --git a/packages/axis-utils/script/developer-guide/cancel-auction.s.sol b/packages/axis-utils/script/developer-guide/cancel-auction.s.sol index a21cb36..80df5dc 100644 --- a/packages/axis-utils/script/developer-guide/cancel-auction.s.sol +++ b/packages/axis-utils/script/developer-guide/cancel-auction.s.sol @@ -7,7 +7,7 @@ import {Script} from "@forge-std-1.9.1/Script.sol"; import {Constants} from "./constants.s.sol"; // Axis contracts -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; contract CancelAuctionScript is Script, Constants { function run() public { diff --git a/packages/axis-utils/script/developer-guide/create-auction.s.sol b/packages/axis-utils/script/developer-guide/create-auction.s.sol index f62bdc5..48a4792 100644 --- a/packages/axis-utils/script/developer-guide/create-auction.s.sol +++ b/packages/axis-utils/script/developer-guide/create-auction.s.sol @@ -10,15 +10,15 @@ import {Constants} from "./constants.s.sol"; import {MockERC20} from "../../test/mocks/MockERC20.sol"; // Libraries -import {ECIES, Point} from "@axis-core-0.5.1/lib/ECIES.sol"; +import {ECIES, Point} from "@axis-core-1.0.0/lib/ECIES.sol"; // Axis contracts -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {IAuction} from "@axis-core-0.5.1/interfaces/modules/IAuction.sol"; -import {ICallback} from "@axis-core-0.5.1/interfaces/ICallback.sol"; -import {toKeycode} from "@axis-core-0.5.1/modules/Keycode.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {IAuction} from "@axis-core-1.0.0/interfaces/modules/IAuction.sol"; +import {ICallback} from "@axis-core-1.0.0/interfaces/ICallback.sol"; +import {toKeycode} from "@axis-core-1.0.0/modules/Keycode.sol"; import {IEncryptedMarginalPrice} from - "@axis-core-0.5.1/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; + "@axis-core-1.0.0/interfaces/modules/auctions/IEncryptedMarginalPrice.sol"; contract CreateAuctionScript is Script, Constants { function run() external { diff --git a/packages/axis-utils/script/developer-guide/curation.s.sol b/packages/axis-utils/script/developer-guide/curation.s.sol index cb9beeb..a51affa 100644 --- a/packages/axis-utils/script/developer-guide/curation.s.sol +++ b/packages/axis-utils/script/developer-guide/curation.s.sol @@ -7,9 +7,9 @@ import {Script} from "@forge-std-1.9.1/Script.sol"; import {Constants} from "./constants.s.sol"; // Axis contracts -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {IFeeManager} from "@axis-core-0.5.1/interfaces/IFeeManager.sol"; -import {Keycode, toKeycode} from "@axis-core-0.5.1/modules/Keycode.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {IFeeManager} from "@axis-core-1.0.0/interfaces/IFeeManager.sol"; +import {Keycode, toKeycode} from "@axis-core-1.0.0/modules/Keycode.sol"; contract CuratorScript is Script, Constants { function setCuratorMaxFee() public { diff --git a/packages/axis-utils/script/developer-guide/using-derivatives.s.sol b/packages/axis-utils/script/developer-guide/using-derivatives.s.sol index 17945ce..6070b62 100644 --- a/packages/axis-utils/script/developer-guide/using-derivatives.s.sol +++ b/packages/axis-utils/script/developer-guide/using-derivatives.s.sol @@ -10,17 +10,17 @@ import {Constants} from "./constants.s.sol"; import {MockERC20} from "../../test/mocks/MockERC20.sol"; // Axis contracts -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {IAtomicAuctionHouse} from "@axis-core-0.5.1/interfaces/IAtomicAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {IAtomicAuctionHouse} from "@axis-core-1.0.0/interfaces/IAtomicAuctionHouse.sol"; -import {IAuction} from "@axis-core-0.5.1/interfaces/modules/IAuction.sol"; -import {IFixedPriceSale} from "@axis-core-0.5.1/interfaces/modules/auctions/IFixedPriceSale.sol"; +import {IAuction} from "@axis-core-1.0.0/interfaces/modules/IAuction.sol"; +import {IFixedPriceSale} from "@axis-core-1.0.0/interfaces/modules/auctions/IFixedPriceSale.sol"; -import {IDerivative} from "@axis-core-0.5.1/interfaces/modules/IDerivative.sol"; -import {ILinearVesting} from "@axis-core-0.5.1/interfaces/modules/derivatives/ILinearVesting.sol"; +import {IDerivative} from "@axis-core-1.0.0/interfaces/modules/IDerivative.sol"; +import {ILinearVesting} from "@axis-core-1.0.0/interfaces/modules/derivatives/ILinearVesting.sol"; -import {ICallback} from "@axis-core-0.5.1/interfaces/ICallback.sol"; -import {toKeycode} from "@axis-core-0.5.1/modules/Keycode.sol"; +import {ICallback} from "@axis-core-1.0.0/interfaces/ICallback.sol"; +import {toKeycode} from "@axis-core-1.0.0/modules/Keycode.sol"; contract DerivativesScript is Script, Constants { function createAuction() external { diff --git a/packages/axis-utils/script/test/EncryptedMarginalPrice/TestData.s.sol b/packages/axis-utils/script/test/EncryptedMarginalPrice/TestData.s.sol index 57e4943..739850a 100644 --- a/packages/axis-utils/script/test/EncryptedMarginalPrice/TestData.s.sol +++ b/packages/axis-utils/script/test/EncryptedMarginalPrice/TestData.s.sol @@ -5,11 +5,11 @@ pragma solidity 0.8.19; import {Script, console2} from "@forge-std-1.9.1/Script.sol"; // System contracts -import {BatchAuctionHouse} from "@axis-core-0.5.1/BatchAuctionHouse.sol"; -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {toKeycode} from "@axis-core-0.5.1/modules/Modules.sol"; -import {EncryptedMarginalPrice} from "@axis-core-0.5.1/modules/auctions/batch/EMP.sol"; -import {Point} from "@axis-core-0.5.1/lib/ECIES.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.0/BatchAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {toKeycode} from "@axis-core-1.0.0/modules/Modules.sol"; +import {EncryptedMarginalPrice} from "@axis-core-1.0.0/modules/auctions/batch/EMP.sol"; +import {Point} from "@axis-core-1.0.0/lib/ECIES.sol"; // Generic contracts import {MockERC20} from "@solmate-6.7.0/test/utils/mocks/MockERC20.sol"; diff --git a/packages/axis-utils/script/test/FixedPriceBatch-BaseDTL/TestData.s.sol b/packages/axis-utils/script/test/FixedPriceBatch-BaseDTL/TestData.s.sol index 951466b..bc3495f 100644 --- a/packages/axis-utils/script/test/FixedPriceBatch-BaseDTL/TestData.s.sol +++ b/packages/axis-utils/script/test/FixedPriceBatch-BaseDTL/TestData.s.sol @@ -3,21 +3,21 @@ pragma solidity 0.8.19; // Scripting libraries import {Script, console2} from "@forge-std-1.9.1/Script.sol"; -import {WithEnvironment} from "@axis-periphery-0.5.1-script/deploy/WithEnvironment.s.sol"; +import {WithEnvironment} from "@axis-periphery-0.9.0-script/deploy/WithEnvironment.s.sol"; // System contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-0.5.1/BatchAuctionHouse.sol"; -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {toKeycode} from "@axis-core-0.5.1/modules/Modules.sol"; -import {ICallback} from "@axis-core-0.5.1/interfaces/ICallback.sol"; -import {IFixedPriceBatch} from "@axis-core-0.5.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; -import {IAuction} from "@axis-core-0.5.1/interfaces/modules/IAuction.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.0/BatchAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {toKeycode} from "@axis-core-1.0.0/modules/Modules.sol"; +import {ICallback} from "@axis-core-1.0.0/interfaces/ICallback.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.0/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {IAuction} from "@axis-core-1.0.0/interfaces/modules/IAuction.sol"; // Callbacks -import {BaseDirectToLiquidity} from "@axis-periphery-0.5.1/callbacks/liquidity/BaseDTL.sol"; +import {BaseDirectToLiquidity} from "@axis-periphery-0.9.0/callbacks/liquidity/BaseDTL.sol"; import {UniswapV2DirectToLiquidity} from - "@axis-periphery-0.5.1/callbacks/liquidity/UniswapV2DTL.sol"; + "@axis-periphery-0.9.0/callbacks/liquidity/UniswapV2DTL.sol"; // Generic contracts import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; diff --git a/packages/axis-utils/script/test/FixedPriceBatch/TestData.s.sol b/packages/axis-utils/script/test/FixedPriceBatch/TestData.s.sol index 83d22e7..a4342b4 100644 --- a/packages/axis-utils/script/test/FixedPriceBatch/TestData.s.sol +++ b/packages/axis-utils/script/test/FixedPriceBatch/TestData.s.sol @@ -3,19 +3,19 @@ pragma solidity 0.8.19; // Scripting libraries import {Script, console2} from "@forge-std-1.9.1/Script.sol"; -import {WithEnvironment} from "@axis-periphery-0.5.1-script/deploy/WithEnvironment.s.sol"; +import {WithEnvironment} from "@axis-periphery-0.9.0-script/deploy/WithEnvironment.s.sol"; // System contracts -import {IBatchAuctionHouse} from "@axis-core-0.5.1/interfaces/IBatchAuctionHouse.sol"; -import {BatchAuctionHouse} from "@axis-core-0.5.1/BatchAuctionHouse.sol"; -import {IAuctionHouse} from "@axis-core-0.5.1/interfaces/IAuctionHouse.sol"; -import {toKeycode} from "@axis-core-0.5.1/modules/Modules.sol"; -import {ICallback} from "@axis-core-0.5.1/interfaces/ICallback.sol"; -import {IFixedPriceBatch} from "@axis-core-0.5.1/interfaces/modules/auctions/IFixedPriceBatch.sol"; -import {IAuction} from "@axis-core-0.5.1/interfaces/modules/IAuction.sol"; -// import {BaselineAxisLaunch} from "@axis-core-0.5.1/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; +import {IBatchAuctionHouse} from "@axis-core-1.0.0/interfaces/IBatchAuctionHouse.sol"; +import {BatchAuctionHouse} from "@axis-core-1.0.0/BatchAuctionHouse.sol"; +import {IAuctionHouse} from "@axis-core-1.0.0/interfaces/IAuctionHouse.sol"; +import {toKeycode} from "@axis-core-1.0.0/modules/Modules.sol"; +import {ICallback} from "@axis-core-1.0.0/interfaces/ICallback.sol"; +import {IFixedPriceBatch} from "@axis-core-1.0.0/interfaces/modules/auctions/IFixedPriceBatch.sol"; +import {IAuction} from "@axis-core-1.0.0/interfaces/modules/IAuction.sol"; +// import {BaselineAxisLaunch} from "@axis-core-1.0.0/callbacks/liquidity/BaselineV2/BaselineAxisLaunch.sol"; // import {BALwithAllocatedAllowlist} from -// "@axis-core-0.5.1/callbacks/liquidity/BaselineV2/BALwithAllocatedAllowlist.sol"; +// "@axis-core-1.0.0/callbacks/liquidity/BaselineV2/BALwithAllocatedAllowlist.sol"; // Generic contracts import {ERC20} from "@solmate-6.7.0/tokens/ERC20.sol"; diff --git a/packages/axis-utils/soldeer.lock b/packages/axis-utils/soldeer.lock index a325b19..0f024db 100644 --- a/packages/axis-utils/soldeer.lock +++ b/packages/axis-utils/soldeer.lock @@ -13,15 +13,15 @@ checksum = "97bdb2003b70382996a79a406813f76417b1cf90" [[dependencies]] name = "axis-core" -version = "0.5.1" -source = "git@github.com:Axis-Fi/axis-core.git" -checksum = "d07b3311771ea3162d99aa68689e40f4f4bd8135" +version = "1.0.0" +source = "https://soldeer-revisions.s3.amazonaws.com/axis-core/1_0_0_18-07-2024_01:46:16_axis-core.zip" +checksum = "9b5716ade218b4064bba7cca7d31065e6aa66574ad92386aaf2cc71b5c21bbb4" [[dependencies]] name = "axis-periphery" -version = "0.5.1" +version = "0.9.0" source = "git@github.com:Axis-Fi/axis-periphery.git" -checksum = "fffb93ada5fe5d6f6529f0030d1c16a623ab4782" +checksum = "c514e6096280e564af05664c193095578ab2f4bf" [[dependencies]] name = "solady" diff --git a/packages/axis-utils/src/lib/EncryptedMarginalPriceBid.sol b/packages/axis-utils/src/lib/EncryptedMarginalPriceBid.sol index d412c4a..a5802a9 100644 --- a/packages/axis-utils/src/lib/EncryptedMarginalPriceBid.sol +++ b/packages/axis-utils/src/lib/EncryptedMarginalPriceBid.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: AGPL-3.0-or-later pragma solidity ^0.8.0; -import {ECIES, Point} from "@axis-core-0.5.1/lib/ECIES.sol"; +import {ECIES, Point} from "@axis-core-1.0.0/lib/ECIES.sol"; /// @title EncryptedMarginalPriceBid /// @notice Library for encrypting the amount out for a bid in an encrypted marginal price auction From 99299d2ccbd93e2bd28513b7c698dd9b4a775212 Mon Sep 17 00:00:00 2001 From: Jem <0x0xjem@gmail.com> Date: Thu, 18 Jul 2024 15:45:32 +0400 Subject: [PATCH 2/2] Bump axis-periphery commit --- packages/axis-utils/foundry.toml | 2 +- packages/axis-utils/soldeer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/axis-utils/foundry.toml b/packages/axis-utils/foundry.toml index 0850f38..9425398 100644 --- a/packages/axis-utils/foundry.toml +++ b/packages/axis-utils/foundry.toml @@ -28,7 +28,7 @@ ignore = [ forge-std = "1.9.1" solmate = { version = "6.7.0", url = "git@github.com:transmissions11/solmate.git", commit = "c892309933b25c03d32b1b0d674df7ae292ba925" } axis-core = { version = "1.0.0" } -axis-periphery = { version = "0.9.0", git = "git@github.com:Axis-Fi/axis-periphery.git", rev = "c514e6096280e564af05664c193095578ab2f4bf" } +axis-periphery = { version = "0.9.0", git = "git@github.com:Axis-Fi/axis-periphery.git", rev = "631c877c9fd4d0cbb5aa3f51b9bd37ae0ce28a38" } solady = { version = "0.0.124" } clones-with-immutable-args = { version = "1.1.1", git = "git@github.com:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" } "@openzeppelin-contracts" = { version = "4.9.2" } diff --git a/packages/axis-utils/soldeer.lock b/packages/axis-utils/soldeer.lock index 0f024db..524b727 100644 --- a/packages/axis-utils/soldeer.lock +++ b/packages/axis-utils/soldeer.lock @@ -21,7 +21,7 @@ checksum = "9b5716ade218b4064bba7cca7d31065e6aa66574ad92386aaf2cc71b5c21bbb4" name = "axis-periphery" version = "0.9.0" source = "git@github.com:Axis-Fi/axis-periphery.git" -checksum = "c514e6096280e564af05664c193095578ab2f4bf" +checksum = "631c877c9fd4d0cbb5aa3f51b9bd37ae0ce28a38" [[dependencies]] name = "solady"