Merge pull request #2106 from AmbireTech/config/remove-og-fee-waiver

Config / Remove the Swap & Bridge fee waiver for Ambire OGs

Author: superKalo

src/controllers/main/main.ts

@@ -379,7 +379,6 @@ export class MainController extends EventEmitter implements IMainController {
       selectedAccount: this.selectedAccount,
       networks: this.networks,
       activity: this.activity,
-      invite: this.invite,
       storage: this.storage,
       phishing: this.phishing,
       swapProvider: new SwapProviderParallelExecutor([LiFiProvider, SocketProvider]),

src/controllers/swapAndBridge/swapAndBridge.ts

@@ -10,7 +10,6 @@ import {
 import { IAccountsController } from '../../interfaces/account'
 import { IActivityController } from '../../interfaces/activity'
 import { Statuses } from '../../interfaces/eventEmitter'
-import { IInviteController } from '../../interfaces/invite'
 import { ExternalSignerControllers, IKeystoreController } from '../../interfaces/keystore'
 import { INetworksController, Network } from '../../interfaces/network'
 import { IPhishingController } from '../../interfaces/phishing'
@@ -131,8 +130,6 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
 
   #activity: IActivityController
 
-  #invite: IInviteController
-
   #storage: IStorageController
 
   #serviceProviderAPI: SwapProvider
@@ -278,7 +275,6 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
     activity,
     storage,
     phishing,
-    invite,
     portfolioUpdate,
     relayerUrl,
     isMainSignAccountOpThrowingAnEstimationError,
@@ -299,7 +295,6 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
     activity: IActivityController
     storage: IStorageController
     phishing: IPhishingController
-    invite: IInviteController
     relayerUrl: string
     portfolioUpdate?: (chainsToUpdate: Network['chainId'][]) => void
     isMainSignAccountOpThrowingAnEstimationError?: Function
@@ -325,7 +320,6 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
     this.#serviceProviderAPI = swapProvider
     this.#storage = storage
     this.#phishing = phishing
-    this.#invite = invite
     this.#relayerUrl = relayerUrl
     this.#getUserRequests = getUserRequests
     this.#getVisibleUserRequests = getVisibleUserRequests
@@ -1568,7 +1562,6 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
           userAddress: this.#selectedAccount.account.addr,
           sort: this.routePriority,
           isWrapOrUnwrap,
-          isOG: this.#invite.isOG,
           accountNativeBalance: this.#accountNativeBalance(bigintFromAmount),
           nativeSymbol: network?.nativeAssetSymbol || 'ETH'
         })

src/interfaces/swapAndBridge.ts

@@ -479,7 +479,6 @@ export interface ProviderQuoteParams {
   fromAmount: bigint
   userAddress: string
   sort: 'time' | 'output'
-  isOG: boolean
   isWrapOrUnwrap: boolean
   accountNativeBalance: bigint
   nativeSymbol: string
@@ -522,7 +521,6 @@ export interface SwapProvider {
     fromAmount,
     userAddress,
     sort,
-    isOG,
     accountNativeBalance,
     nativeSymbol
   }: ProviderQuoteParams): Promise<SwapAndBridgeQuote>

src/services/lifi/api.ts

@@ -1,10 +1,10 @@
 import {
   ExtendedChain as LiFiExtendedChain,
-  Step as LiFiIncludedStep,
+  LiFiStep,
   Route as LiFiRoute,
   RoutesResponse as LiFiRoutesResponse,
   StatusResponse as LiFiRouteStatusResponse,
-  LiFiStep,
+  Step as LiFiIncludedStep,
   Token as LiFiToken,
   TokensResponse as LiFiTokensResponse,
   ToolError
@@ -446,8 +446,6 @@ export class LiFiAPI implements SwapProvider {
     userAddress,
     sort,
     isWrapOrUnwrap,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    isOG,
     accountNativeBalance,
     nativeSymbol
   }: ProviderQuoteParams): Promise<SwapAndBridgeQuote> {
@@ -505,8 +503,7 @@ export class LiFiAPI implements SwapProvider {
       }
     }
 
-    const shouldRemoveConvenienceFee =
-      isOG || isWrapOrUnwrap || isNoFeeToken(fromChainId, fromTokenAddress)
+    const shouldRemoveConvenienceFee = isWrapOrUnwrap || isNoFeeToken(fromChainId, fromTokenAddress)
     if (shouldRemoveConvenienceFee) delete body.options.fee
 
     const url = `${this.#baseUrl}/advanced/routes`

src/services/socket/api.ts

@@ -265,7 +265,6 @@ export class SocketAPI implements SwapProvider {
     toTokenAddress,
     fromAmount,
     userAddress,
-    isOG,
     isWrapOrUnwrap,
     accountNativeBalance,
     nativeSymbol
@@ -288,7 +287,7 @@ export class SocketAPI implements SwapProvider {
     })
     const feeTakerAddress = AMBIRE_FEE_TAKER_ADDRESSES[fromChainId]
     const shouldIncludeConvenienceFee =
-      !!feeTakerAddress && !isOG && !isWrapOrUnwrap && !isNoFeeToken(fromChainId, fromTokenAddress)
+      !!feeTakerAddress && !isWrapOrUnwrap && !isNoFeeToken(fromChainId, fromTokenAddress)
     if (shouldIncludeConvenienceFee) {
       params.append('feeTakerAddress', feeTakerAddress)
       params.append('feeBps', (FEE_PERCENT * 100).toString())

src/services/swapIntegrators/swapProviderParallelExecutor.ts

@@ -232,7 +232,6 @@ export class SwapProviderParallelExecutor {
     fromAmount,
     userAddress,
     sort,
-    isOG,
     accountNativeBalance,
     nativeSymbol,
     isWrapOrUnwrap
@@ -250,7 +249,6 @@ export class SwapProviderParallelExecutor {
             fromAmount,
             userAddress,
             sort,
-            isOG,
             accountNativeBalance,
             nativeSymbol,
             isWrapOrUnwrap