feat: update KatanaGovernance

ronin-chain · Aug 1, 2024 · b1dca6d · b1dca6d
1 parent 289eaae
commit b1dca6d
Show file tree

Hide file tree

Showing 13 changed files with 452 additions and 249 deletions.
diff --git a/lib/katana-v3-contracts b/lib/katana-v3-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -1,8 +1,5 @@
-@fdk/=lib/foundry-deployment-kit/script/
-@contract-libs/=lib/foundry-deployment-kit/lib/contract-libs/src/
-forge-std/=lib/foundry-deployment-kit/lib/forge-std/src/
-@solady/=lib/foundry-deployment-kit/lib/solady/src/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
 solmate/=lib/solmate/
 permit2/=lib/permit2/
 @katana/v3-contracts/=lib/katana-v3-contracts/src/
diff --git a/script/GeneralConfig.sol b/script/GeneralConfig.sol
diff --git a/script/Migration.s.sol b/script/Migration.s.sol
diff --git a/script/SDK.sol b/script/SDK.sol
diff --git a/script/interfaces/ISharedArgument.sol b/script/interfaces/ISharedArgument.sol
diff --git a/script/utils/Contract.sol b/script/utils/Contract.sol
diff --git a/script/utils/Network.sol b/script/utils/Network.sol
diff --git a/src/aggregate-router/interfaces/external/IKatanaV2Pair.sol b/src/aggregate-router/interfaces/external/IKatanaV2Pair.sol
diff --git a/src/aggregate-router/modules/katana/v2/KatanaV2Library.sol b/src/aggregate-router/modules/katana/v2/KatanaV2Library.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import { IKatanaV2Pair } from "../../../interfaces/external/IKatanaV2Pair.sol";
+import { IKatanaV2Pair } from "@katana/v3-contracts/periphery/interfaces/IKatanaV2Pair.sol";
 
 /// @title Katana v2 Helper Library
 /// @notice Calculates the recipient address for a command

diff --git a/src/aggregate-router/modules/katana/v2/V2SwapRouter.sol b/src/aggregate-router/modules/katana/v2/V2SwapRouter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
-import { IKatanaV2Pair } from "../../../interfaces/external/IKatanaV2Pair.sol";
+import { IKatanaV2Pair } from "@katana/v3-contracts/periphery/interfaces/IKatanaV2Pair.sol";
 import { KatanaV2Library } from "./KatanaV2Library.sol";
 import { KatanaImmutables } from "../KatanaImmutables.sol";
 import { Payments } from "../../Payments.sol";
+0 −3		.gitmodules
+7 −0		Makefile
+1 −3		foundry.toml
+0 −1		lib/v2-core
+0 −1		remappings.txt
+40 −0		script/DeployKatanaV3Core.s.sol
+74 −0		script/DeployKatanaV3Periphery.s.sol
+31 −0		script/local/DeployKatanaV3Local.s.sol
+31 −0		script/ronin-mainnet/DeployKatanaV3Mainnet.s.sol
+31 −0		script/ronin-testnet/DeployKatanaV3Testnet.s.sol
+19 −14		src/core/KatanaV3Factory.sol
+40 −0		src/core/KatanaV3FactoryProxy.sol
+14 −3		src/core/KatanaV3Pool.sol
+7 −3		src/core/KatanaV3PoolDeployer.sol
+6 −3		src/core/KatanaV3PoolProxy.sol
+16 −0		src/core/KatanaV3PoolProxyBytecode.sol
+0 −4		src/core/interfaces/IKatanaV3Factory.sol
+14 −0		src/core/interfaces/IKatanaV3FactoryImmutables.sol
+2 −0		src/core/interfaces/IKatanaV3Pool.sol
+4 −0		src/core/interfaces/pool/IKatanaV3PoolImmutables.sol
+14 −0		src/core/interfaces/pool/IKatanaV3PoolImmutablesInitializable.sol
+87 −0		src/external/KatanaGovernanceMock.sol
+134 −0		src/external/interfaces/IKatanaGovernance.sol
+21 −0		src/external/libraries/AuthorizationLib.sol
+61 −1		src/periphery/NonfungiblePositionManager.sol
+3 −3		src/periphery/V3Migrator.sol
+18 −0		src/periphery/base/ImmutableState.sol
+4 −0		src/periphery/base/PeripheryImmutableState.sol
+4 −0		src/periphery/base/PoolInitializer.sol
+12 −0		src/periphery/interfaces/IImmutableState.sol
+53 −0		src/periphery/interfaces/IKatanaV2Pair.sol
+67 −0		src/periphery/interfaces/IMixedRouteQuoterV1.sol
+6 −0		src/periphery/interfaces/INonfungiblePositionManager.sol
+3 −0		src/periphery/interfaces/IPeripheryImmutableState.sol
+194 −0		src/periphery/lens/MixedRouteQuoterV1.sol
+194 −0		src/periphery/lens/MixedRouteQuoterV1Testnet.sol
+86 −0		src/periphery/libraries/KatanaV2Library.sol
+86 −0		src/periphery/libraries/KatanaV2LibraryTestnet.sol
+3 −2		src/periphery/libraries/PoolAddress.sol
+22 −4		test/core/KatanaV3Factory.t.sol
+72 −20		test/core/KatanaV3Pool.t.sol
+17 −0		test/core/PoolProxyInitCodeHash.t.sol