From 17c345d77e5895b80c83255a50ed84fd5a1c029c Mon Sep 17 00:00:00 2001 From: diana Date: Tue, 4 Feb 2025 14:41:26 -0500 Subject: [PATCH] fix(v4-sdk): switch back recipient (#297) --- sdks/v4-sdk/src/PositionManager.test.ts | 8 ++++---- sdks/v4-sdk/src/PositionManager.ts | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sdks/v4-sdk/src/PositionManager.test.ts b/sdks/v4-sdk/src/PositionManager.test.ts index 9d712697..8e3cb336 100644 --- a/sdks/v4-sdk/src/PositionManager.test.ts +++ b/sdks/v4-sdk/src/PositionManager.test.ts @@ -320,8 +320,8 @@ describe('PositionManager', () => { planner.addAction(Actions.SETTLE, [toAddress(pool_0_1.currency0), OPEN_DELTA, false]) planner.addAction(Actions.SETTLE, [toAddress(pool_0_1.currency1), OPEN_DELTA, false]) - planner.addAction(Actions.SWEEP, [toAddress(pool_0_1.currency0), MSG_SENDER]) - planner.addAction(Actions.SWEEP, [toAddress(pool_0_1.currency1), MSG_SENDER]) + planner.addAction(Actions.SWEEP, [toAddress(pool_0_1.currency0), recipient]) + planner.addAction(Actions.SWEEP, [toAddress(pool_0_1.currency1), recipient]) expect(calldata).toEqual(V4PositionManager.encodeModifyLiquidities(planner.finalize(), deadline)) expect(value).toEqual('0x00') @@ -360,8 +360,8 @@ describe('PositionManager', () => { planner.addAction(Actions.UNWRAP, [OPEN_DELTA]) planner.addAction(Actions.SETTLE, [toAddress(pool_1_eth.currency0), OPEN_DELTA, false]) planner.addAction(Actions.SETTLE, [toAddress(pool_1_eth.currency1), OPEN_DELTA, false]) - planner.addAction(Actions.SWEEP, [toAddress(pool_1_eth.currency0.wrapped), MSG_SENDER]) - planner.addAction(Actions.SWEEP, [toAddress(pool_1_eth.currency1), MSG_SENDER]) + planner.addAction(Actions.SWEEP, [toAddress(pool_1_eth.currency0.wrapped), recipient]) + planner.addAction(Actions.SWEEP, [toAddress(pool_1_eth.currency1), recipient]) expect(calldata).toEqual(V4PositionManager.encodeModifyLiquidities(planner.finalize(), deadline)) expect(value).toEqual('0x00') diff --git a/sdks/v4-sdk/src/PositionManager.ts b/sdks/v4-sdk/src/PositionManager.ts index fab921af..869fe305 100644 --- a/sdks/v4-sdk/src/PositionManager.ts +++ b/sdks/v4-sdk/src/PositionManager.ts @@ -293,14 +293,16 @@ export abstract class V4PositionManager { planner.addSettle(position.pool.currency0, false) planner.addSettle(position.pool.currency1, false) // sweep any leftover wrapped native that was not unwrapped - planner.addSweep(position.pool.currency0.wrapped, MSG_SENDER) - planner.addSweep(position.pool.currency1, MSG_SENDER) + // recipient will be same as the v4 lp token recipient + planner.addSweep(position.pool.currency0.wrapped, options.recipient) + planner.addSweep(position.pool.currency1, options.recipient) } else { // payer is v4 position manager planner.addSettle(position.pool.currency0, false) planner.addSettle(position.pool.currency1, false) - planner.addSweep(position.pool.currency0, MSG_SENDER) - planner.addSweep(position.pool.currency1, MSG_SENDER) + // recipient will be same as the v4 lp token recipient + planner.addSweep(position.pool.currency0, options.recipient) + planner.addSweep(position.pool.currency1, options.recipient) } } else { // need to settle both currencies when minting / adding liquidity (user is the payer)