diff --git a/typescript/package.json b/typescript/package.json index 79629d8..d09d6a1 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -9,7 +9,7 @@ "publishConfig": { "access": "public" }, - "version": "0.0.39", + "version": "0.0.40", "main": "dist/index.js", "module": "dist/index.mjs", "types": "dist/index.d.ts", diff --git a/typescript/src/hooks/types.ts b/typescript/src/hooks/types.ts index c17f904..ace3b17 100644 --- a/typescript/src/hooks/types.ts +++ b/typescript/src/hooks/types.ts @@ -5,15 +5,6 @@ import { HookStateAkron } from './akron/akronHook'; export type HookStateBase = { hookType: string; - // Configuration flags from hook contract - shouldCallComputeDynamicSwapFee: boolean; - shouldCallBeforeSwap: boolean; - shouldCallAfterSwap: boolean; - shouldCallBeforeAddLiquidity: boolean; - shouldCallAfterAddLiquidity: boolean; - shouldCallBeforeRemoveLiquidity: boolean; - shouldCallAfterRemoveLiquidity: boolean; - enableHookAdjustedAmounts: boolean; }; export type HookState = diff --git a/typescript/src/reClamm/index.ts b/typescript/src/reClamm/index.ts index fabfbbc..c9e548c 100644 --- a/typescript/src/reClamm/index.ts +++ b/typescript/src/reClamm/index.ts @@ -1,2 +1,2 @@ export * from './reClammData'; -export * from './reClammPool'; \ No newline at end of file +export * from './reClammPool'; diff --git a/typescript/src/reClammV2/index.ts b/typescript/src/reClammV2/index.ts index 49e92e2..2de1d8c 100644 --- a/typescript/src/reClammV2/index.ts +++ b/typescript/src/reClammV2/index.ts @@ -1,2 +1,2 @@ export * from './reClammV2Data'; -export * from './reClammV2Pool'; \ No newline at end of file +export * from './reClammV2Pool'; diff --git a/typescript/src/vault/vault.ts b/typescript/src/vault/vault.ts index 50a4b7c..f44ec8a 100644 --- a/typescript/src/vault/vault.ts +++ b/typescript/src/vault/vault.ts @@ -101,16 +101,6 @@ export class Vault { const hook = new hookClass(hookState); - // Override the hook's flags with those from HookState (if present) - if ( - hookState && - typeof hookState === 'object' && - 'shouldCallComputeDynamicSwapFee' in hookState - ) { - const state = hookState as HookState; - Object.assign(hook, state); - } - return hook; } diff --git a/typescript/test/utils/mapHookState.ts b/typescript/test/utils/mapHookState.ts index 8f6f25d..6117466 100644 --- a/typescript/test/utils/mapHookState.ts +++ b/typescript/test/utils/mapHookState.ts @@ -46,29 +46,8 @@ function mapExitFeeHookState( ); } - const { - shouldCallComputeDynamicSwapFee, - shouldCallBeforeSwap, - shouldCallAfterSwap, - shouldCallBeforeAddLiquidity, - shouldCallAfterAddLiquidity, - shouldCallBeforeRemoveLiquidity, - shouldCallAfterRemoveLiquidity, - enableHookAdjustedAmounts, - } = hookData; - return { hookType: 'ExitFee', - // Configuration flags - shouldCallComputeDynamicSwapFee, - shouldCallBeforeSwap, - shouldCallAfterSwap, - shouldCallBeforeAddLiquidity, - shouldCallAfterAddLiquidity, - shouldCallBeforeRemoveLiquidity, - shouldCallAfterRemoveLiquidity, - enableHookAdjustedAmounts, - // Hook-specific data tokens, removeLiquidityHookFeePercentage: BigInt( hookData.dynamicData.removeLiquidityHookFeePercentage, @@ -94,29 +73,8 @@ function mapStableSurgeHookState( throw new Error('STABLE_SURGE hook requires amp from pool data'); } - const { - shouldCallComputeDynamicSwapFee, - shouldCallBeforeSwap, - shouldCallAfterSwap, - shouldCallBeforeAddLiquidity, - shouldCallAfterAddLiquidity, - shouldCallBeforeRemoveLiquidity, - shouldCallAfterRemoveLiquidity, - enableHookAdjustedAmounts, - } = hookData; - return { hookType: 'StableSurge', - // Configuration flags - shouldCallComputeDynamicSwapFee, - shouldCallBeforeSwap, - shouldCallAfterSwap, - shouldCallBeforeAddLiquidity, - shouldCallAfterAddLiquidity, - shouldCallBeforeRemoveLiquidity, - shouldCallAfterRemoveLiquidity, - enableHookAdjustedAmounts, - // Hook-specific data amp: poolData.amp, surgeThresholdPercentage: BigInt( hookData.dynamicData.surgeThresholdPercentage,