fix: merge issues

sdk/order-planner-common/src/implementation/OrderPlanner.ts

@@ -75,7 +75,7 @@ export class OrderPlanner implements IOrderPlanner {
     return actionBuildersMap[step.type] as ActionBuilder<T>
   }
 
-  private _getStrategyName(simulation: Simulation<SimulationType>): string {
+  private _getStrategyName(simulation: ISimulation<SimulationType>): string {
     return `${simulation.simulationType}${simulation.sourcePosition?.pool.protocol.name}${simulation.targetPosition?.pool.protocol.name}`
   }
 

sdk/order-planner-service/tests/service/OrderPlannerService.spec.ts

@@ -1,7 +1,13 @@
-import { FlashloanProvider, ISimulation, SimulationType, TokenTransferTargetType } from '@summerfi/sdk-common/simulation'
+import {
+  FlashloanAction,
+  SetApprovalAction,
+  ReturnFundsAction,
+} from '@summerfi/protocol-plugins/plugins/common'
+import { FlashloanProvider, ISimulation, SimulationType } from '@summerfi/sdk-common/simulation'
 import { DeploymentIndex } from '@summerfi/deployment-utils'
 import { ISwapManager } from '@summerfi/swap-common/interfaces'
 import { Address, AddressValue, ChainFamilyMap, ChainInfo } from '@summerfi/sdk-common/common'
+import { ProtocolName } from '@summerfi/sdk-common/protocols'
 import { IPositionsManager } from '@summerfi/sdk-common/orders'
 import { SetupDeployments } from '../utils/SetupDeployments'
 import { UserMock } from '../mocks/UserMock'
@@ -18,7 +24,6 @@ import {
 import assert from 'assert'
 import { IUser } from '@summerfi/sdk-common/user'
 import {
-  IContractProvider,
   IPriceService,
   IProtocolPluginsRegistry,
   ITokenService,

sdk/sdk-client/src/implementation/simulations/RefinanceSimulationManager.ts

@@ -10,7 +10,7 @@ export class RefinanceSimulationManager extends IRPCClient {
 
   public async simulateRefinancePosition(
     params: IRefinanceParameters,
-  ): Promise<Simulation<SimulationType.Refinance>> {
+  ): Promise<ISimulation<SimulationType.Refinance>> {
     const refinanceParameters: IRefinanceParameters = {
       position: {
         positionId: params.position.positionId,

sdk/sdk-common/src/common/implementation/TokenAmount.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from 'bignumber.js'
-import {Percentage} from "./Percentage";
+import { Percentage } from './Percentage'
 import { Token } from './Token'
 import { SerializationService } from '../../services/SerializationService'
 import { ITokenAmount } from '../interfaces/ITokenAmount'

sdk/sdk-common/src/swap/SimulatedSwapData.ts

@@ -11,9 +11,9 @@ import { QuoteData } from './QuoteData'
 export type SimulatedSwapData = Omit<QuoteData, 'estimatedGas' | 'routes'> & {
   slippage: Percentage
   /* This is the impacted price that takes into account trade size */
-  offerPrice: Price;
+  offerPrice: Price
   /* This is the un-impacted blend of market prices from various DEXs */
-  marketPrice: Price;
+  marketPrice: Price
   priceImpact: Percentage
   summerFee: TokenAmount
 }

sdk/sdk-e2e/tests/refinanceMakerSpark.test.ts

@@ -14,7 +14,7 @@ import { ProtocolName, isLendingPool } from '@summerfi/sdk-common/protocols'
 import { makeSDK, type Chain, type User, Protocol } from '@summerfi/sdk-client'
 import { TokenSymbol } from '@summerfi/sdk-common/common/enums'
 import { IPositionsManager, IRefinanceParameters, Order } from '@summerfi/sdk-common/orders'
-import { Simulation, SimulationType } from '@summerfi/sdk-common/simulation'
+import { ISimulation, SimulationType } from '@summerfi/sdk-common/simulation'
 import { TransactionUtils } from './utils/TransactionUtils'
 import {
   decodeActionCalldata,
@@ -162,7 +162,7 @@ describe.skip('Refinance Maker Spark | SDK', () => {
       assert(false, 'Spark pool type is not lending')
     }
 
-    const refinanceSimulation: Simulation<SimulationType.Refinance> =
+    const refinanceSimulation: ISimulation<SimulationType.Refinance> =
       await sdk.simulator.refinance.simulateRefinancePosition({
         position: makerPosition,
         targetPool: sparkPool,

sdk/simulator-service/src/implementation/utils/SimulatorUtils.ts

@@ -1,4 +1,4 @@
-  import type {
+import type {
   ReferenceableField,
   SimulationStrategy,
   ValueReference,

sdk/testing-utils/src/mocks/SwapManagerMock.ts

@@ -1,11 +1,20 @@
-import { Address, ChainInfo, Percentage, Token, TokenAmount } from '@summerfi/sdk-common/common'
+import {
+  Address,
+  ChainInfo,
+  Percentage,
+  Token,
+  TokenAmount,
+  CurrencySymbol,
+} from '@summerfi/sdk-common/common'
+import { SpotData, SwapData, QuoteData } from '@summerfi/sdk-common/swap'
 import { ISwapManager } from '@summerfi/swap-common/interfaces'
-import { QuoteData, SwapData } from '@summerfi/swap-common/types'
 
 export class SwapManagerMock implements ISwapManager {
   private _swapDataReturnValue: SwapData = {} as SwapData
   private _quoteDataReturnValue: QuoteData = {} as QuoteData
 
+  private _spotPricesReturnValue: SpotData = {} as SpotData
+
   private _lastGetSwapDataExactInputParams:
     | {
         chainInfo: ChainInfo
@@ -32,6 +41,15 @@ export class SwapManagerMock implements ISwapManager {
     this._quoteDataReturnValue = quoteData
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async getSpotPrices(params: {
+    chainInfo: ChainInfo
+    tokens: Token[]
+    quoteCurrency?: CurrencySymbol
+  }): Promise<SpotData> {
+    return this._spotPricesReturnValue
+  }
+
   async getSwapDataExactInput(params: {
     chainInfo: ChainInfo
     fromAmount: TokenAmount