Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/redeployment #17

Merged
merged 2 commits into from
Sep 26, 2024
Merged
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
2 changes: 1 addition & 1 deletion lib/pancake-v4-universal-router
Submodule pancake-v4-universal-router updated 40 files
+1 −1 .forge-snapshots/BinNativePancakeSwapV4Test#test_v4BinSwap_ExactInSingle_NativeIn.snap
+1 −1 .forge-snapshots/BinNativePancakeSwapV4Test#test_v4BinSwap_ExactInSingle_NativeOut_RouterRecipient.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4BinSwap_ExactInSingle.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4BinSwap_ExactIn_MultiHop.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4BinSwap_ExactIn_SingleHop.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4BinSwap_ExactOut_MultiHop.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4BinSwap_ExactOut_SingleHop.snap
+1 −1 .forge-snapshots/BinPancakeSwapV4Test#test_v4ClSwap_ExactOutSingle.snap
+1 −1 .forge-snapshots/CLNativePancakeSwapV4Test#test_v4ClSwap_ExactInSingle_NativeIn.snap
+1 −1 .forge-snapshots/CLNativePancakeSwapV4Test#test_v4ClSwap_ExactInSingle_NativeOut.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactInSingle.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactIn_MultiHop.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactIn_SingleHop.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactOutSingle.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactOut_MultiHop.snap
+1 −1 .forge-snapshots/CLPancakeSwapV4Test#test_v4ClSwap_ExactOut_SingleHop.snap
+1 −0 .forge-snapshots/PancakeSwapV3Test#test_v3Swap_ExactInput0For1_ContractBalance.snap
+1 −0 .forge-snapshots/PancakeSwapV3Test#test_v3Swap_exactInput_MultiHop.snap
+1 −1 .forge-snapshots/PancakeSwapV3Test#test_v3Swap_exactOutput0For1.snap
+1 −0 .forge-snapshots/PancakeSwapV3Test#test_v3Swap_exactOutput_MultiHop.snap
+1 −1 .forge-snapshots/UniversalRouterBytecodeSize.snap
+1 −1 .forge-snapshots/V3ToV4MigrationNativeTest#test_v4CLPositionmanager_Mint_Native.snap
+1 −1 .forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity.snap
+1 −1 .forge-snapshots/V3ToV4MigrationTest#test_v4BinPositionmanager_BinAddLiquidity_Native.snap
+1 −1 .forge-snapshots/V3ToV4MigrationTest#test_v4CLPositionmanager_Mint.snap
+3 −0 .gitignore
+1 −1 deploy-addresses/bsc-testnet.json
+1 −1 deploy-addresses/ethereum-sepolia.json
+1 −1 lib/pancake-v4-periphery
+5 −5 script/deployParameters/testnet/DeployBscTestnet.s.sol
+5 −5 script/deployParameters/testnet/DeployEthSepolia.s.sol
+0 −2 src/libraries/Constants.sol
+20 −0 src/libraries/MaxInputAmount.sol
+2 −2 src/modules/pancakeswap/StableSwapRouter.sol
+4 −10 src/modules/pancakeswap/v3/V3SwapRouter.sol
+274 −3 test/UniversalRouter.t.sol
+28 −0 test/libraries/MaxInputAmount.t.sol
+44 −0 test/stableSwap/StableSwap.t.sol
+61 −1 test/v3/PancakeSwapV3.t.sol
+8 −0 test/v3/v3BnbCake.t.sol
14 changes: 7 additions & 7 deletions script/config/bsc-testnet.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"vault": "0x08F012b8E2f3021db8bd2A896A7F422F4041F131",
"clPoolManager": "0x969D90aC74A1a5228b66440f8C8326a8dA47A5F9",
"binPoolManager": "0x437ef7C8C00d20a8535ae1786c5800c88413e7Af",
"clPositionManager": "0x89A7D45D007077485CB5aE2abFB740b1fe4FF574",
"binPositionManager": "0xfB84c0D67f217f078E949d791b8d3081FE91Bca2",
"vault": "0x0a125Bb36e409957Ed951eF1FBe20e81D682EAb6",
"clPoolManager": "0x26Ca53c8C5CE90E22aA1FadDA68AB9a08f7BA06f",
"binPoolManager": "0x1DF0be383e9d17DA4448E57712849aBE5b3Fa33b",
"clPositionManager": "0x095bd2cf90ef113aa8c53904cE54C17f4583046d",
"binPositionManager": "0x26008c91a2D47147d6739db3fFd3598A27da859d",
"mockVeCake": "0x86668337a40CaAd59F463E89550c6Aa59C056988",
"clVeCakeExclusiveHook": "0x7B07026C721F824ee913D65C5810884dEDf9ED50",
"binVeCakeExclusiveHook": "0x6D211114Ef77F89CD6912441CbaFfFBF71E25587"
"clVeCakeExclusiveHook": "0x3290880eB5b48Ee5CF1E8e381DDe932F7D696B27",
"binVeCakeExclusiveHook": "0x6203377AE3B7e1592806909836F6DC6b39026a60"
}

11 changes: 11 additions & 0 deletions script/config/ethereum-sepolia.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"vault": "0x4670F769Daa625FF5F89719AE5295E9824f5805f",
"clPoolManager": "0xD4EAc75ee0E76EAD6AC6995DF30CA14b38549682",
"binPoolManager": "0x0Ca8430E263A098B998E47e0544C2C82B30CbDB1",
"clPositionManager": "0x53C9802F47295979c0E154779eD10fa6af27D7cA",
"binPositionManager": "0x21015eF9927e06b7Fc19D986A214e449Aa22FF7d",
"mockVeCake": "0xA25ECd559680c77185a00a00e33BD9df14a5133e",
"clVeCakeExclusiveHook": "0x549D196225706804c0A0fa9296c7a32fE6963850",
"binVeCakeExclusiveHook": "0xCc22705eA9433c8C35a1C93778bbFF76A19F3d55"
}

24 changes: 14 additions & 10 deletions test/pool-bin/BinGeomeanOracle.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,15 @@ contract BinGeomeanOracleHookTest is Test, Deployers, DeployPermit2 {
poolKey: key,
amount0: 1e18,
amount1: 1e18,
amount0Min: 0,
amount1Min: 0,
amount0Max: 1e18,
amount1Max: 1e18,
activeIdDesired: BIN_ID_1_1,
idSlippage: 0,
deltaIds: deltaIds,
distributionX: distributionX,
distributionY: distributionY,
to: address(this)
to: address(this),
hookData: ZERO_BYTES
})
);

Expand Down Expand Up @@ -169,14 +170,15 @@ contract BinGeomeanOracleHookTest is Test, Deployers, DeployPermit2 {
poolKey: key,
amount0: 1e18,
amount1: 1e18,
amount0Min: 0,
amount1Min: 0,
amount0Max: 1e18,
amount1Max: 1e18,
activeIdDesired: BIN_ID_1_1,
idSlippage: 0,
deltaIds: deltaIds,
distributionX: distributionX,
distributionY: distributionY,
to: address(this)
to: address(this),
hookData: ZERO_BYTES
})
);

Expand Down Expand Up @@ -210,14 +212,15 @@ contract BinGeomeanOracleHookTest is Test, Deployers, DeployPermit2 {
poolKey: key,
amount0: 1e18,
amount1: 1e18,
amount0Min: 0,
amount1Min: 0,
amount0Max: 1e18,
amount1Max: 1e18,
activeIdDesired: BIN_ID_1_1,
idSlippage: 0,
deltaIds: deltaIds,
distributionX: distributionX,
distributionY: distributionY,
to: address(this)
to: address(this),
hookData: ZERO_BYTES
})
);

Expand All @@ -236,7 +239,8 @@ contract BinGeomeanOracleHookTest is Test, Deployers, DeployPermit2 {
amount1Min: 0,
ids: tokenIds,
amounts: liquidityMinted,
from: address(this)
from: address(this),
hookData: ZERO_BYTES
})
);
}
Expand Down
7 changes: 4 additions & 3 deletions test/pool-bin/BinLimitOrder.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ contract BinLimitOrderHookTest is Test, Deployers, DeployPermit2 {
poolKey: key,
amount0: 3 * 1e18,
amount1: 3 * 1e18,
amount0Min: 0,
amount1Min: 0,
amount0Max: 3 * 1e18,
amount1Max: 3 * 1e18,
activeIdDesired: BIN_ID_1_1,
idSlippage: 0,
deltaIds: deltaIds,
distributionX: distributionX,
distributionY: distributionY,
to: address(this)
to: address(this),
hookData: ZERO_BYTES
})
);
}
Expand Down
7 changes: 4 additions & 3 deletions test/pool-bin/BinVeCakeExclusiveHook.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ contract BinVeCakeExclusiveHookTest is Test, Deployers, DeployPermit2 {
poolKey: key,
amount0: 1e18,
amount1: 1e18,
amount0Min: 0,
amount1Min: 0,
amount0Max: 1e18,
amount1Max: 1e18,
activeIdDesired: BIN_ID_1_1,
idSlippage: 0,
deltaIds: deltaIds,
distributionX: distributionX,
distributionY: distributionY,
to: address(this)
to: address(this),
hookData: ZERO_BYTES
})
);
}
Expand Down