From fc53835a324a24de31a7ccb016906062e8b21d4e Mon Sep 17 00:00:00 2001 From: chefburger Date: Thu, 26 Sep 2024 10:42:39 +0800 Subject: [PATCH 1/2] feat: update deps to latest --- lib/pancake-v4-universal-router | 2 +- test/pool-bin/BinGeomeanOracle.t.sol | 24 +++++++++++++--------- test/pool-bin/BinLimitOrder.t.sol | 7 ++++--- test/pool-bin/BinVeCakeExclusiveHook.t.sol | 7 ++++--- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/lib/pancake-v4-universal-router b/lib/pancake-v4-universal-router index e655693..7fabb59 160000 --- a/lib/pancake-v4-universal-router +++ b/lib/pancake-v4-universal-router @@ -1 +1 @@ -Subproject commit e6556937a9e7cd1ccbb8a0ce958e99e32108e47c +Subproject commit 7fabb59105cca02abcb5a77e14fdc36ef0a72b4f diff --git a/test/pool-bin/BinGeomeanOracle.t.sol b/test/pool-bin/BinGeomeanOracle.t.sol index 98839cd..07d9f92 100644 --- a/test/pool-bin/BinGeomeanOracle.t.sol +++ b/test/pool-bin/BinGeomeanOracle.t.sol @@ -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 }) ); @@ -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 }) ); @@ -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 }) ); @@ -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 }) ); } diff --git a/test/pool-bin/BinLimitOrder.t.sol b/test/pool-bin/BinLimitOrder.t.sol index bdd2200..c95cc73 100644 --- a/test/pool-bin/BinLimitOrder.t.sol +++ b/test/pool-bin/BinLimitOrder.t.sol @@ -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 }) ); } diff --git a/test/pool-bin/BinVeCakeExclusiveHook.t.sol b/test/pool-bin/BinVeCakeExclusiveHook.t.sol index dd719fc..9cdaab4 100644 --- a/test/pool-bin/BinVeCakeExclusiveHook.t.sol +++ b/test/pool-bin/BinVeCakeExclusiveHook.t.sol @@ -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 }) ); } From b806e2c6b24bc749787f0e4b9796333a9d729f05 Mon Sep 17 00:00:00 2001 From: chefburger Date: Thu, 26 Sep 2024 10:54:26 +0800 Subject: [PATCH 2/2] chore: redeploy the latest contracts --- script/config/bsc-testnet.json | 14 +++++++------- script/config/ethereum-sepolia.json | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 script/config/ethereum-sepolia.json diff --git a/script/config/bsc-testnet.json b/script/config/bsc-testnet.json index f24188d..14fd062 100644 --- a/script/config/bsc-testnet.json +++ b/script/config/bsc-testnet.json @@ -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" } \ No newline at end of file diff --git a/script/config/ethereum-sepolia.json b/script/config/ethereum-sepolia.json new file mode 100644 index 0000000..c681ff8 --- /dev/null +++ b/script/config/ethereum-sepolia.json @@ -0,0 +1,11 @@ + { + "vault": "0x4670F769Daa625FF5F89719AE5295E9824f5805f", + "clPoolManager": "0xD4EAc75ee0E76EAD6AC6995DF30CA14b38549682", + "binPoolManager": "0x0Ca8430E263A098B998E47e0544C2C82B30CbDB1", + "clPositionManager": "0x53C9802F47295979c0E154779eD10fa6af27D7cA", + "binPositionManager": "0x21015eF9927e06b7Fc19D986A214e449Aa22FF7d", + "mockVeCake": "0xA25ECd559680c77185a00a00e33BD9df14a5133e", + "clVeCakeExclusiveHook": "0x549D196225706804c0A0fa9296c7a32fE6963850", + "binVeCakeExclusiveHook": "0xCc22705eA9433c8C35a1C93778bbFF76A19F3d55" + } + \ No newline at end of file