Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added core
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/uniswap-hooks
Submodule uniswap-hooks updated 87 files
+1 −3 .github/actions/setup/action.yml
+3 −3 .gitmodules
+3 −3 README.md
+2 −1 docs/modules/ROOT/nav.adoc
+14 −14 docs/modules/ROOT/pages/base.adoc
+2 −2 docs/modules/ROOT/pages/fee.adoc
+1 −1 docs/modules/ROOT/pages/index.adoc
+19 −0 docs/modules/ROOT/pages/oracles.adoc
+1 −0 docs/modules/api/nav.adoc
+24 −99 docs/modules/api/pages/base.adoc
+16 −62 docs/modules/api/pages/fee.adoc
+605 −65 docs/modules/api/pages/general.adoc
+385 −0 docs/modules/api/pages/oracles.adoc
+1 −0 docs/modules/api/pages/utils.adoc
+8 −1 foundry.toml
+1 −1 hardhat.config.js
+1 −1 lib/forge-std
+1 −1 lib/openzeppelin-contracts
+1 −1 lib/v4-core
+1 −1 lib/v4-periphery
+46 −102 package-lock.json
+10 −6 package.json
+3 −2 remappings.txt
+9 −0 scripts/publish-docs.js
+1 −1 slither.config.json
+3 −1 solhint/solhint.base.config.js
+18 −18 src/base/BaseAsyncSwap.sol
+49 −36 src/base/BaseCustomAccounting.sol
+34 −35 src/base/BaseCustomCurve.sol
+20 −48 src/base/BaseHook.sol
+20 −23 src/fee/BaseDynamicAfterFee.sol
+14 −26 src/fee/BaseDynamicFee.sol
+127 −0 src/fee/BaseHookFee.sol
+10 −14 src/fee/BaseOverrideFee.sol
+23 −25 src/general/AntiSandwichHook.sol
+88 −62 src/general/LimitOrderHook.sol
+26 −35 src/general/LiquidityPenaltyHook.sol
+2 −0 src/general/README.adoc
+468 −0 src/general/ReHypothecationHook.sol
+1 −1 src/interfaces/IHookEvents.sol
+15 −0 src/mocks/base/BaseAsyncSwapMock.sol
+49 −0 src/mocks/base/BaseCustomAccountingFeeMock.sol
+24 −19 src/mocks/base/BaseCustomAccountingMock.sol
+17 −15 src/mocks/base/BaseCustomCurveMock.sol
+20 −16 src/mocks/base/BaseHookMock.sol
+16 −8 src/mocks/fee/BaseDynamicAfterFeeMock.sol
+41 −0 src/mocks/fee/BaseDynamicFeeMock.sol
+65 −0 src/mocks/fee/BaseHookFeeMock.sol
+32 −0 src/mocks/fee/BaseOverrideFeeMock.sol
+11 −5 src/mocks/general/AntiSandwichMock.sol
+15 −0 src/mocks/general/LimitOrderHookMock.sol
+18 −0 src/mocks/general/LiquidityPenaltyHookMock.sol
+100 −0 src/mocks/general/ReHypothecationERC4626Mock.sol
+148 −0 src/mocks/general/ReHypothecationNativeMock.sol
+18 −0 src/mocks/oracles/panoptic/BaseOracleHookMock.sol
+18 −0 src/mocks/oracles/panoptic/OracleHookWithV3AdaptersMock.sol
+16 −0 src/oracles/README.adoc
+189 −0 src/oracles/panoptic/BaseOracleHook.sol
+51 −0 src/oracles/panoptic/OracleHookWithV3Adapters.sol
+105 −0 src/oracles/panoptic/adapters/V3OracleAdapter.sol
+106 −0 src/oracles/panoptic/adapters/V3TruncatedOracleAdapter.sol
+342 −0 src/oracles/panoptic/libraries/Oracle.sol
+6 −5 src/utils/CurrencySettler.sol
+2 −0 src/utils/README.adoc
+19 −30 test/base/BaseAsyncSwap.t.sol
+66 −70 test/base/BaseCustomAccounting.t.sol
+47 −43 test/base/BaseCustomCurve.t.sol
+20 −52 test/base/BaseHook.t.sol
+29 −59 test/fee/BaseDynamicAfterFee.t.sol
+24 −32 test/fee/BaseDynamicFee.t.sol
+174 −0 test/fee/BaseHookFee.t.sol
+22 −30 test/fee/BaseOverrideFee.t.sol
+49 −59 test/general/AntiSandwichHook.t.sol
+47 −43 test/general/LimitOrderHook.t.sol
+136 −109 test/general/LiquidityPenaltyHook.t.sol
+475 −0 test/general/ReHypothecationHookERC4626.t.sol
+147 −0 test/general/ReHypothecationHookNative.t.sol
+0 −11 test/mocks/BaseAsyncSwapMock.sol
+0 −42 test/mocks/BaseCustomAccountingFeeMock.sol
+0 −21 test/mocks/BaseDynamicFeeMock.sol
+0 −27 test/mocks/BaseOverrideFeeMock.sol
+1,758 −0 test/oracles/panoptic/Oracle.t.sol
+4 −4 test/utils/BalanceDeltaAssertions.sol
+39 −15 test/utils/HookTest.sol
+5 −6 test/utils/interfaces/IPoolManagerEvents.sol
+7 −11 test/utils/interfaces/IV4Quoter.sol
+330 −0 test/utils/tests/BalanceDeltaAssertions.t.sol
38 changes: 29 additions & 9 deletions script/DeployCPA.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import { CPASettlementPhase } from "../src/libraries/CPASettlementPhase.sol";
import { CPAFinishedPhase } from "../src/libraries/CPAFinishedPhase.sol";
import { CPAAuctionControl } from "../src/libraries/CPAAuctionControl.sol";
import { CPACallbacks } from "../src/libraries/CPACallbacks.sol";
import { CPAManagerHelpers } from "../src/libraries/CPAManagerHelpers.sol";
import { CPAValidation } from "../src/libraries/CPAValidation.sol";
import { CPATransitions } from "../src/libraries/CPATransitions.sol";
import { CPAUtilities } from "../src/libraries/CPAUtilities.sol";
import { IPoolManager } from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
import { IPositionManager } from "@uniswap/v4-periphery/src/interfaces/IPositionManager.sol";
import { Hooks } from "@uniswap/v4-core/src/libraries/Hooks.sol";
Expand Down Expand Up @@ -68,24 +72,40 @@ contract DeployCPA is Script {
address auctionControlLib = address(new CPAAuctionControl());
address callbackLib = address(new CPACallbacks());

// Deploy new helper libraries
console.log("Deploying helper libraries...");
address helpersLib = address(new CPAManagerHelpers());
address validationLib = address(new CPAValidation());
address transitionsLib = address(new CPATransitions());
address utilitiesLib = address(new CPAUtilities());

console.log("Deploying CPAManager...");
CPAManager cpaManager = new CPAManager(
IPoolManager(poolManagerAddress),
protocolOwner,
address(cpaHook),
IPositionManager(positionManagerAddress),
protocolOwner,
setupLib,
clockPhaseLib,
proxyPhaseLib,
allocationPhaseLib,
settlementPhaseLib,
finishedPhaseLib,
auctionControlLib,
callbackLib
protocolOwner
);
console.log("CPAManager deployed at:", address(cpaManager));

// Set all library addresses
console.log("Setting library addresses...");
cpaManager.setLibraries(CPAManager.LibraryAddresses({
setupLib: setupLib,
clockPhaseLib: clockPhaseLib,
proxyPhaseLib: proxyPhaseLib,
allocationPhaseLib: allocationPhaseLib,
settlementPhaseLib: settlementPhaseLib,
finishedPhaseLib: finishedPhaseLib,
auctionControlLib: auctionControlLib,
callbackLib: callbackLib,
helpersLib: helpersLib,
validationLib: validationLib,
transitionsLib: transitionsLib,
utilitiesLib: utilitiesLib
}));

// Set auction manager in CPAHook
console.log("Setting auction manager in CPAHook...");
cpaHook.setAuctionManager(address(cpaManager));
Expand Down
Loading